[jboss-svn-commits] JBL Code SVN: r25889 - in labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc: test_esb_archives/exploded-esb-archive.esb/META-INF and 1 other directory.

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

Author: beve
Date: 2009-03-30 07:17:34 -0400 (Mon, 30 Mar 2009)
New Revision: 25889

Modified:
   labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java
   labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java
   labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml
Log:
Added some more asserts.


Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java	2009-03-30 11:16:30 UTC (rev 25888)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/EsbConfigParserUnitTest.java	2009-03-30 11:17:34 UTC (rev 25889)
@@ -21,11 +21,11 @@
 package org.jboss.soa.esb.listeners.deployers.mc;
 
 import java.net.URL;
+import java.util.Set;
 
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.deployment.DeploymentException;
+import javax.management.ObjectName;
+
 import org.jboss.test.kernel.junit.MicrocontainerTest;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * Unit tests for {@link EsbConfigParser}.
@@ -45,24 +45,22 @@
         super(name);
     }
     
-    public void testEsbArchive() throws Throwable
+    public void testExplodedEsbArchiveDependencies() throws Throwable
     {
-        // Will not work with the current version of mc.
-        //assertDeployed(dir, "esb-archive.esb");
-    }
-    
-    public void testExplodedEsbArchive() throws Throwable
-    {
-        EsbMetaData esbMetaData = getEsbMetaData(dir, "exploded-esb-archive.esb");
+        EsbMetaData esbMetaData = TestUtil.getEsbMetaData(parserDeployer, dir, "exploded-esb-archive.esb");
         assertEquals("exploded-esb-archive.esb", esbMetaData.getArchiveName());
-        System.out.println(esbMetaData.getDependencies());
+        assertEquals("exploded-esb-archive", esbMetaData.getDeploymentName());
+        Set<ObjectName> deps = esbMetaData.getDependencies();
+        assertTrue(deps.contains(new ObjectName("jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb")));
+        assertTrue(deps.contains(new ObjectName("jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw")));
+        assertTrue(deps.contains(new ObjectName("jboss.web.deployment:war=/test2")));
     }
     
-    private EsbMetaData getEsbMetaData(final URL dir, final String archiveName) throws Exception, DeploymentException
+    /* Will not work with the current version of mc.
+    public void testEsbArchive() throws Throwable
     {
-        VirtualFile virtualFile = TestUtil.getVirtualFile(dir, archiveName, this.getClass());
-        VFSDeploymentUnit deploymentUnit = TestUtil.getDeploymentUnit(virtualFile);
-        return parserDeployer.parse(deploymentUnit, virtualFile, (EsbMetaData)null);
+        assertDeployed(dir, "esb-archive.esb");
     }
+    */
     
 }

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java	2009-03-30 11:16:30 UTC (rev 25888)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/TestUtil.java	2009-03-30 11:17:34 UTC (rev 25889)
@@ -38,6 +38,7 @@
 import org.jboss.deployers.vfs.spi.structure.StructureDeployer;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployment.DeploymentException;
 import org.jboss.virtual.VFS;
 import org.jboss.virtual.VirtualFile;
 import org.jboss.virtual.spi.VFSContext;
@@ -51,9 +52,7 @@
  */
 public class TestUtil
 {
-    private TestUtil()
-    {
-    }
+    private TestUtil() { }
 
     public static VFSDeploymentUnit getDeploymentUnit(final VirtualFile esbArchive) throws Exception
     {
@@ -224,4 +223,17 @@
         });
         return file;
     }
+    
+    public static VFSDeploymentUnit getDeploymentUnit(final URL dir, final String archiveName) throws Exception
+    {
+        VirtualFile virtualFile = TestUtil.getVirtualFile(dir, archiveName, TestUtil.class);
+        return TestUtil.getDeploymentUnit(virtualFile);
+    }
+    
+    public static EsbMetaData getEsbMetaData(final EsbConfigParser parserDeployer, final URL dir, final String archiveName) throws Exception, DeploymentException
+    {
+        VirtualFile virtualFile = TestUtil.getVirtualFile(dir, archiveName, TestUtil.class);
+        VFSDeploymentUnit deploymentUnit = getDeploymentUnit(dir, archiveName);
+        return parserDeployer.parse(deploymentUnit, virtualFile, (EsbMetaData)null);
+    }
 }

Modified: labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml
===================================================================
--- labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml	2009-03-30 11:16:30 UTC (rev 25888)
+++ labs/jbossesb/workspace/dbevenius/jbossas5/product/rosetta/tests/src/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/META-INF/jboss-esb.xml	2009-03-30 11:17:34 UTC (rev 25889)
@@ -33,7 +33,7 @@
                               busidref="quickstartEsbChannel"
                 />
             </listeners>
-            <actions mep="OneWay">
+            <actions mep="OneWay" webservice="true" inXsd="/org/jboss/soa/esb/listeners/deployers/mc/test_esb_archives/exploded-esb-archive.esb/request.xsd">
                    <action name="action1"
                     class="org.jboss.soa.esb.samples.quickstart.helloworld.MyJMSListenerAction"
                     process="displayMessage"