[jboss-cvs] JBossAS SVN: r69220 - in projects/microcontainer/trunk/deployers-vfs/src: tests/org/jboss/test/deployers/vfs/classloader/test and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-01-22 17:32:21 -0500 (Tue, 22 Jan 2008)
New Revision: 69220

Added:
   projects/microcontainer/trunk/deployers-vfs/src/resources/tests/classloader/testear1x.ear
Modified:
   projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java
Log:
Add compressed version of the ear

Added: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/classloader/testear1x.ear
===================================================================
(Binary files differ)


Property changes on: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/classloader/testear1x.ear
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java	2008-01-22 22:26:52 UTC (rev 69219)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/classloader/test/FilteredExportUnitTestCase.java	2008-01-22 22:32:21 UTC (rev 69220)
@@ -136,7 +136,8 @@
       );
       URL ejb1URL = getResource("/classloader/testear1.ear/ejb1.jar");
       assertNotNull(ejb1URL);
-      VirtualFile ejb1Root = VFS.getRoot(ejb1URL);
+      //VirtualFile ejb1Root = VFS.getRoot(ejb1URL);
+      VirtualFile ejb1Root = earRoot.getChild("ejb1.jar");
       VirtualFile[] ejb1Files = {ejb1Root};
       ClassLoader ejb1Loader = buildClassLoader(ExportAll.NON_EMPTY, expectedEjb1, ejb1Files);
 
@@ -157,4 +158,47 @@
       assertEquals("Saw 2 users.properties", 2, count);
    }
 
+   /**
+    * Compressed ear version of testEar1
+    * @throws Exception
+    */
+   public void testEar1x() throws Exception
+   {
+      Map<String,String> expectedEar = makeSimpleMap("testear1x.ear",
+            "",
+            "util"
+      );
+      URL ear1URL = getResource("/classloader/testear1x.ear");
+      log.info(ear1URL);
+      assertNotNull(ear1URL);
+      VirtualFile earRoot = VFS.getRoot(ear1URL);
+      log.info(earRoot);
+      VirtualFile[] ear1Files = {earRoot.getChild("lib/jar1.jar")};
+      ClassLoader ear1Loader = buildClassLoader(ExportAll.NON_EMPTY, expectedEar, ear1Files);
+      // ejb1.jar
+      Map<String,String> expectedEjb1 = makeSimpleMap("testear1x.ear",
+            "",
+            "pkg1.ejbs",
+            "pkg1.ifaces"
+      );
+      VirtualFile ejb1Root = earRoot.getChild("ejb1.jar");
+      VirtualFile[] ejb1Files = {ejb1Root};
+      ClassLoader ejb1Loader = buildClassLoader(ExportAll.NON_EMPTY, expectedEjb1, ejb1Files);
+
+      URL usersURL = ejb1Loader.getResource("users.properties");
+      log.info("users.properties: "+usersURL);
+      assertNotNull(usersURL);
+      assertTrue(usersURL.toString().contains("ejb1"));
+
+      Enumeration<URL> userURLs = ejb1Loader.getResources("users.properties");
+      assertNotNull(userURLs);
+      int count = 0;
+      while(userURLs.hasMoreElements())
+      {
+         URL url = userURLs.nextElement();
+         log.info(url);
+         count ++;
+      }
+      assertEquals("Saw 2 users.properties", 2, count);
+   }
 }