[jboss-cvs] JBoss Messaging SVN: r2881 - trunk/tests/src/org/jboss/test/messaging/jms/clustering.

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

Author: timfox
Date: 2007-07-12 07:57:11 -0400 (Thu, 12 Jul 2007)
New Revision: 2881

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java
Log:
Fixed test


Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java	2007-07-12 11:21:18 UTC (rev 2880)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java	2007-07-12 11:57:11 UTC (rev 2881)
@@ -490,60 +490,74 @@
          SimpleFailoverListener failoverListener = new SimpleFailoverListener();
          ((JBossConnection)xaConn1).registerFailoverListener(failoverListener);
          
-         XASession sess0 = xaConn0.createXASession();
          
-         XAResource res0 = sess0.getXAResource();
          
-         MessageProducer prod0 = sess0.createProducer(queue[0]);
          
-         MessageConsumer cons0 = sess0.createConsumer(queue[0]);
+                     
+         tm.begin();
          
+         Transaction tx = tm.getTransaction();
          
-         XASession sess1 = xaConn1.createXASession();
+
          
-         XAResource res1 = sess1.getXAResource();
+         //receive and send a message on each
          
-         MessageProducer prod1 = sess1.createProducer(queue[1]);
+         // node 0
          
-         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
+         XASession sess0 = xaConn0.createXASession();
          
-                           
-         tm.begin();
+         XAResource res0 = sess0.getXAResource();
          
-         Transaction tx = tm.getTransaction();
+         tx.enlistResource(res0);         
          
-         tx.enlistResource(res0);
+         MessageProducer prod0 = sess0.createProducer(queue[0]);
          
-         tx.enlistResource(res1);
+         MessageConsumer cons0 = sess0.createConsumer(queue[0]);
          
-         //receive a message
-         
          TextMessage received = (TextMessage)cons0.receive(2000);
          
-         assertNotNull(received);
+         log.info("Got message " + received.getText());
          
-         assertEquals(sent0.getText(), received.getText());
+         assertNotNull(received);         
          
+         assertEquals(sent0.getText(), received.getText());                  
          
-         received = (TextMessage)cons1.receive(2000);
+         TextMessage msg0 = sess0.createTextMessage("Cupid stunt0");
          
-         assertNotNull(received);
+         prod0.send(msg0);
          
-         assertEquals(sent1.getText(), received.getText());
+         //Make sure the consumer is closed otherwise message might be sucked
+         cons0.close();
          
+
+         
+         //node 1
+         
+         XASession sess1 = xaConn1.createXASession();
+         
+         XAResource res1 = sess1.getXAResource();
+         
+         tx.enlistResource(res1);
                   
-                  
-         //Send a message
+         MessageProducer prod1 = sess1.createProducer(queue[1]);
          
-         TextMessage msg0 = sess0.createTextMessage("Cupid stunt0");
+         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
          
-         prod0.send(msg0);
+         received = (TextMessage)cons1.receive(2000);
+              
+         log.info("Got message " + received.getText());
          
+         assertNotNull(received);         
+         
+         assertEquals(sent1.getText(), received.getText());         
+                      
          TextMessage msg1 = sess1.createTextMessage("Cupid stunt1");
          
          prod1.send(msg1);
          
+         cons1.close();
          
+         
 
          tx.delistResource(res0, XAResource.TMSUCCESS);
          
@@ -581,10 +595,6 @@
          
          tm.commit();
          
-         cons0.close();
-         
-         cons1.close();
-         
          // Messages should now be receivable
 
          Connection conn = null;
@@ -886,7 +896,6 @@
          sess.close();
       }
 
-
       try
       {
          xaConn0 = xaCF.createXAConnection();
@@ -901,64 +910,72 @@
          
          xaConn1.start();
                   
-
          // register a failover listener
          SimpleFailoverListener failoverListener = new SimpleFailoverListener();
          ((JBossConnection)xaConn1).registerFailoverListener(failoverListener);
          
+                                         
+         tm.begin();
          
+         Transaction tx = tm.getTransaction();
+         
+         //receive and send a message on each
+         
+         // node 0
+         
          XASession sess0 = xaConn0.createXASession();
          
          XAResource res0 = sess0.getXAResource();
          
+         tx.enlistResource(res0);         
+         
          MessageProducer prod0 = sess0.createProducer(queue[0]);
          
          MessageConsumer cons0 = sess0.createConsumer(queue[0]);
          
+         TextMessage received = (TextMessage)cons0.receive(2000);
          
-         XASession sess1 = xaConn1.createXASession();
+         log.info("Got message " + received.getText());
          
-         XAResource res1 = sess1.getXAResource();
+         assertNotNull(received);         
          
-         MessageProducer prod1 = sess1.createProducer(queue[1]);
+         assertEquals(sent0.getText(), received.getText());                  
          
-         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
+         TextMessage msg0 = sess0.createTextMessage("Cupid stunt0");
          
-                           
-         tm.begin();
+         prod0.send(msg0);
          
-         Transaction tx = tm.getTransaction();
+         //Make sure the consumer is closed otherwise message might be sucked
+         cons0.close();
          
-         tx.enlistResource(res0);
          
-         tx.enlistResource(res1);
+         //node 1
          
-         //receive a message
+         XASession sess1 = xaConn1.createXASession();
          
-         TextMessage received = (TextMessage)cons0.receive(2000);
+         XAResource res1 = sess1.getXAResource();
          
-         assertNotNull(received);
+         tx.enlistResource(res1);
+                  
+         MessageProducer prod1 = sess1.createProducer(queue[1]);
          
-         assertEquals(sent0.getText(), received.getText());
+         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
          
-         
          received = (TextMessage)cons1.receive(2000);
+              
+         log.info("Got message " + received.getText());
          
-         assertNotNull(received);
+         assertNotNull(received);         
          
-         assertEquals(sent1.getText(), received.getText());
+         assertEquals(sent1.getText(), received.getText());         
+                      
+         TextMessage msg1 = sess1.createTextMessage("Cupid stunt1");
          
-                  
-                  
-         //Send a message
+         prod1.send(msg1);
          
-         TextMessage msg0 = sess0.createTextMessage("Cupid stunt0");
+         cons1.close();
          
-         prod0.send(msg0);
          
-         TextMessage msg1 = sess1.createTextMessage("Cupid stunt1");
-         
-         prod1.send(msg1);
                   
          tx.delistResource(res0, XAResource.TMSUCCESS);
          
@@ -1002,11 +1019,6 @@
          // failover complete
          log.info("failover completed");
          
-         cons0.close();
-         
-         cons1.close();
-                           
-
          // Message should now be receivable
          Connection conn = null;
          try