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

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

Author: scott.stark at jboss.org
Date: 2008-06-16 23:29:33 -0400 (Mon, 16 Jun 2008)
New Revision: 74654

Added:
   projects/vfs/trunk/src/test/resources/vfs/test/interop_W2JREMarshallTest_appclient_vehicle.ear
Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/VirtualFile.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARSerializationUnitTestCase.java
   projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java
Log:
Add a test2ndLevelRead2 test with a different ear archive

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/VirtualFile.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/VirtualFile.java	2008-06-17 02:37:43 UTC (rev 74653)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/VirtualFile.java	2008-06-17 03:29:33 UTC (rev 74654)
@@ -404,7 +404,11 @@
 
       VirtualFileHandler child = handler.getChild(VFSUtils.fixName(path));
       if (child == null)
-         throw new IOException("Child not found " + path + " for " + handler);
+      {
+         List<VirtualFileHandler> children = handler.getChildren(true);
+         throw new IOException("Child not found " + path + " for " + handler
+               +", available children: "+children);
+      }
       return child.getVirtualFile();
    }
 

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARSerializationUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARSerializationUnitTestCase.java	2008-06-17 02:37:43 UTC (rev 74653)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARSerializationUnitTestCase.java	2008-06-17 03:29:33 UTC (rev 74654)
@@ -216,6 +216,15 @@
       VirtualFile text = file.findChild("test2.txt");
       testText(text);
    }
+   public void test2ndLevelRead2() throws Exception
+   {
+      URL rootURL = getResource("/vfs/test/interop_W2JREMarshallTest_appclient_vehicle.ear");
+      VFS vfs = VFS.getVFS(rootURL);
+      VirtualFile file = vfs.findChild("interop_W2JREMarshallTest_appclient_vehicle_client.jar");
+      file = serializeDeserialize(file, VirtualFile.class);
+      VirtualFile text = file.findChild("MarshallTest.xml ");
+      testText(text);
+   }
 
    protected void testText(VirtualFile file) throws Exception
    {

Modified: projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java
===================================================================
--- projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java	2008-06-17 02:37:43 UTC (rev 74653)
+++ projects/vfs/trunk/src/test/java/org/jboss/test/virtual/test/JARVFSContextUnitTestCase.java	2008-06-17 03:29:33 UTC (rev 74654)
@@ -115,6 +115,7 @@
     */
    public void testPathIsEmptryForJarEntryAsRoot() throws Exception
    {
+      VFS.init();
       URL url = getResource("/vfs/context/jar/simple.jar");
       URL entry = new URL("jar:" + url.toString() + "!/child");
       //entry.openStream().close();

Added: projects/vfs/trunk/src/test/resources/vfs/test/interop_W2JREMarshallTest_appclient_vehicle.ear
===================================================================
(Binary files differ)


Property changes on: projects/vfs/trunk/src/test/resources/vfs/test/interop_W2JREMarshallTest_appclient_vehicle.ear
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream