[jboss-cvs] JBossAS SVN: r57878 - in projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure: jar/test main/test

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

Author: scott.stark at jboss.org
Date: 2006-10-27 00:37:17 -0400 (Fri, 27 Oct 2006)
New Revision: 57878

Modified:
   projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/jar/test/JARStructureUnitTestCase.java
   projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/MainDeployerWarStructureUnitTestCase.java
Log:
Correct the invalid jar (but existing) archive tests.

Modified: projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/jar/test/JARStructureUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/jar/test/JARStructureUnitTestCase.java	2006-10-27 04:29:17 UTC (rev 57877)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/jar/test/JARStructureUnitTestCase.java	2006-10-27 04:37:17 UTC (rev 57878)
@@ -92,7 +92,8 @@
       return getValidContext(root, path, addTopLevelInfo);
    }
    
-   protected DeploymentContext assertNotValidContext(String root, String path, boolean addTopLevelInfo)
+   protected DeploymentContext assertNotValidContext(String root, String path,
+         boolean other, boolean addTopLevelInfo)
       throws Exception
    {
       DeploymentContext context = createDeploymentContext(root, path);
@@ -118,8 +119,8 @@
    
    public void testRootNotAnArchive() throws Exception
    {
-      assertNotValidContext("/structure/", "jar/notanarchive/NotAnArchive.jar", true);
-      assertNotValidContext("/structure/", "jar/notanarchive/NotAnArchive.zip", true);
+      assertNotValidContext("/structure/", "jar/notanarchive/NotAnArchive.jar", true, false);
+      assertNotValidContext("/structure/", "jar/notanarchive/NotAnArchive.zip", true, false);
    }
    
    public void testSubdeploymentNotAnArchive() throws Exception

Modified: projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/MainDeployerWarStructureUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/MainDeployerWarStructureUnitTestCase.java	2006-10-27 04:29:17 UTC (rev 57877)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/MainDeployerWarStructureUnitTestCase.java	2006-10-27 04:37:17 UTC (rev 57878)
@@ -60,11 +60,12 @@
       return context;
    }
 
-   protected DeploymentContext assertNotValidContext(String root, String path, boolean isValidJar) throws Exception
+   protected DeploymentContext assertNotValidContext(String root, String path,
+         boolean addTopLevelInfo, boolean isValidJar) throws Exception
    {
       // It might not be a valid war but it is a valid jar
       if (isValidJar)
-         return assertValidContext(root, path);
+         return assertValidContext(root, path, addTopLevelInfo);
 
       DeploymentContext context = createDeploymentContext(root, path);
       getMainDeployer().addDeploymentContext(context);