[jboss-cvs] JBossAS SVN: r83781 - projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test.

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

Author: alesj
Date: 2009-02-02 10:15:47 -0500 (Mon, 02 Feb 2009)
New Revision: 83781

Modified:
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTestCase.java
Log:
Do super.tearDown if exception is thrown in setUp.

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTestCase.java	2009-02-02 14:53:16 UTC (rev 83780)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/FileCleanupUnitTestCase.java	2009-02-02 15:15:47 UTC (rev 83781)
@@ -69,28 +69,36 @@
    {
       super.setUp();
 
-      // nullify the temp dir
-      Class<?> clazz = AbstractCopyMechanism.class;
-      Field field = clazz.getDeclaredField("tempDir");
-      field.setAccessible(true);
-      field.set(null, null);
+      try
+      {
+         // nullify the temp dir
+         Class<?> clazz = AbstractCopyMechanism.class;
+         Field field = clazz.getDeclaredField("tempDir");
+         field.setAccessible(true);
+         field.set(null, null);
 
-      String tempDirKey = System.getProperty("vfs.temp.dir", "jboss.server.temp.dir");
-      String tempDirString = System.getProperty(tempDirKey, System.getProperty("java.io.tmpdir")) + GUID.asString();
+         String tempDirKey = System.getProperty("vfs.temp.dir", "jboss.server.temp.dir");
+         String tempDirString = System.getProperty(tempDirKey, System.getProperty("java.io.tmpdir")) + GUID.asString();
 
-      tempDir =  new File(tempDirString);
-      tempDir.deleteOnExit();      
-      if (tempDir.exists())
+         tempDir =  new File(tempDirString);
+         tempDir.deleteOnExit();
+         if (tempDir.exists())
+         {
+            deleteTempDir();
+         }
+         assertTrue(tempDir.mkdir());
+
+         System.setProperty("jboss.server.temp.dir", tempDirString);
+
+         VFSCache cache = new LRUVFSCache(2, 5);
+         cache.start();
+         VFSCacheFactory.setInstance(cache);
+      }
+      catch (Exception e)
       {
-         deleteTempDir();
+         super.tearDown();
+         throw e;
       }
-      assertTrue(tempDir.mkdir());
-
-      System.setProperty("jboss.server.temp.dir", tempDirString);
-
-      VFSCache cache = new LRUVFSCache(2, 5);
-      cache.start();
-      VFSCacheFactory.setInstance(cache);
    }
 
    @Override