[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6260] trunk/sql12/fw/src/test/java/net/ sourceforge/squirrel_sql/fw/util/FileTest.java

[<man...@us...>]

Revision: 6260
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6260&view=rev
Author:   manningr
Date:     2011-05-15 20:43:29 +0000 (Sun, 15 May 2011)

Log Message:
-----------
Made test more robust in the case of multiple simultaneous executions.

Modified Paths:
--------------
    trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java

Modified: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java	2011-05-14 23:15:33 UTC (rev 6259)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/util/FileTest.java	2011-05-15 20:43:29 UTC (rev 6260)
@@ -30,6 +30,7 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.UUID;
 
 import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
 
@@ -1458,14 +1459,18 @@
         // Finding a non-existent directory to create.
         int dirNumber = 1;
         boolean dirExists = true;
-        FileWrapper baseDir = new FileWrapperImpl(base, platformId + String.valueOf(dirNumber));
+        String randomUuidString = UUID.randomUUID().toString();
+        FileWrapper baseDir = 
+      	  new FileWrapperImpl(base, platformId + "-" + randomUuidString + "-" + String.valueOf(dirNumber));
         // Making sure that the directory does not exist.
         while (dirExists) {
             // If the directory exists, add one to the directory number (making
             // it a new directory name.)
             if (baseDir.exists()) {
                 dirNumber++;
-                baseDir = new FileWrapperImpl(base, String.valueOf(dirNumber));
+                baseDir = 
+               	 new FileWrapperImpl(base, 
+               		 	platformId + "-" + randomUuidString + "-" + String.valueOf(dirNumber));
             } else {
                 dirExists = false;
             }
@@ -1478,6 +1483,20 @@
             }
         };
 
+        FileWrapper[] fileList = baseDir.listFiles(dirFilter);
+        if (fileList != null) {
+      	  StringBuilder failureMessage = new StringBuilder();
+      	  failureMessage.append("listFiles should have returned null for a non-existent directory ("+
+      		  baseDir.getAbsolutePath()+") but " +
+      	  		"instead returned the following list:\n");
+      	  for (FileWrapper filewrapper : fileList) {
+      		  failureMessage.append("\t");
+      		  failureMessage.append(filewrapper.toString());
+      		  failureMessage.append("\n");
+      	  }
+      	  fail(failureMessage.toString());
+        }
+        
         assertNull("listFiles Should Return Null.", baseDir
                 .listFiles(dirFilter));
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.