commit 598ed1640254297c413460cd08dc4d92ab1bb239
author dxu <none@none> Mon Jun 10 11:06:26 2013 -0700
committer dxu <none@none> Mon Jun 10 11:06:26 2013 -0700
tree 5f4d251a8bfa5434362c68f5b85d819396a2d40d
parent fae455ce283c27589e4336946c33668faf2a5d08

8013827: File.createTempFile hangs with temp file starting with 'com1.4'
8011950: java.io.File.createTempFile enters infinite loop when passed invalid data
Reviewed-by: alanb

test/java/io/File/CreateNewFile.java

diff --git a/test/java/io/File/CreateNewFile.java b/test/java/io/File/CreateNewFile.java
index fb4f88a..57cd7d1 100644
--- a/test/java/io/File/CreateNewFile.java
+++ b/test/java/io/File/CreateNewFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,7 @@
  */
 
 /* @test
-   @bug 4130498 4391178
+   @bug 4130498 4391178 6198547
    @summary Basic test for createNewFile method
  */
 
@@ -51,5 +51,20 @@
         } catch (IOException e) {
             // Exception expected
         }
+
+        testCreateExistingDir();
+    }
+
+    // Test JDK-6198547
+    private static void testCreateExistingDir() throws IOException {
+        File tmpFile = new File("hugo");
+        if (tmpFile.exists() && !tmpFile.delete())
+            throw new RuntimeException("Cannot delete " + tmpFile);
+        if (!tmpFile.mkdir())
+            throw new RuntimeException("Cannot create dir " + tmpFile);
+        if (!tmpFile.exists())
+            throw new RuntimeException("Cannot see created dir " + tmpFile);
+        if (tmpFile.createNewFile())
+            throw new RuntimeException("Should fail to create file " + tmpFile);
     }
 }