[jboss-cvs] JBossAS SVN: r71428 - in projects/jboss-deployers/trunk: deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test and 1 other directories.

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

Author: alesj
Date: 2008-03-29 09:13:07 -0400 (Sat, 29 Mar 2008)
New Revision: 71428

Modified:
   projects/jboss-deployers/trunk/build/pom.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/AbstractJARStructureTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/CombinedJARStructureUnitTestCase.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/war/test/CombinedWARStructureUnitTestCase.java
Log:
Updating library dependencies.
Fixing the tests to work with the new VFS changes.

Modified: projects/jboss-deployers/trunk/build/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/build/pom.xml	2008-03-29 12:29:07 UTC (rev 71427)
+++ projects/jboss-deployers/trunk/build/pom.xml	2008-03-29 13:13:07 UTC (rev 71428)
@@ -32,14 +32,14 @@
 
   <properties>
     <version.jboss.man>2.0.0.Beta12</version.jboss.man>
-    <version.jboss.microcontainer>2.0.0.Beta11</version.jboss.microcontainer>
+    <version.jboss.microcontainer>2.0.0.Beta12</version.jboss.microcontainer>
     <version.jboss.classloader>2.0.0.Beta11</version.jboss.classloader>
-    <version.jboss.common.core>2.2.3.GA</version.jboss.common.core>
+    <version.jboss.common.core>2.2.4.GA</version.jboss.common.core>
     <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
     <version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>
-    <version.jbossxb>2.0.0.CR7</version.jbossxb>
+    <version.jbossxb>2.0.0.CR8</version.jbossxb>
     <version.jboss.aop>2.0.0.CR8</version.jboss.aop>
-    <version.jboss.vfs>2.0.0.Beta7</version.jboss.vfs>
+    <version.jboss.vfs>2.0.0.Beta10</version.jboss.vfs>
     <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>
   </properties>

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/AbstractJARStructureTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/AbstractJARStructureTest.java	2008-03-29 12:29:07 UTC (rev 71427)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/AbstractJARStructureTest.java	2008-03-29 13:13:07 UTC (rev 71428)
@@ -44,13 +44,14 @@
    
    public void testRootNotAnArchive() throws Throwable
    {
-      assertNotValid("/structure/jar/notanarchive", "NotAnArchive.jar");
-      assertNotValid("/structure/jar/notanarchive", "NotAnArchive.zip");
+      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.jar");
+      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.zip");
    }
    
    public void testSubdeploymentNotAnArchive() throws Throwable
    {
-      assertDeployNoChildren("/structure/jar", "notanarchive");
+      VFSDeploymentContext context = deploy("/structure/jar", "notanarchive");
+      assertChildContexts(context, "NotAnArchive.jar", "NotAnArchive.zip");
    }
 
    public void testJarAsRoot() throws Throwable

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/CombinedJARStructureUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/CombinedJARStructureUnitTestCase.java	2008-03-29 12:29:07 UTC (rev 71427)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/CombinedJARStructureUnitTestCase.java	2008-03-29 13:13:07 UTC (rev 71428)
@@ -47,9 +47,8 @@
 
    public void testRootNotAnArchive() throws Throwable
    {
-      // should not be valid anymore!
-      assertNotValid("/structure/jar/notanarchive", "NotAnArchive.jar");
-      assertNotValid("/structure/jar/notanarchive", "NotAnArchive.zip");
+      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.jar");
+      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.zip");
    }
 
    public void testSubdeploymentIsKnownFile() throws Throwable

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/war/test/CombinedWARStructureUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/war/test/CombinedWARStructureUnitTestCase.java	2008-03-29 12:29:07 UTC (rev 71427)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/war/test/CombinedWARStructureUnitTestCase.java	2008-03-29 13:13:07 UTC (rev 71428)
@@ -53,8 +53,7 @@
 
    public void testNotAnArchive() throws Throwable
    {
-      // should not be valid
-      assertNotValid("/structure/war/notanarchive", "notanarchive.war");
+      assertDeployNoChildren("/structure/war/notanarchive", "notanarchive.war");
    }
 
    protected VFSDeploymentContext determineStructure(VFSDeployment deployment) throws Exception