[jboss-svn-commits] JBL Code SVN: r23165 - in labs/jbossesb/workspace/skeagh/routing/jms/src: test/java/org/jboss/esb/jms and 1 other directory.

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

Author: beve
Date: 2008-09-29 02:26:55 -0400 (Mon, 29 Sep 2008)
New Revision: 23165

Modified:
   labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java
   labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java
Log:
Minor updates to test and javadocs.


Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java	2008-09-29 06:14:16 UTC (rev 23164)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/main/java/org/jboss/esb/jms/JmsInboundRouter.java	2008-09-29 06:26:55 UTC (rev 23165)
@@ -59,7 +59,7 @@
  * <br>
  * Properties decription:
  * <lu>
- * <li>extractProperties true is JMS Headers and properties should be extracted and added to the invocation context</li>
+ * <li>extractProperties true if JMS Headers and properties should be extracted and added to the invocation context</li>
  * </lu>
  *
  * @author <a href="mailto:dbevenius at jboss.com">Daniel Bevenius</a>

Modified: labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java	2008-09-29 06:14:16 UTC (rev 23164)
+++ labs/jbossesb/workspace/skeagh/routing/jms/src/test/java/org/jboss/esb/jms/JmsInboundRouterTest.java	2008-09-29 06:26:55 UTC (rev 23165)
@@ -25,12 +25,15 @@
 
 import java.util.Properties;
 
+import javax.jms.JMSException;
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
 import org.jboss.esb.deploy.DeploymentRuntime;
 import org.jboss.esb.deploy.DeploymentUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -41,66 +44,70 @@
 public class JmsInboundRouterTest
 {
     private static final String DESTINATION_NAME = "jbossesb.TestQueue";
-    private String messageContent = "Some text as payload";
 
+    private static JmsTestProvider jmsProvider;
+
+    @BeforeClass
+    public static void startProvider() throws Exception
+    {
+        jmsProvider = new JmsTestProvider();
+        jmsProvider.start();
+    }
+
+    @AfterClass
+    public static void stopProvider() throws Exception
+    {
+        jmsProvider.stop();
+    }
+
     @Test
     public final void recieveAndDispatch() throws Exception
     {
-        new JmsInBoundRouterTestRunner("jms-inbound-router_01.xml").run();
+        DeploymentRuntime runtime = DeploymentUtil.createRuntime(getClass().getResourceAsStream("jms-inbound-router_01.xml"));
+        final String messageContent = "Some text as payload";
 
+        runtime.deploy();
+        try
+        {
+            Thread.sleep(3000);
+            sendMessage(messageContent, DESTINATION_NAME);
+        }
+        finally
+        {
+            runtime.undeploy();
+        }
+
         assertNotNull(MyTestService.getMessage());
         assertEquals(messageContent, MyTestService.getMessage().getPayload());
     }
 
-    private class JmsInBoundRouterTestRunner extends JMSTestRunner
+    private void sendMessage(final String payload, final String destination) throws JMSException, InterruptedException
     {
-        private String config;
+        Properties jndiProperties = jmsProvider.getJndiProperties();
+        jndiProperties.setProperty("queue." + destination, destination);
+        JMSSession jmsSession = new JMSSession(Queue.class, jndiProperties);
 
-        public JmsInBoundRouterTestRunner(final String config)
+        jmsSession.connect();
+        try
         {
-            this.config = config;
-        }
-
-        @Override
-        public void test() throws Exception
-        {
-            DeploymentRuntime runtime = DeploymentUtil.createRuntime(getClass().getResourceAsStream(config));
-
-            runtime.deploy();
+            MessageSender sender = new MessageSender(destination, jmsSession);
             try
             {
+                sender.connect();
+                Session session = sender.getSession();
+                TextMessage textMessage = session.createTextMessage(payload);
+                sender.send(textMessage);
                 Thread.sleep(3000);
-
-                Properties jndiProperties = getJndiProperties();
-                jndiProperties.setProperty("queue." + DESTINATION_NAME, DESTINATION_NAME);
-                JMSSession jmsSession = new JMSSession(Queue.class, jndiProperties);
-
-                jmsSession.connect();
-                try
-                {
-                    MessageSender sender = new MessageSender(DESTINATION_NAME, jmsSession);
-                    try
-                    {
-                        sender.connect();
-                        Session session = sender.getSession();
-                        TextMessage textMessage = session.createTextMessage(messageContent);
-                        sender.send(textMessage);
-                        Thread.sleep(3000);
-                    }
-                    finally
-                    {
-                        sender.close();
-                    }
-                }
-                finally
-                {
-                    jmsSession.close();
-                }
             }
             finally
             {
-                runtime.undeploy();
+                sender.close();
             }
         }
+        finally
+        {
+            jmsSession.close();
+        }
     }
+
 }