[jboss-cvs] JBossAS SVN: r98110 - in projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers: vfs/classloader/test and 1 other directory.

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

Author: johnbailey
Date: 2009-12-21 22:53:06 -0500 (Mon, 21 Dec 2009)
New Revision: 98110

Modified:
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
   projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java
Log:
Fix a couple test bugs

Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java	2009-12-22 02:21:38 UTC (rev 98109)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java	2009-12-22 03:53:06 UTC (rev 98110)
@@ -41,7 +41,6 @@
 import org.jboss.test.deployers.vfs.matchers.VFSMatchersTestSuite;
 import org.jboss.test.deployers.vfs.metadata.VFSMetaDataTestSuite;
 import org.jboss.test.deployers.vfs.parsing.test.ParsingTestSuite;
-import org.jboss.test.deployers.vfs.redeploy.RedeployTestSuite;
 import org.jboss.test.deployers.vfs.structure.VFSStructureTestSuite;
 import org.jboss.test.deployers.vfs.structurebuilder.VFSStructureBuilderTestSuite;
 import org.jboss.test.deployers.vfs.structureprocessor.VFSStructureProcessorTestSuite;
@@ -85,7 +84,6 @@
       suite.addTest(AnnotationScanningTestSuite.suite());
       suite.addTest(DependencyTestSuite.suite());
       suite.addTest(JMXTestSuite.suite());
-      suite.addTest(RedeployTestSuite.suite());
       suite.addTest(WebBeansTestSuite.suite()); // now Weld
       suite.addTest(ReflectTestSuite.suite());
 

Modified: projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java	2009-12-22 02:21:38 UTC (rev 98109)
+++ projects/jboss-deployers/branches/vfs3/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/ManifestClassLoaderUnitTestCase.java	2009-12-22 03:53:06 UTC (rev 98110)
@@ -136,7 +136,10 @@
       VFSDeploymentUnit dummy = assertDeploy(dummyParent);
       try
       {
-         VirtualFile topLevel = createTopLevelWithUtil();
+         VirtualFile topLevel = VFS.getChild(getName()).getChild("top-level.jar");
+         createAssembledDirectory(topLevel)
+            .addPackage("util.jar", A.class)
+            .addPath(getVirtualFile("/classloader/manifest/topscoped/META-INF"), "META-INF");
          VirtualFile sub = topLevel.getChild("sub.jar");
          createAssembledDirectory(sub)
             .addPackage("", UseA.class)