[jboss-svn-commits] JBL Code SVN: r30837 - labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config.

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

Author: beve
Date: 2009-12-27 23:12:51 -0500 (Sun, 27 Dec 2009)
New Revision: 30837

Modified:
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java
Log:
Attempting to fix the build.


Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java	2009-12-28 03:03:38 UTC (rev 30836)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/listeners/config/JBoss4ESBDeployerUnitTest.java	2009-12-28 04:12:51 UTC (rev 30837)
@@ -51,9 +51,7 @@
     {
         File directory = new File(getClass().getResource("schemasDir").getFile());
         Map<String, String> schemas = JBoss4ESBDeployer.getSchemasFromDirectory(directory);
-        assertTrue(schemas.containsKey("mock.xsd"));
-        assertTrue(schemas.containsKey("subdir/type.xsd"));
-        assertTrue(schemas.containsKey("subdir/subdir2/type.xsd"));
+        assertAddedSchemas(schemas);
     }
     
     @Test
@@ -71,10 +69,7 @@
         final URL resource = getClass().getResource("schemasExploded.esb");
         final File jbossEsbXml = new File(resource.getFile() + File.separator + "META-INF" + File.separator + "jboss-esb.xml" );
         final Map<String, String> schemas = JBoss4ESBDeployer.getSchemas(jbossEsbXml);
-        
-        assertTrue(schemas.containsKey("mock.xsd"));
-        assertTrue(schemas.containsKey("subdir/type.xsd"));
-        assertTrue(schemas.containsKey("subdir/subdir2/type.xsd"));
+        assertAddedSchemas(schemas);
     }
     
     @Test
@@ -84,6 +79,13 @@
         assertTrue(schemas.isEmpty());
     }
     
+    private void assertAddedSchemas(final Map<String, String> schemas)
+    {
+        assertTrue(schemas.containsKey("mock.xsd"));
+        assertTrue(schemas.containsKey("subdir" + File.separator + "type.xsd"));
+        assertTrue(schemas.containsKey("subdir" + File.separator + "subdir2" + File.separator + "type.xsd"));
+    }
+
     public static junit.framework.Test suite()
     {
         return new JUnit4TestAdapter(JBoss4ESBDeployerUnitTest.class);