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

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

Author: alesj
Date: 2008-06-05 11:25:20 -0400 (Thu, 05 Jun 2008)
New Revision: 74144

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java
Log:
Fix rewiring in unpack vs. exploded.
In exploded we don't rewire.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java	2008-06-05 15:00:54 UTC (rev 74143)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/VFSUtils.java	2008-06-05 15:25:20 UTC (rev 74144)
@@ -554,7 +554,7 @@
       FileSystemContext fileSystemContext = new FileSystemContext(unpacked);
       VirtualFileHandler newHandler = fileSystemContext.getRoot();
       VirtualFileHandler parent = handler.getParent();
-      if (parent != null)
+      if (parent != null && force)
          parent.replaceChild(handler, newHandler);
 
       return newHandler.getVirtualFile();

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java	2008-06-05 15:00:54 UTC (rev 74143)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/UnpackTestCase.java	2008-06-05 15:25:20 UTC (rev 74144)
@@ -91,10 +91,7 @@
 
       original = vfs.findChild("level1.zip");
       replacement = VFSUtils.explode(original);
-      assertReplacement(original, replacement);
-      VirtualFile parent = original.getParent();
-      VirtualFile child = parent.findChild("level1.zip");
-      assertEquals(replacement, child);
+      assertExplodedReplacement(original, replacement);
 
       VirtualFile textOne = replacement.findChild("test1.txt");
       testText(textOne);
@@ -115,7 +112,7 @@
 
       original = vfs.findChild("level1.zip/level2.zip");
       replacement = VFSUtils.unpack(original);
-      assertReplacement(original, replacement);
+      assertUnpackedReplacement(original, replacement);
       VirtualFile parent = original.getParent();
       VirtualFile child = parent.findChild("level2.zip");
       //assertEquals(replacement, child);
@@ -137,7 +134,7 @@
 
       original = vfs.findChild("level1.zip/level2.zip/level3.zip");
       replacement = VFSUtils.unpack(original);
-      assertReplacement(original, replacement);
+      assertUnpackedReplacement(original, replacement);
       VirtualFile parent = original.getParent();
       VirtualFile child = parent.findChild("level3.zip");
       //assertEquals(replacement, child);
@@ -147,6 +144,18 @@
       testText(textThree);
    }
 
+   protected void assertUnpackedReplacement(VirtualFile original, VirtualFile replacement) throws Exception
+   {
+      assertReplacement(original, replacement);
+      assertEquals(original.getParent(), replacement.getParent());
+   }
+
+   protected void assertExplodedReplacement(VirtualFile original, VirtualFile replacement) throws Exception
+   {
+      assertReplacement(original, replacement);
+      assertNull(replacement.getParent());
+   }
+
    protected void assertReplacement(VirtualFile original, VirtualFile replacement) throws Exception
    {
       assertEquals(original.getName(), replacement.getName());
@@ -158,7 +167,6 @@
       assertEquals(original.exists(), replacement.exists());
       assertEquals(original.isLeaf(), replacement.isLeaf());
       assertEquals(original.isHidden(), replacement.isHidden());
-      assertEquals(original.getParent(), replacement.getParent());
    }
 
    protected void testText(VirtualFile file) throws Exception