[jboss-cvs] JBoss Messaging SVN: r3902 - branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering.

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

Author: clebert.suconic at jboss.com
Date: 2008-03-20 19:15:59 -0400 (Thu, 20 Mar 2008)
New Revision: 3902

Modified:
   branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java
Log:
Fixing broken testcase (as fixed on Stable Branch)

Modified: branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java
===================================================================
--- branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java	2008-03-20 23:15:08 UTC (rev 3901)
+++ branches/Branch_JBossMessaging_1_4_0_SP3_CP/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java	2008-03-20 23:15:59 UTC (rev 3902)
@@ -23,9 +23,7 @@
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
-import javax.jms.Destination;
 import javax.jms.InvalidDestinationException;
-import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
@@ -33,6 +31,8 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
+import javax.jms.Destination;
+import javax.jms.JMSException;
 
 import org.jboss.test.messaging.tools.ServerManagement;
 import java.util.ArrayList;
@@ -260,6 +260,8 @@
       Session session0 = null;
       Session session1 = null;
       Session session2 = null;
+      
+      Session sessionProducer = null;
 
       try
       {
@@ -274,13 +276,16 @@
 
          session0 = connection0.createSession(true,
                Session.AUTO_ACKNOWLEDGE);
+         
+         sessionProducer = connection0.createSession(true, Session.AUTO_ACKNOWLEDGE);
 
          MessageConsumer subscriber0 = session0.createDurableSubscriber(
                topic[0], "sub");
-         TestListener messageListener0 = new TestListener();
+         TestListener messageListener0 = new TestListener(0);
          subscriber0.setMessageListener(messageListener0);
 
-         MessageProducer publisher = session0.createProducer(topic[0]);
+         MessageProducer publisher = sessionProducer.createProducer(topic[0]);
+         publisher.setDeliveryMode(DeliveryMode.PERSISTENT);
 
          session1 = connection1.createSession(true,
                Session.AUTO_ACKNOWLEDGE);
@@ -289,12 +294,12 @@
                topic[0], "sub2");
 
 
-         TestListener messageListener1 = new TestListener();
+         TestListener messageListener1 = new TestListener(1);
          subscriber1.setMessageListener(messageListener1);
 
          session2 = connection2.createSession(true, Session.AUTO_ACKNOWLEDGE);
          MessageConsumer subscriber2 = session2.createDurableSubscriber(topic[0], "sub3");
-         TestListener messageListener2 = new TestListener();
+         TestListener messageListener2 = new TestListener(2);
          subscriber2.setMessageListener(messageListener2);
 
 
@@ -304,8 +309,10 @@
 
 
          TextMessage message = session0.createTextMessage("Hello!");
+         log.info("Sending message");
          publisher.send(message);
-         session0.commit();
+         log.info("message sent " + message);
+         sessionProducer.commit();
 
          Message m0 = messageListener0.waitForMessage();
 
@@ -318,7 +325,7 @@
 
          Message m1 = messageListener1.waitForMessage();
          message = (TextMessage) m1;
-         Destination d1 = m1.getJMSDestination();
+
          assertTrue(m1.getJMSDestination() instanceof Topic);
          topicDest = (Topic)m1.getJMSDestination();
          log.info("******** topicName = " + topicDest.getTopicName());
@@ -332,7 +339,8 @@
          Destination d2 = m2.getJMSDestination();
          assertTrue(d2 instanceof Topic);
          assertEquals(topic[0].getTopicName(),((Topic)d2).getTopicName());
-
+         
+         log.info("Going to commit 0");
          session0.commit();
          session1.commit();
          session2.commit();
@@ -340,6 +348,10 @@
          subscriber0.close();
          subscriber1.close();
          subscriber2.close();
+         
+         assertEquals(1, messageListener0.received);
+         assertEquals(1, messageListener1.received);
+         assertEquals(1, messageListener2.received);
 
          session0.unsubscribe("sub");
          session1.unsubscribe("sub2");
@@ -1791,7 +1803,6 @@
 
    // Inner classes -------------------------------------------------
 
-   
    public class TestListener implements MessageListener
    {
       // Constants -----------------------------------------------------
@@ -1799,20 +1810,27 @@
       // Static --------------------------------------------------------
 
       // Attributes ----------------------------------------------------
+      
+      int received;
 
       private Message message;
+      
+      private int id;
 
       // Constructors --------------------------------------------------
 
-      public TestListener()
+      public TestListener(int id)
       {
+         this.id=id;
       }
 
       // MessageListener implementation --------------------------------
 
       public synchronized void onMessage(Message message)
       {
+         log.info("TestListener ID(" + id + ") Received message " + message);
          this.message = message;
+         received ++;
          notifyAll();
       }
 
@@ -1851,5 +1869,4 @@
 
    }
 
-
 }