[jboss-cvs] JBoss Messaging SVN: r1541 - in branches/Branch_Client_Failover_Experiment/tests: bin src/org/jboss/test/messaging/core/ha

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

Author: clebert.suconic at jboss.com
Date: 2006-11-01 15:50:28 -0500 (Wed, 01 Nov 2006)
New Revision: 1541

Modified:
   branches/Branch_Client_Failover_Experiment/tests/bin/runtest
   branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectClusteredTest.java
Log:
Fixing testcase (setting commit at the end)

Modified: branches/Branch_Client_Failover_Experiment/tests/bin/runtest
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/bin/runtest	2006-11-01 20:45:04 UTC (rev 1540)
+++ branches/Branch_Client_Failover_Experiment/tests/bin/runtest	2006-11-01 20:50:28 UTC (rev 1541)
@@ -94,7 +94,7 @@
     shift
 done
 
-JAVA_OPTS="-Xmx1024M $JAVA_OPTS -Dmodule.output=$reldir/../output $REMOTE_TEST -Dtest.database=$TEST_DATABASE -Dtest.serialization=$TEST_SERIALIZATION -Dbuild.lib=../../output/lib -DNODE1=10.1.5.1 -DNODE2=10.1.5.2"
+JAVA_OPTS="-Xmx1024M $JAVA_OPTS -Dmodule.output=$reldir/../output $REMOTE_TEST -Dtest.database=$TEST_DATABASE -Dtest.serialization=$TEST_SERIALIZATION -Dbuild.lib=../../output/lib"
 
 if [ "$TARGET_TEST" != "" ]; then
    TARGET_TEST="-t $TARGET_TEST"

Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectClusteredTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectClusteredTest.java	2006-11-01 20:45:04 UTC (rev 1540)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/core/ha/ReconnectClusteredTest.java	2006-11-01 20:50:28 UTC (rev 1541)
@@ -10,6 +10,8 @@
 import org.jboss.jms.client.delegate.ClientConnectionDelegate;
 import org.jboss.jms.client.delegate.ClientSessionDelegate;
 import org.jboss.jms.message.TextMessageProxy;
+import org.jboss.jms.message.JBossMessage;
+import org.jboss.jms.message.MessageProxy;
 import org.jboss.test.messaging.tools.ServerManagement;
 
 
@@ -197,7 +199,7 @@
 
     public void testTopicSubscriber() throws Exception
     {
-        log.info("++testSimpleWithOneProducerTransacted");
+        log.info("++testTopicSubscriber");
 
         log.info(">>Lookup Queue");
         Destination destination = (Destination)getCtx1().lookup("topic/testDistributedTopic");
@@ -206,17 +208,12 @@
         JBossConnection  conn = (JBossConnection)this.factoryServer1.createConnection();
         conn.setClientID("testClient");
         conn.start();
+
         JBossSession session = (JBossSession)conn.createSession(true,Session.AUTO_ACKNOWLEDGE);
-
-        log.info("ConnectionCreated=" + conn);
-        log.info(">>Creating Sessions");
-
         ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate)session.getDelegate();
         SessionState sessionState = (SessionState)clientSessionDelegate.getState();
-        //MessageConsumer consumerHA = session.createConsumer(destination);
 
         MessageConsumer consumerHA = session.createDurableSubscriber((Topic)destination,"T1");
-
         JBossMessageConsumer jbossConsumerHA =(JBossMessageConsumer)consumerHA;
 
         org.jboss.jms.client.delegate.ClientConsumerDelegate clientDelegate = (org.jboss.jms.client.delegate.ClientConsumerDelegate)jbossConsumerHA.getDelegate();
@@ -233,7 +230,7 @@
         producer.send(message);
         session.commit();
 
-        assertNotNull(consumerHA.receive(3000));
+        receiveMessage("consumerHA",consumerHA,true,false);
 
         Object txID = sessionState.getCurrentTxId();
 
@@ -277,19 +274,44 @@
 
         session.commit();
 
-        //assertNotNull(consumerSecondServer.receive(3000));
-        assertNotNull(consumerSecondServer.receive(3000));
-        assertNotNull(consumerSecondServer.receive(3000));
-        assertNull(consumerSecondServer.receive(3000));
+        receiveMessage("consumerSecondServer",consumerSecondServer,true,false);
+        receiveMessage("consumerSecondServer",consumerSecondServer,true,false);
+        receiveMessage("consumerSecondServer",consumerSecondServer,true,true);
 
         log.info("Calling alternate receiver");
-        //assertNotNull(consumerHA.receive(1000));
-        assertNotNull(consumerHA.receive(1000));
-        assertNotNull(consumerHA.receive(1000));
-        assertNull(consumerHA.receive(1000));
+        receiveMessage("consumerHA",consumerHA,true,false);
+        receiveMessage("consumerHA",consumerHA,true,false);
+        receiveMessage("consumerHA",consumerHA,true,true);
 
+        session.commit();
+
     }
 
+    private void receiveMessage(String text, MessageConsumer consumer, boolean shouldAssert, boolean shouldBeNull) throws Exception
+    {
+        MessageProxy message = (MessageProxy)consumer.receive(3000);
+        TextMessage txtMessage = (TextMessage)message;
+        if (message!=null)
+        {
+            log.info(text + ": messageID from messageReceived=" + message.getMessage().getMessageID() + " message = " + message + " content=" + txtMessage.getText());
+        }
+        else
+        {
+            log.info(text + ": Message received was null");
+        }
+        if (shouldAssert)
+        {
+            if (shouldBeNull)
+            {
+                assertNull(message);
+            }
+            else
+            {
+                assertNotNull(message);
+            }
+        }
+    }
+
    public void testSimplestDurableSubscription() throws Exception
    {
       ConnectionFactory cf = factoryServer1;