[jboss-cvs] JBossAS SVN: r92405 - in projects/vfs/branches/Branch_2_1/src: test/java/org/jboss/test/virtual/test and 1 other directory.

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

Author: alesj
Date: 2009-08-16 07:26:44 -0400 (Sun, 16 Aug 2009)
New Revision: 92405

Modified:
   projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
   projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/ZipReleaseAfterCopyTestCase.java
Log:
Fix the test - actual zipFile creation + release.
DelegateHandler should delegate releaseHandles.

Modified: projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2009-08-15 20:38:08 UTC (rev 92404)
+++ projects/vfs/branches/Branch_2_1/src/main/java/org/jboss/virtual/plugins/context/DelegatingHandler.java	2009-08-16 11:26:44 UTC (rev 92405)
@@ -164,6 +164,12 @@
    }
 
    @Override
+   public void releaseHandles()
+   {
+      getDelegate().releaseHandles();
+   }
+
+   @Override
    public void close()
    {
       if (delegate == null)

Modified: projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/ZipReleaseAfterCopyTestCase.java
===================================================================
--- projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/ZipReleaseAfterCopyTestCase.java	2009-08-15 20:38:08 UTC (rev 92404)
+++ projects/vfs/branches/Branch_2_1/src/test/java/org/jboss/test/virtual/test/ZipReleaseAfterCopyTestCase.java	2009-08-16 11:26:44 UTC (rev 92405)
@@ -154,31 +154,36 @@
       VirtualFile root = VFS.getRoot(url);
       assertNotNull(root);
 
-      VirtualFile copy = VFSUtils.temp(root);
-      assertNotNull(copy);
-      assertTrue(VFSUtils.isTemporaryFile(copy));
+      VirtualFile copy = VFSUtils.explode(root); // ::temp doesn't create zipFile, explode does
+      try
+      {
+         assertNotNull(copy);
+         assertTrue(VFSUtils.isTemporaryFile(copy));
 
-      Method method = VirtualFile.class.getDeclaredMethod("getHandler");
-      method.setAccessible(true);
-      VirtualFileHandler h = (VirtualFileHandler)method.invoke(root);
-      if (h instanceof DelegatingHandler)
-         h = ((DelegatingHandler)h).getDelegate();
+         Method method = VirtualFile.class.getDeclaredMethod("getHandler");
+         method.setAccessible(true);
+         VirtualFileHandler h = (VirtualFileHandler)method.invoke(root);
+         if (h instanceof DelegatingHandler)
+            h = ((DelegatingHandler)h).getDelegate();
 
-      method = h.getClass().getDeclaredMethod("getZipEntryContext");
-      method.setAccessible(true);
+         method = h.getClass().getDeclaredMethod("getZipEntryContext");
+         method.setAccessible(true);
 
-      Field field = ZipEntryContext.class.getDeclaredField("zipSource");
-      field.setAccessible(true);
-      Object object = field.get(method.invoke(h));
+         Field field = ZipEntryContext.class.getDeclaredField("zipSource");
+         field.setAccessible(true);
+         Object object = field.get(method.invoke(h));
 
-      field = object.getClass().getDeclaredField("zipFile");
-      field.setAccessible(true);
+         field = object.getClass().getDeclaredField("zipFile");
+         field.setAccessible(true);
 
-      assertNull(field.get(object));
-      assertNotNull(root.openStream());
-
-      root.cleanup();
-      copy.cleanup();
+         assertNull(field.get(object));
+         assertNotNull(root.openStream());
+      }
+      finally
+      {
+         copy.cleanup();
+         root.cleanup();
+      }
       assertNoRegistryEntry(root.toURI());
    }
 }
\ No newline at end of file