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

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

Author: scott.stark at jboss.org
Date: 2006-12-10 17:52:16 -0500 (Sun, 10 Dec 2006)
New Revision: 58957

Modified:
   projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/BaseDeployersTest.java
   projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/metadata/test/MetaDataUnitTestCase.java
   projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/jar/test/JARStructureUnitTestCase.java
Log:
Update the expected urls for the changes to the vfsurl changes

Modified: projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/BaseDeployersTest.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/BaseDeployersTest.java	2006-12-10 01:12:45 UTC (rev 58956)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/BaseDeployersTest.java	2006-12-10 22:52:16 UTC (rev 58957)
@@ -95,8 +95,20 @@
       URL url = getResource(path);
       return url.toString();
    }
-   
    /**
+    * Get a vfs url string from a path
+    * 
+    * @param path
+    * @return
+    * @throws Exception
+    */
+   protected String getVfsURL(String path) throws Exception
+   {
+      URL url = getResource(path);
+      return "vfs"+url.toString();
+   }
+
+   /**
     * Get a jar url string from a path
     * 
     * @param path the path

Modified: projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/metadata/test/MetaDataUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/metadata/test/MetaDataUnitTestCase.java	2006-12-10 01:12:45 UTC (rev 58956)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/metadata/test/MetaDataUnitTestCase.java	2006-12-10 22:52:16 UTC (rev 58957)
@@ -53,7 +53,7 @@
    public void testExactMatchTopLevel() throws Exception
    {
       DeploymentContext context = createDeploymentContext("/metadata", "toplevel/exact/jboss-service.xml");
-      String expected = getURL("/metadata/toplevel/exact/jboss-service.xml");
+      String expected = getVfsURL("/metadata/toplevel/exact/jboss-service.xml");
       assertMetaDataMatch(context, expected, "jboss-service.xml");
    }
 
@@ -67,7 +67,7 @@
    {
       DeploymentContext context = createDeploymentContext("/metadata", "toplevel/partial/mydb-ds.xml");
       Set<String> expected = new HashSet<String>();
-      expected.add(getURL("/metadata/toplevel/partial/mydb-ds.xml"));
+      expected.add(getVfsURL("/metadata/toplevel/partial/mydb-ds.xml"));
       assertMetaDataMatch(context, expected, null, "-ds.xml");
    }
 
@@ -81,7 +81,7 @@
    {
       DeploymentContext context = createDeploymentContext("/metadata", "toplevel/metadata.jar");
       context.setMetaDataPath("META-INF");
-      String expected = getURL("/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml");
+      String expected = getVfsURL("/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml");
       assertMetaDataMatch(context, expected, "jboss-service.xml");
    }
 
@@ -111,8 +111,8 @@
       DeploymentContext context = createDeploymentContext("/metadata", "toplevel/metadata.jar");
       context.setMetaDataPath("META-INF");
       Set<String> expected = new HashSet<String>();
-      expected.add(getURL("/metadata/toplevel/metadata.jar/META-INF/1-ds.xml"));
-      expected.add(getURL("/metadata/toplevel/metadata.jar/META-INF/2-ds.xml"));
+      expected.add(getVfsURL("/metadata/toplevel/metadata.jar/META-INF/1-ds.xml"));
+      expected.add(getVfsURL("/metadata/toplevel/metadata.jar/META-INF/2-ds.xml"));
       assertMetaDataMatch(context, expected, null, "-ds.xml");
    }
 
@@ -142,9 +142,9 @@
       DeploymentContext context = createDeploymentContext("/metadata", "toplevel/metadata.jar");
       context.setMetaDataPath("META-INF");
       Set<String> expected = new HashSet<String>();
-      expected.add(getURL("/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml"));
-      expected.add(getURL("/metadata/toplevel/metadata.jar/META-INF/1-ds.xml"));
-      expected.add(getURL("/metadata/toplevel/metadata.jar/META-INF/2-ds.xml"));
+      expected.add(getVfsURL("/metadata/toplevel/metadata.jar/META-INF/jboss-service.xml"));
+      expected.add(getVfsURL("/metadata/toplevel/metadata.jar/META-INF/1-ds.xml"));
+      expected.add(getVfsURL("/metadata/toplevel/metadata.jar/META-INF/2-ds.xml"));
       assertMetaDataMatch(context, expected, "jboss-service.xml", "-ds.xml");
    }
 

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-12-10 01:12:45 UTC (rev 58956)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/jar/test/JARStructureUnitTestCase.java	2006-12-10 22:52:16 UTC (rev 58957)
@@ -154,8 +154,8 @@
       expected.put(getJarURL("/structure/jar/indirectory/archive.jar"), true);
       expected.put(getJarURL("/structure/jar/indirectory/archive.zip"), true);
       */
-      expected.put(getURL("/structure/jar/indirectory/archive.jar"), true);
-      expected.put(getURL("/structure/jar/indirectory/archive.zip"), true);
+      expected.put(getVfsURL("/structure/jar/indirectory/archive.jar"), true);
+      expected.put(getVfsURL("/structure/jar/indirectory/archive.zip"), true);
       assertContexts(expected, context.getChildren());
       
       assertCandidatesValid(context);
@@ -180,7 +180,7 @@
       
       // Test it got all the candidates
       Map<String, Boolean> expected = new HashMap<String, Boolean>();
-      expected.put(getURL("/structure/jar/subdirisajar/sub.jar/"), true);
+      expected.put(getVfsURL("/structure/jar/subdirisajar/sub.jar/"), true);
       assertContexts(expected, context.getChildren());
       
       assertCandidatesValid(context);