[jboss-cvs] JBoss Messaging SVN: r1786 - branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms

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

Author: juha at jboss.org
Date: 2006-12-13 18:29:14 -0500 (Wed, 13 Dec 2006)
New Revision: 1786

Modified:
   branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
Log:
drain destinations to isolate tests better

Modified: branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2006-12-13 23:27:14 UTC (rev 1785)
+++ branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2006-12-13 23:29:14 UTC (rev 1786)
@@ -29,6 +29,7 @@
 import javax.jms.TextMessage;
 import javax.jms.XAConnection;
 import javax.jms.XASession;
+import javax.jms.Message;
 import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
@@ -99,6 +100,11 @@
       queueA = (Destination)initialContext.lookup("/queue/QA");
       queueB = (Destination)initialContext.lookup("/queue/QB");
       queueTX = (Destination)initialContext.lookup("/queue/TXQ");
+
+      drainDestination(cf, queue);
+      drainDestination(cf, queueA);
+      drainDestination(cf, queueB);
+      drainDestination(cf, queueTX);
    }
 
    public void tearDown() throws Exception
@@ -108,6 +114,7 @@
       ServerManagement.undeployQueue("QB");
       ServerManagement.undeployQueue("TXQ");
 
+
       super.tearDown();
    }
 
@@ -291,9 +298,9 @@
 
       res1.start(xid1, XAResource.TMNOFLAGS);
 
-      MessageProducer prod1 = sess1.createProducer(queue);
+      MessageProducer prod1 = sess1.createProducer(queueA);
 
-      TextMessage tm1 = sess1.createTextMessage("testing1");
+      TextMessage tm1 = sess1.createTextMessage("alpha");
 
       prod1.send(tm1);
 
@@ -302,9 +309,9 @@
 
       res2.start(xid2, XAResource.TMNOFLAGS);
 
-      MessageProducer prod2 = sess2.createProducer(queue);
+      MessageProducer prod2 = sess2.createProducer(queueA);
 
-      TextMessage tm2 = sess2.createTextMessage("testing2");
+      TextMessage tm2 = sess2.createTextMessage("beta");
 
       prod2.send(tm2);
 
@@ -322,7 +329,7 @@
 
       ServerManagement.startServerPeer();
 
-      ServerManagement.deployQueue("Queue");
+      ServerManagement.deployQueue("QA");
 
 
       XAResource res = cf.createXAConnection().createXASession().getXAResource();
@@ -344,20 +351,29 @@
       Connection conn3 = cf.createConnection();
 
       Session sessRec = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
-      MessageConsumer cons = sessRec.createConsumer(queue);
+      MessageConsumer cons = sessRec.createConsumer(queueA);
       conn3.start();
 
-      TextMessage m1 = (TextMessage)cons.receive(MAX_TIMEOUT);
+      Message msg = cons.receive(MAX_TIMEOUT);
+
+      TextMessage m1 = (TextMessage)msg;
       assertNotNull(m1);
-      assertEquals("testing1", m1.getText());
 
+      assertTrue("alpha".equals(m1.getText()) ||
+                 "beta".equals(m1.getText()));
+
       TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
       assertNotNull(m2);
 
-      assertEquals("testing2", m2.getText());
+      assertTrue("alpha".equals(m2.getText()) ||
+                 "beta".equals(m2.getText()));
 
+      assertTrue(!tm1.getText().equals(tm2.getText()));
+
+      Message nullMessage = cons.receive(MIN_TIMEOUT);
+      assertTrue(nullMessage == null);
+
       conn3.close();
-
    }
 
    public void testMockCoordinatorRecoveryWithJBossTSXids() throws Exception