[jboss-cvs] JBossAS SVN: r77421 - 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-08-25 07:55:47 -0400 (Mon, 25 Aug 2008)
New Revision: 77421

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:
[JBDEPLOY-76]; Upgrade VFS to 2.0.0.Beta22.
Fix tests to understand lazy VFS notion.

Modified: projects/jboss-deployers/trunk/build/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/build/pom.xml	2008-08-25 11:48:26 UTC (rev 77420)
+++ projects/jboss-deployers/trunk/build/pom.xml	2008-08-25 11:55:47 UTC (rev 77421)
@@ -30,7 +30,7 @@
     <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
     <version.jbossxb>2.0.0.CR12</version.jbossxb>
     <version.jboss.aop>2.0.0.CR15</version.jboss.aop>
-    <version.jboss.vfs>2.0.0.Beta21</version.jboss.vfs>
+    <version.jboss.vfs>2.0.0.Beta22</version.jboss.vfs>
     <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
     <version.junit>4.4</version.junit>
     <version.javassist>3.8.1.GA</version.javassist>

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-08-25 11:48:26 UTC (rev 77420)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/AbstractJARStructureTest.java	2008-08-25 11:55:47 UTC (rev 77421)
@@ -44,14 +44,13 @@
    
    public void testRootNotAnArchive() throws Throwable
    {
-      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.jar");
-      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.zip");
+      assertNotValid("/structure/jar/notanarchive", "NotAnArchive.jar");
+      assertNotValid("/structure/jar/notanarchive", "NotAnArchive.zip");
    }
    
    public void testSubdeploymentNotAnArchive() throws Throwable
    {
-      VFSDeploymentContext context = deploy("/structure/jar", "notanarchive");
-      assertChildContexts(context, "NotAnArchive.jar", "NotAnArchive.zip");
+      assertDeployNoChildren("/structure/jar", "notanarchive");
    }
 
    public void testJarAsRoot() throws Throwable
@@ -77,7 +76,7 @@
       assertChildContexts(context, "sub.jar");
    }
    
-   public void testdirectoryHasMetaInf() throws Throwable
+   public void testDirectoryHasMetaInf() throws Throwable
    {
       assertDeployNoChildren("/structure/jar/subdirhasmetainf", "sub");
    }

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-08-25 11:48:26 UTC (rev 77420)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/jar/test/CombinedJARStructureUnitTestCase.java	2008-08-25 11:55:47 UTC (rev 77421)
@@ -47,8 +47,8 @@
 
    public void testRootNotAnArchive() throws Throwable
    {
-      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.jar");
-      assertDeployNoChildren("/structure/jar/notanarchive", "NotAnArchive.zip");
+      assertNotValid("/structure/jar/notanarchive", "NotAnArchive.jar");
+      assertNotValid("/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-08-25 11:48:26 UTC (rev 77420)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/structure/war/test/CombinedWARStructureUnitTestCase.java	2008-08-25 11:55:47 UTC (rev 77421)
@@ -53,7 +53,7 @@
 
    public void testNotAnArchive() throws Throwable
    {
-      assertDeployNoChildren("/structure/war/notanarchive", "notanarchive.war");
+      assertNotValid("/structure/war/notanarchive", "notanarchive.war");
    }
 
    protected VFSDeploymentContext determineStructure(VFSDeployment deployment) throws Exception