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

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

Author: alesj
Date: 2008-05-28 08:58:11 -0400 (Wed, 28 May 2008)
New Revision: 73739

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:
Simple fixes.

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-28 12:50:11 UTC (rev 73738)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/support/Classpath.java	2008-05-28 12:58:11 UTC (rev 73739)
@@ -102,7 +102,6 @@
             }
             else if (path.endsWith(suffix))
             {
-               // result.add(new URL("file:/" + path));
                result.add(fc[i].toURL());
             }
          }
@@ -111,6 +110,17 @@
       return false;
    }
 
+   /**
+    * Search from URL.
+    * Fall back on prefix tokens if
+    * not able to read from original url param.
+    *
+    * @param result the result urls
+    * @param prefix the current prefix
+    * @param suffix the suffix to match
+    * @param url the current url to start search
+    * @throws IOException for any error
+    */
    private static void searchFromURL(Set result, String prefix, String suffix, URL url) throws IOException
    {
       boolean done = false;
@@ -123,7 +133,7 @@
             if (is instanceof ZipInputStream)
                zis = (ZipInputStream)is;
             else
-               zis = new ZipInputStream(is);   
+               zis = new ZipInputStream(is);
             ZipEntry entry = zis.getNextEntry();
             String urlString = url.toExternalForm();
             while (entry != null)
@@ -145,22 +155,36 @@
       {
          String urlString = url.toExternalForm();
          String[] split = prefix.split("/");
-         prefix = join(split, false);
-         String end = join(split, true);
+         prefix = join(split, true);
+         String end = join(split, false);
          int p = urlString.lastIndexOf(end);
          url = new URL(urlString.substring(0, p));
          searchFromURL(result, prefix, suffix, url);
       }
    }
 
-   private static String join(String[] split, boolean full)
+   /**
+    * Join tokens, exlude last if param equals true.
+    *
+    * @param tokens the tokens
+    * @param excludeLast do we exclude last token
+    * @return joined tokens
+    */
+   private static String join(String[] tokens, boolean excludeLast)
    {
       String join = "";
-      for (int i =0; i < split.length - (full ? 0 : 1); i++)
-         join += split[i];
+      for (int i = 0; i < tokens.length - (excludeLast ? 1 : 0); i++)
+         join += tokens[i];
       return join;
    }
 
+   /**
+    * Open input stream from url.
+    * Ignore any errors.
+    *
+    * @param url the url to open
+    * @return input stream or null if not possible
+    */
    private static InputStream getInputStream(URL url)
    {
       try

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-28 12:50:11 UTC (rev 73738)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/facelets/test/FaceletsUnitTestCase.java	2008-05-28 12:58:11 UTC (rev 73739)
@@ -61,6 +61,8 @@
    protected void setUp() throws Exception
    {
       super.setUp();
+      // Uncomment this to test VFS nested jar copy handling
+      //System.setProperty(VFSUtils.FORCE_COPY_KEY, "true");
       addStructureDeployer(main, new WARStructure());
    }
 
@@ -117,7 +119,7 @@
       testFacelets("packed");
    }
 
-   public void testUnpackedFacelets() throws Throwable
+   public void testExplodedFacelets() throws Throwable
    {
       testFacelets("exploded");
    }