[jboss-svn-commits] JBL Code SVN: r22612 - in labs/jbossesb/workspace/skeagh/runtime/src: test/java/org/jboss/esb/deploy/config and 1 other directories.

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

Author: tcunning
Date: 2008-09-10 12:33:58 -0400 (Wed, 10 Sep 2008)
New Revision: 22612

Modified:
   labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DeploymentLifecycleTest.java
   labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java
Log:
JBESB-2004
Use DigestUtil helper class.


Modified: labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java	2008-09-10 16:18:26 UTC (rev 22611)
+++ labs/jbossesb/workspace/skeagh/runtime/src/main/java/org/jboss/esb/deploy/config/digest/DigestUtil.java	2008-09-10 16:33:58 UTC (rev 22612)
@@ -257,9 +257,7 @@
     {
         DeploymentRuntime runtime = new DeploymentRuntime();
         DefaultConfigurationDigester digester = new DefaultConfigurationDigester();
-        DeploymentUnit deploymentUnit;
-
-        deploymentUnit = digester.digest(config);
+        DeploymentUnit deploymentUnit = digester.digest(config);
         runtime.add(deploymentUnit);
 
         return runtime;

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DeploymentLifecycleTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DeploymentLifecycleTest.java	2008-09-10 16:18:26 UTC (rev 22611)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/deploy/config/DeploymentLifecycleTest.java	2008-09-10 16:33:58 UTC (rev 22612)
@@ -23,6 +23,7 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.config.digest.DefaultConfigurationDigester;
+import org.jboss.esb.deploy.config.digest.DigestUtil;
 
 import java.io.IOException;
 
@@ -42,10 +43,7 @@
 
     public void test_deploy_01_noexception() throws DeploymentException, IOException
     {
-        DeploymentRuntime runtime = new DeploymentRuntime();
-        DeploymentUnit configUnit = digest("jbossesb-deploy-01.xml");
-
-        runtime.add(configUnit);
+        DeploymentRuntime runtime = DigestUtil.digestConfig(getClass().getResourceAsStream("jbossesb-deploy-01.xml"));
         assertDeployed(false);
         runtime.deploy();
         assertDeployed(true);
@@ -55,10 +53,8 @@
 
     public void test_deploy_01_exception() throws DeploymentException, IOException
     {
-        DeploymentRuntime runtime = new DeploymentRuntime();
-        DeploymentUnit configUnit = digest("jbossesb-deploy-01.xml");
+        DeploymentRuntime runtime = DigestUtil.digestConfig(getClass().getResourceAsStream("jbossesb-deploy-01.xml"));
 
-        runtime.add(configUnit);
         assertDeployed(false);
         MyInRouter.exception = new Exception("deploy exception");
         try
@@ -80,10 +76,4 @@
         assertEquals(deployed, MyResource.initialised);
         assertEquals(deployed, MyTestService.initialised);
     }
-
-    private DeploymentUnit digest(String config) throws IOException, DeploymentException
-    {
-        DefaultConfigurationDigester digester = new DefaultConfigurationDigester();
-        return digester.digest(getClass().getResourceAsStream(config));
-    }
-}
+}
\ No newline at end of file

Modified: labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java	2008-09-10 16:18:26 UTC (rev 22611)
+++ labs/jbossesb/workspace/skeagh/runtime/src/test/java/org/jboss/esb/schedule/ScheduleListenerTest.java	2008-09-10 16:33:58 UTC (rev 22612)
@@ -23,6 +23,7 @@
 import org.jboss.esb.deploy.DeploymentException;
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.config.digest.DefaultConfigurationDigester;
+import org.jboss.esb.deploy.config.digest.DigestUtil;
 import org.jboss.esb.deploy.config.DeploymentUnit;
 import org.jboss.esb.routing.RoutingException;
 import org.jboss.esb.service.ServiceName;
@@ -40,12 +41,8 @@
     public void test_OK() throws DeploymentException, IOException, RoutingException, InterruptedException
     {
         ServiceName service = new ServiceName("hello", "hello");
-        DeploymentRuntime runtime = new DeploymentRuntime();
-        DefaultConfigurationDigester digester = new DefaultConfigurationDigester();
-        DeploymentUnit deploymentUnit = digester.digest(getClass().getResourceAsStream("schedule-listener-01.xml"));
+        DeploymentRuntime runtime = DigestUtil.digestConfig(getClass().getResourceAsStream("schedule-listener-01.xml"));
 
-        runtime.add(deploymentUnit);
-
         // Set the mock router's message before deploying...
         MockScheduledInboundRouter.inMessage = new Message("Hi, this is the mock scheduled inRouter!");
 
@@ -54,7 +51,7 @@
         // Sleep for a second in order to all the message to be delivered by the mock router...
         Thread.sleep(1000);
         try {
-            HelloWorldService helloService = (HelloWorldService) deploymentUnit.getServices().get(service).getService();
+            HelloWorldService helloService = (HelloWorldService) runtime.getDeploymentUnits().get(0).getServices().get(service).getService();
             assertEquals("Hi, this is the mock scheduled inRouter!", helloService.getHelloMessage());
         } finally {
             runtime.undeploy();
@@ -63,12 +60,8 @@
 
     public void test_no_schedule() throws DeploymentException, IOException, RoutingException, InterruptedException
     {
-        DeploymentRuntime runtime = new DeploymentRuntime();
-        DefaultConfigurationDigester digester = new DefaultConfigurationDigester();
-        DeploymentUnit deploymentUnit = digester.digest(getClass().getResourceAsStream("schedule-listener-02.xml"));
+        DeploymentRuntime runtime = DigestUtil.digestConfig(getClass().getResourceAsStream("schedule-listener-02.xml"));
 
-        runtime.add(deploymentUnit);
-
         // Set the mock router's message before deploying...
         MockScheduledInboundRouter.inMessage = new Message("Hi, this is the mock scheduled inRouter!");
 
@@ -82,12 +75,8 @@
 
     public void test_not_a_schedule() throws DeploymentException, IOException, RoutingException, InterruptedException
     {
-        DeploymentRuntime runtime = new DeploymentRuntime();
-        DefaultConfigurationDigester digester = new DefaultConfigurationDigester();
-        DeploymentUnit deploymentUnit = digester.digest(getClass().getResourceAsStream("schedule-listener-03.xml"));
+        DeploymentRuntime runtime = DigestUtil.digestConfig(getClass().getResourceAsStream("schedule-listener-03.xml"));
 
-        runtime.add(deploymentUnit);
-
         // Set the mock router's message before deploying...
         MockScheduledInboundRouter.inMessage = new Message("Hi, this is the mock scheduled inRouter!");