[jboss-cvs] JBossAS SVN: r73796 - in projects/jboss-deployers/trunk/deployers-vfs/src: tests/org/jboss/test/deployers/vfs/deployer/facelets/support and 1 other directories.

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

Author: alesj
Date: 2008-05-29 09:13:24 -0400 (Thu, 29 May 2008)
New Revision: 73796

Added:
   projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/facelets/numberguess.war
Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/support/Classpath.java
   projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/test/FaceletsUnitTestCase.java
Log:
Fix 'done' assumption.

Added: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/facelets/numberguess.war
===================================================================
(Binary files differ)


Property changes on: projects/jboss-deployers/trunk/deployers-vfs/src/resources/tests/facelets/numberguess.war
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/support/Classpath.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/support/Classpath.java	2008-05-29 12:54:17 UTC (rev 73795)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/support/Classpath.java	2008-05-29 13:13:24 UTC (rev 73796)
@@ -135,6 +135,9 @@
             else
                zis = new ZipInputStream(is);
             ZipEntry entry = zis.getNextEntry();
+            // initial entry should not be null
+            // if we assume this is some inner jar
+            done = (entry != null);
             String urlString = url.toExternalForm();
             while (entry != null)
             {
@@ -145,7 +148,6 @@
                }
                entry = zis.getNextEntry();
             }
-            done = true;
          }
          catch (Exception ignore)
          {
@@ -153,7 +155,8 @@
       }
       if (done == false && prefix.length() > 0)
       {
-         String urlString = url.toExternalForm();
+         // we add '/' at the end since join adds it as well
+         String urlString = url.toExternalForm() + "/";
          String[] split = prefix.split("/");
          prefix = join(split, true);
          String end = join(split, false);

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/test/FaceletsUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/test/FaceletsUnitTestCase.java	2008-05-29 12:54:17 UTC (rev 73795)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/test/FaceletsUnitTestCase.java	2008-05-29 13:13:24 UTC (rev 73796)
@@ -98,15 +98,15 @@
       addDeployer(main, deployer);
    }
 
-   protected void testFacelets(String name) throws Throwable
+   protected void testFacelets(String name, int size) throws Throwable
    {
-      VFSDeployment context = createDeployment("/facelets", name + ".jar");
+      VFSDeployment context = createDeployment("/facelets", name);
       assertDeploy(context);
       try
       {
          URL[] urls = deployer.getUrls();
          assertNotNull(urls);
-         assertEquals(3, urls.length);
+         assertEquals(size, urls.length);
       }
       finally
       {
@@ -116,11 +116,16 @@
 
    public void testPackedFacelets() throws Throwable
    {
-      testFacelets("packed");
+      testFacelets("packed.jar", 3);
    }
 
    public void testExplodedFacelets() throws Throwable
    {
-      testFacelets("exploded");
+      testFacelets("exploded.jar", 3);
    }
+
+   public void testNumberguess() throws Throwable
+   {
+      testFacelets("numberguess.war", 5);
+   }
 }
\ No newline at end of file