Merge cucumber#978 'Double-check for directory exists in ...'.

brasmusson · brasmusson · commit e6ea17b06f4d · 2016-07-31T14:36:57.000+02:00
Also update History.md.
diff --git a/History.md b/History.md
@@ -1,5 +1,6 @@
 ## [1.2.5-SNAPSHOT](https://github.com/cucumber/cucumber-jvm/compare/v1.2.4...master) (In Git)
 
+* [Core] Double-check for directory exists in the ensureParentDirExists(File) ([#978](https://github.com/cucumber/cucumber-jvm/pull/978) Pavel Ordenko)
 * [picocontainer] Picocontainer lifecycle support([#994](https://github.com/cucumber/cucumber-jvm/pull/994), [#993](https://github.com/cucumber/cucumber-jvm/issues/993), [#992](https://github.com/cucumber/cucumber-jvm/pull/992) Richard Bradley)
 * [Core] Specifying plugins on the command line via `--plugin` clobbers settings in the code ([#860](https://github.com/cucumber/cucumber-jvm/pull/860) Björn Rasmusson)
 * [Core] Make test assertion OS agnostic ([#897](https://github.com/cucumber/cucumber-jvm/pull/897/files) sid)
diff --git a/core/src/main/java/cucumber/runtime/io/URLOutputStream.java b/core/src/main/java/cucumber/runtime/io/URLOutputStream.java
@@ -48,7 +48,7 @@ public URLOutputStream(URL url, String method, Map<String, String> headers, int
 
     private void ensureParentDirExists(File file) throws IOException {
         if (file.getParentFile() != null && !file.getParentFile().isDirectory()) {
-            boolean ok = file.getParentFile().mkdirs();
+            boolean ok = file.getParentFile().mkdirs() || file.getParentFile().isDirectory();
             if (!ok) {
                 throw new IOException("Failed to create directory " + file.getParentFile().getAbsolutePath());
             }
diff --git a/core/src/test/java/cucumber/runtime/io/URLOutputStreamTest.java b/core/src/test/java/cucumber/runtime/io/URLOutputStreamTest.java
@@ -4,7 +4,9 @@
 import gherkin.util.FixJava;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.webbitserver.HttpControl;
 import org.webbitserver.HttpHandler;
 import org.webbitserver.HttpRequest;
@@ -27,17 +29,28 @@
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 public class URLOutputStreamTest {
     private WebServer webbit;
+    private final int threadsCount = 100;
+    private final long waitTimeoutMillis = 30000L;
+    private final List<File> tmpFiles = new ArrayList<File>();
+    private final List<String> threadErrors = new ArrayList<String>();
+
+    @Rule
+    public TemporaryFolder tempFolder = new TemporaryFolder();
 
     @Before
     public void startWebbit() throws ExecutionException, InterruptedException {
@@ -127,7 +140,80 @@ public void handleHttpRequest(HttpRequest req, HttpResponse res, HttpControl ctl
         }
     }
 
+    @Test
+    public void do_not_throw_ioe_if_parent_dir_created_by_another_thread() {
+        final CountDownLatch countDownLatch = new CountDownLatch(1);
+        List<Thread> testThreads = getThreadsWithLatchForFile(countDownLatch, threadsCount);
+        startThreadsFromList(testThreads);
+        countDownLatch.countDown();
+        waitAllThreadsFromList(testThreads);
+        assertTrue("Not all parent folders were created for tmp file or tmp file was not created", isAllFilesCreated());
+        assertTrue("Some thread get error during work. Error list:" + threadErrors.toString(), threadErrors.isEmpty());
+    }
+
     private Reader openUTF8FileReader(final File file) throws IOException {
         return new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8"));
     }
+
+    private List<Thread> getThreadsWithLatchForFile(final CountDownLatch countDownLatch, int threadsCount) {
+        List<Thread> result = new ArrayList<Thread>();
+        String ballast = "" + System.currentTimeMillis();
+        for (int i = 0; i < threadsCount; i++) {
+            final int curThreadNo = i;
+            // It useful when 2-3 threads (not more) tries to create the same directory for the report
+            final File tmp = (i % 3 == 0 || i % 3 == 2) ?
+                    new File(tempFolder.getRoot().getAbsolutePath() + "/cuce" + ballast + i + "/tmpFile.tmp") :
+                    new File(tempFolder.getRoot().getAbsolutePath() + "/cuce" + ballast + (i - 1) + "/tmpFile.tmp");
+            tmpFiles.add(tmp);
+            result.add(new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        // Every thread should wait command to run
+                        countDownLatch.await();
+                        new URLOutputStream(tmp.toURI().toURL());
+                    } catch (IOException e) {
+                        threadErrors.add("Thread" + curThreadNo + ": parent dir not created. " + e.getMessage());
+                    } catch (InterruptedException e) {
+                        threadErrors.add("Thread" + curThreadNo + ": not started on time. " + e.getMessage());
+                    }
+                }
+            });
+        }
+        return result;
+    }
+
+    private void startThreadsFromList(List<Thread> threads) {
+        for (Thread thread : threads) {
+            thread.start();
+        }
+    }
+
+    private void waitAllThreadsFromList(List<Thread> threads) {
+        long timeStart = System.currentTimeMillis();
+        do {
+            // Protection from forever loop
+            if (System.currentTimeMillis() - timeStart > waitTimeoutMillis) {
+                assertTrue("Some threads are still alive", false);
+            }
+        } while (hasListAliveThreads(threads));
+    }
+
+    private boolean hasListAliveThreads(List<Thread> threads) {
+        for (Thread thread : threads) {
+            if (thread.isAlive()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean isAllFilesCreated() {
+        for (File tmpFile : tmpFiles) {
+            if (tmpFile.getParentFile() == null || !tmpFile.getParentFile().isDirectory() || !tmpFile.exists()) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public URLOutputStream(URL url, String method, Map<String, String> headers, int`
`48`	`48`
`49`	`49`	`private void ensureParentDirExists(File file) throws IOException {`
`50`	`50`	`if (file.getParentFile() != null && !file.getParentFile().isDirectory()) {`
`51`		`- boolean ok = file.getParentFile().mkdirs();`
	`51`	`+ boolean ok = file.getParentFile().mkdirs() \|\| file.getParentFile().isDirectory();`
`52`	`52`	`if (!ok) {`
`53`	`53`	`throw new IOException("Failed to create directory " + file.getParentFile().getAbsolutePath());`
`54`	`54`	`}`