You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/19 01:05:22 UTC

svn commit: r638648 - in /geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple: JMSQueueReceiver.java JMSTopicSenderReceiver.java

Author: djencks
Date: Tue Mar 18 17:05:21 2008
New Revision: 638648

URL: http://svn.apache.org/viewvc?rev=638648&view=rev
Log:
slight jms test clean-ups

Modified:
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java
    geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java?rev=638648&r1=638647&r2=638648&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java Tue Mar 18 17:05:21 2008
@@ -75,14 +75,15 @@
             QueueReceiver queueReceiver = session.createReceiver(queue);
             Message msg = queueReceiver.receiveNoWait();
 
+            out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
+            out.println("<head><title>JMS Receiver</title></head>");
             if ( msg instanceof TextMessage ) {
                 TextMessage txtMsg = (TextMessage)msg;
                 System.out.println("Message : "+txtMsg.getText());
-                out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
-                out.println("<head><title>JMS Receiver</title></head>");
                 out.println("<body>Received JMS Queue Message</body></html>");
             }
             else {
+                System.out.println("No Message");
                 out.println("<body>Did Not Receive JMS Queue Message</body></html>");
             }
 

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java?rev=638648&r1=638647&r2=638648&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java Tue Mar 18 17:05:21 2008
@@ -40,6 +40,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 public class JMSTopicSenderReceiver extends HttpServlet implements Servlet {
 
@@ -47,7 +49,6 @@
     Context initialContext = null;
     TopicConnectionFactory tcf = null;
     Topic topic = null;
-    String msg = null;
 
     /* (non-Java-doc)
      * @see javax.servlet.http.HttpServlet#HttpServlet()
@@ -67,30 +68,30 @@
      * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest arg0, HttpServletResponse arg1)
      */
     protected void doPost(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException {
-
+        PrintWriter out = arg1.getWriter();
+        CountDownLatch latch = new CountDownLatch(1);
         try {
 
             String type = arg0.getParameter("type");
-            PrintWriter out = arg1.getWriter();
 
             TopicConnection connection = tcf.createTopicConnection();
             TopicSession session = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
             TopicSubscriber topicSubscriber = session.createSubscriber(topic);
-            TestListener test = new TestListener();
+            TestListener test = new TestListener(latch);
             topicSubscriber.setMessageListener(test);
             connection.start();
             TopicPublisher topicPublisher = session.createPublisher(topic);
             TextMessage tmsg = session.createTextMessage("JMS - Test Topic Message");
             topicPublisher.publish(tmsg);
-            if ( msg != null ) {
-                out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
-                out.println("<head><title>JMS Topic Sender Receiver</title></head>");
+            latch.await(1, TimeUnit.SECONDS);
+            out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
+            out.println("<head><title>JMS Topic Sender Receiver</title></head>");
+            if ( test.getMsg() != null ) {
                 out.println("<body>Received JMS Topic Message</body></html>");
             }
             else {
                 out.println("<body>Did Not Receive JMS Topic Message</body></html>");
             }
-
             topicSubscriber.close();
             session.close();
             connection.stop();
@@ -117,11 +118,23 @@
 
     private class TestListener implements MessageListener {
 
+        private final CountDownLatch latch;
+        private volatile String msg = null;
+
+        private TestListener(CountDownLatch latch) {
+            this.latch = latch;
+        }
+
+        public String getMsg() {
+            return msg;
+        }
+
         public void onMessage(Message message)
         {
             try {
                 TextMessage textMessage = (TextMessage)message;
                 msg = textMessage.getText( );
+                latch.countDown();
                 System.out.println("Message : "+msg);
 
             }