[jboss-svn-commits] JBoss Common SVN: r3759 - in shrinkwrap/trunk/impl-base/src: test/java/org/jboss/shrinkwrap/impl/base/exporter and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2009-11-19 06:02:56 -0500 (Thu, 19 Nov 2009)
New Revision: 3759

Modified:
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java
   shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java
Log:
SHRINKWRAP-84 verify that directory exists before throwing exception on mkdir == false
Updated testExportExplodedOutpuDirCreationFails to test a failed mkdir, not false due to existing directory

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java	2009-11-19 08:37:01 UTC (rev 3758)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java	2009-11-19 11:02:56 UTC (rev 3759)
@@ -165,7 +165,7 @@
 
       // Create output directory
       final File outputDirectory = new File(baseDirectory, archive.getName());
-      if (!outputDirectory.mkdir())
+      if (!outputDirectory.mkdir() && !outputDirectory.exists())
       {
          throw new ArchiveExportException("Unable to create archive output directory - " + outputDirectory);
       }

Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java	2009-11-19 08:37:01 UTC (rev 3758)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java	2009-11-19 11:02:56 UTC (rev 3759)
@@ -175,11 +175,9 @@
    {
       log.info("testExportExplodedOutpuDirCreationFails");
       final File directory = createTempDirectory("testExportExplodedOutpuDirCreationFails");
-      // Will cause the creation of Archive directory to fail
-      final File existingFile = new File(directory, NAME_ARCHIVE);
-      final boolean created = existingFile.createNewFile();
-      Assert.assertEquals("Could not create test file",true, created);
-      Archives.create(NAME_ARCHIVE, ExplodedExporter.class).exportExploded(directory);
+      directory.deleteOnExit();
+      
+      Archives.create("test/" + NAME_ARCHIVE, ExplodedExporter.class).exportExploded(directory);
    }
 
    /**