[jboss-cvs] JBoss Messaging SVN: r1739 - in branches/Branch_1_0/tests/src/org/jboss/test/messaging: . jms
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 9 12:38:01 EST 2006
Author: juha at jboss.org
Date: 2006-12-09 12:37:56 -0500 (Sat, 09 Dec 2006)
New Revision: 1739
Modified:
branches/Branch_1_0/tests/src/org/jboss/test/messaging/MessagingTestCase.java
branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XATest.java
Log:
Switch back to JBossTS again with better timeout management in tests to see if the QA machine likes it better
Modified: branches/Branch_1_0/tests/src/org/jboss/test/messaging/MessagingTestCase.java
===================================================================
--- branches/Branch_1_0/tests/src/org/jboss/test/messaging/MessagingTestCase.java 2006-12-09 16:15:23 UTC (rev 1738)
+++ branches/Branch_1_0/tests/src/org/jboss/test/messaging/MessagingTestCase.java 2006-12-09 17:37:56 UTC (rev 1739)
@@ -39,6 +39,8 @@
*
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
+ *
* @version <tt>$Revision$</tt>
* $Id$
*/
@@ -46,6 +48,11 @@
{
// Constants -----------------------------------------------------
+ public final static int MAX_TIMEOUT = 1000 * 60 /* seconds */;
+
+ public final static int MIN_TIMEOUT = 1000 * 5 /* seconds */;
+
+
// Static --------------------------------------------------------
// Attributes ----------------------------------------------------
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-09 16:15:23 UTC (rev 1738)
+++ branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2006-12-09 17:37:56 UTC (rev 1739)
@@ -21,18 +21,18 @@
*/
package org.jboss.test.messaging.jms;
+import javax.jms.Connection;
import javax.jms.Destination;
-import javax.jms.TextMessage;
import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
import javax.jms.Session;
-import javax.jms.Connection;
-import javax.jms.MessageProducer;
+import javax.jms.TextMessage;
import javax.jms.XAConnection;
import javax.jms.XASession;
import javax.naming.InitialContext;
import javax.transaction.TransactionManager;
+import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import javax.transaction.xa.XAResource;
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.messaging.core.tx.XidImpl;
@@ -40,8 +40,8 @@
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.tm.TransactionManagerLocator;
+import com.arjuna.ats.jta.xa.XidImple;
import com.arjuna.ats.arjuna.common.Uid;
-import com.arjuna.ats.jta.xa.XidImple;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -51,9 +51,6 @@
{
// Constants -----------------------------------------------------
- private final static int MAX_TIMEOUT = 1000 * 60 /* seconds */;
-
-
// Static --------------------------------------------------------
// Attributes ----------------------------------------------------
@@ -61,7 +58,7 @@
protected InitialContext initialContext;
protected JBossConnectionFactory cf;
- protected Destination queue;
+ protected Destination queue, queueA, queueB, queueTX;
TransactionManager tm;
@@ -88,22 +85,36 @@
ServerManagement.undeployQueue("Queue");
ServerManagement.deployQueue("Queue");
- queue = (Destination)initialContext.lookup("/queue/Queue");
+ ServerManagement.undeployQueue("QA");
+ ServerManagement.deployQueue("QA");
+
+ ServerManagement.undeployQueue("QB");
+ ServerManagement.deployQueue("QB");
+
+ ServerManagement.undeployQueue("TXQ");
+ ServerManagement.deployQueue("TXQ");
+
+ queue = (Destination)initialContext.lookup("/queue/Queue");
+ queueA = (Destination)initialContext.lookup("/queue/QA");
+ queueB = (Destination)initialContext.lookup("/queue/QB");
+ queueTX = (Destination)initialContext.lookup("/queue/TXQ");
}
public void tearDown() throws Exception
{
ServerManagement.undeployQueue("Queue");
-
+ ServerManagement.undeployQueue("QA");
+ ServerManagement.undeployQueue("QB");
+ ServerManagement.undeployQueue("TXQ");
+
super.tearDown();
}
// Public --------------------------------------------------------
-
- /*
+/*
public void testJBossTSCoordinator() throws Exception
{
UserTransaction ut = com.arjuna.ats.jta.UserTransaction.userTransaction();
@@ -113,7 +124,7 @@
ut.commit();
}
- */
+*/
public void testTransactionalDeliveryRecovery() throws Exception
@@ -132,14 +143,14 @@
XAResource res2 = sess2.getXAResource();
//Pretend to be a transaction manager by interacting through the XAResources
- Xid xid1 = new XidImpl("bq1".getBytes(), 123, "gbtxid1".getBytes());
- Xid xid2 = new XidImpl("bq2".getBytes(), 124, "gbtxid2".getBytes());
+ Xid xid1 = new XidImpl("bq1".getBytes(), 42, "eemeli".getBytes());
+ Xid xid2 = new XidImpl("bq2".getBytes(), 42, "frigtard".getBytes());
// Send a message in each tx
res1.start(xid1, XAResource.TMNOFLAGS);
- MessageProducer prod1 = sess1.createProducer(queue);
+ MessageProducer prod1 = sess1.createProducer(queueTX);
TextMessage tm1 = sess1.createTextMessage("tm1");
@@ -154,7 +165,7 @@
res2.start(xid2, XAResource.TMNOFLAGS);
- MessageProducer prod2 = sess2.createProducer(queue);
+ MessageProducer prod2 = sess2.createProducer(queueTX);
TextMessage tm3 = sess2.createTextMessage("tm3");
@@ -178,7 +189,10 @@
ServerManagement.startServerPeer();
+ ServerManagement.deployQueue("TXQ");
+
+
XAResource res = cf.createXAConnection().createXASession().getXAResource();
Xid[] xids = res.recover(XAResource.TMSTARTRSCAN);
@@ -194,30 +208,70 @@
res.commit(xid2, false);
- ServerManagement.deployQueue("Queue");
Connection conn3 = cf.createConnection();
Session sessRec = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer cons = sessRec.createConsumer(queue);
+ MessageConsumer cons = sessRec.createConsumer(queueTX);
conn3.start();
TextMessage m1 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m1);
- assertEquals("tm1", m1.getText());
+ assertTrue(tm1.getText().equals("tm1") ||
+ tm1.getText().equals("tm2") ||
+ tm1.getText().equals("tm3") ||
+ tm1.getText().equals("tm4"));
+
+ //assertEquals("tm1", m1.getText());
+
TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
- assertEquals("tm2", m2.getText());
+ assertTrue(tm2.getText().equals("tm1") ||
+ tm2.getText().equals("tm2") ||
+ tm2.getText().equals("tm3") ||
+ tm2.getText().equals("tm4"));
+ assertTrue(!tm1.getText().equals(tm2.getText()));
- // TODO
+// assertEquals("tm2", m2.getText());
+ TextMessage m3 = (TextMessage)cons.receive(MAX_TIMEOUT);
+ assertNotNull(m3);
+
+ assertTrue(tm3.getText().equals("tm1") ||
+ tm3.getText().equals("tm2") ||
+ tm3.getText().equals("tm3") ||
+ tm3.getText().equals("tm4"));
+
+ assertTrue(!tm3.getText().equals(tm2.getText()));
+ assertTrue(!tm3.getText().equals(tm1.getText()));
+
+// assertEquals("tm3", m3.getText());
+
+ TextMessage m4 = (TextMessage)cons.receive(MAX_TIMEOUT);
+ assertNotNull(m4);
+
+ assertTrue(tm4.getText().equals("tm1") ||
+ tm4.getText().equals("tm2") ||
+ tm4.getText().equals("tm3") ||
+ tm4.getText().equals("tm4"));
+
+ assertTrue(!tm4.getText().equals(tm3.getText()));
+ assertTrue(!tm4.getText().equals(tm2.getText()));
+ assertTrue(!tm4.getText().equals(tm1.getText()));
+
+// assertEquals("tm4", m4.getText());
+
+ TextMessage nullMessage = (TextMessage)cons.receive(1000);
+
+ assertTrue(nullMessage == null);
+
conn3.close();
-
}
+
public void testMockCoordinatorRecovery() throws Exception
{
@@ -234,8 +288,8 @@
XAResource res2 = sess2.getXAResource();
//Pretend to be a transaction manager by interacting through the XAResources
- Xid xid1 = new XidImpl("bq1".getBytes(), 123, "gbtxid1".getBytes());
- Xid xid2 = new XidImpl("bq2".getBytes(), 124, "gbtxid2".getBytes());
+ Xid xid1 = new XidImpl("bq1".getBytes(), 42, "aapeli".getBytes());
+ Xid xid2 = new XidImpl("bq2".getBytes(), 42, "belsebub".getBytes());
// Send a message in each tx
@@ -272,7 +326,9 @@
ServerManagement.startServerPeer();
+ ServerManagement.deployQueue("Queue");
+
XAResource res = cf.createXAConnection().createXASession().getXAResource();
Xid[] xids = res.recover(XAResource.TMSTARTRSCAN);
@@ -288,7 +344,6 @@
res.commit(xid2, false);
- ServerManagement.deployQueue("Queue");
Connection conn3 = cf.createConnection();
@@ -325,8 +380,8 @@
XAResource res2 = sess2.getXAResource();
//Pretend to be a transaction manager by interacting through the XAResources
- Xid xid1 = new XidImple(new Uid("gbtxid1"), new Uid("bq1"), 123);
- Xid xid2 = new XidImple(new Uid("gbtxid2"), new Uid("bq2"), 124);
+ Xid xid1 = new XidImple(new Uid("cadaver"), new Uid("bq1"), 666);
+ Xid xid2 = new XidImple(new Uid("dalidom"), new Uid("bq2"), 661); // TODO
// Send a message in each tx
@@ -364,7 +419,9 @@
ServerManagement.startServerPeer();
+ ServerManagement.deployQueue("Queue");
+
XAResource res = cf.createXAConnection().createXASession().getXAResource();
Xid[] xids = res.recover(XAResource.TMSTARTRSCAN);
@@ -381,7 +438,6 @@
res.commit(xid2, false);
- ServerManagement.deployQueue("Queue");
Connection conn3 = cf.createConnection();
@@ -402,7 +458,7 @@
}
-/*
+
public void testMockCoordinatorRecovery3() throws Exception
{
@@ -457,6 +513,10 @@
ServerManagement.startServerPeer();
+ ServerManagement.deployQueue("Queue");
+
+
+
XAResource res = cf.createXAConnection().createXASession().getXAResource();
Xid[] xids = res.recover(XAResource.TMSTARTRSCAN);
@@ -472,7 +532,6 @@
res.commit(xids[1], false);
- ServerManagement.deployQueue("Queue");
Connection conn3 = cf.createConnection();
@@ -492,20 +551,112 @@
conn3.close();
}
-*/
- public void testXidEquals()
+
+
+ public void testMultiChannelRecovery() throws Exception
{
- Xid xid1 = new XidImple(new Uid("gbtxid1"), new Uid("bq1"), 123);
- Xid xid2 = new XidImpl("bq1".getBytes(), 123, "gbtxid1".getBytes());
- try
- {
- assertEquals(xid1, xid2);
- }
- catch (Throwable t)
- {
- // different xid impls are not expected to equal
- }
+ XAConnection conn1 = cf.createXAConnection();
+
+ XAConnection conn2 = cf.createXAConnection();
+
+ XASession sess1 = conn1.createXASession();
+
+ XASession sess2 = conn2.createXASession();
+
+ XAResource res1 = sess1.getXAResource();
+
+ XAResource res2 = sess2.getXAResource();
+
+ //Pretend to be a transaction manager by interacting through the XAResources
+ Xid xid1 = new XidImpl("bq1".getBytes(), 123, "gbtxid1".getBytes());
+ Xid xid2 = new XidImpl("bq2".getBytes(), 124, "gbtxid2".getBytes());
+
+ // Send a message in each tx
+
+ res1.start(xid1, XAResource.TMNOFLAGS);
+
+ MessageProducer prod1 = sess1.createProducer(queueA);
+ MessageProducer prod2 = sess1.createProducer(queueB);
+
+ TextMessage tm1 = sess1.createTextMessage("testing1");
+ TextMessage tm2 = sess1.createTextMessage("testing2");
+
+ prod1.send(tm1);
+ prod2.send(tm2);
+
+ res1.end(xid1, XAResource.TMSUCCESS);
+
+
+ res2.start(xid2, XAResource.TMNOFLAGS);
+
+ MessageProducer prod3 = sess2.createProducer(queue);
+
+ TextMessage tm3 = sess2.createTextMessage("testing3");
+
+ prod3.send(tm3);
+
+ res2.end(xid2, XAResource.TMSUCCESS);
+
+ //prepare both txs
+
+
+ res1.prepare(xid1);
+ res2.prepare(xid2);
+
+ //Now "crash" the server
+
+ ServerManagement.stopServerPeer();
+
+ ServerManagement.startServerPeer();
+
+ ServerManagement.deployQueue("Queue");
+ ServerManagement.deployQueue("QA");
+ ServerManagement.deployQueue("QB");
+
+
+
+ XAResource res = cf.createXAConnection().createXASession().getXAResource();
+
+ Xid[] xids = res.recover(XAResource.TMSTARTRSCAN);
+ assertEquals(2, xids.length);
+
+ Xid[] xids2 = res.recover(XAResource.TMENDRSCAN);
+ assertEquals(0, xids2.length);
+
+ assertTrue(xids[0].equals(xid1) || xids[1].equals(xid1));
+ assertTrue(xids[0].equals(xid2) || xids[1].equals(xid2));
+
+ res.commit(xids[0], false);
+
+ res.commit(xids[1], false);
+
+
+ Connection conn3 = cf.createConnection();
+
+ Session sessRec = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageConsumer cons1 = sessRec.createConsumer(queueA);
+ MessageConsumer cons2 = sessRec.createConsumer(queueB);
+ MessageConsumer cons3 = sessRec.createConsumer(queue);
+
+ conn3.start();
+
+ TextMessage m1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
+ assertNotNull(m1);
+ assertEquals("testing1", m1.getText());
+
+ TextMessage m2 = (TextMessage)cons2.receive(MAX_TIMEOUT);
+ assertNotNull(m2);
+ assertEquals("testing2", m2.getText());
+
+ TextMessage m3 = (TextMessage)cons3.receive(MAX_TIMEOUT);
+ assertNotNull(m3);
+ assertEquals("testing3", m3.getText());
+
+ conn3.close();
+
}
+
}
Modified: branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XATest.java 2006-12-09 16:15:23 UTC (rev 1738)
+++ branches/Branch_1_0/tests/src/org/jboss/test/messaging/jms/XATest.java 2006-12-09 17:37:56 UTC (rev 1739)
@@ -41,9 +41,9 @@
import org.jboss.jms.client.JBossConnectionFactory;
import org.jboss.jms.tx.MessagingXAResource;
import org.jboss.test.messaging.MessagingTestCase;
+import org.jboss.test.messaging.util.TransactionManagerLocator;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.tm.TxUtils;
-import org.jboss.tm.TransactionManagerLocator;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
@@ -234,10 +234,10 @@
conn2.start();
Session sessReceiver = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer cons = sessReceiver.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
}
@@ -292,7 +292,7 @@
conn2.start();
Session sessReceiver = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer cons = sessReceiver.createConsumer(queue);
- Message m2 = cons.receive(1000);
+ Message m2 = cons.receive(MIN_TIMEOUT);
assertNull(m2);
}
@@ -360,7 +360,7 @@
conn2.start();
Session sessReceiver = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer cons = sessReceiver.createConsumer(queue);
- Message m2 = cons.receive(1000);
+ Message m2 = cons.receive(MIN_TIMEOUT);
assertNull(m2);
}
@@ -414,7 +414,7 @@
conn2.start();
Session sessReceiver = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer cons = sessReceiver.createConsumer(queue);
- Message m2 = cons.receive(1000);
+ Message m2 = cons.receive(MIN_TIMEOUT);
assertNull(m2);
}
@@ -468,12 +468,12 @@
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
@@ -486,7 +486,7 @@
tx.enlistResource(res);
tx.enlistResource(res2);
- Message m3 = cons.receive(1000);
+ Message m3 = cons.receive(MIN_TIMEOUT);
assertNull(m3);
@@ -544,12 +544,12 @@
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
@@ -562,7 +562,7 @@
tx.enlistResource(res);
tx.enlistResource(res2);
- Message m3 = cons.receive(1000);
+ Message m3 = cons.receive(MIN_TIMEOUT);
assertNull(m3);
@@ -622,10 +622,10 @@
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
@@ -639,10 +639,10 @@
tx.enlistResource(res);
tx.enlistResource(res2);
- TextMessage m3 = (TextMessage)cons.receive(1000);
+ TextMessage m3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m3);
assertEquals("XATest1", m3.getText());
- m3 = (TextMessage)cons.receive(1000);
+ m3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m3);
assertEquals("XATest2", m3.getText());
@@ -702,10 +702,10 @@
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
@@ -719,10 +719,10 @@
tx.enlistResource(res);
tx.enlistResource(res2);
- TextMessage m3 = (TextMessage)cons.receive(1000);
+ TextMessage m3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m3);
assertEquals("XATest1", m3.getText());
- m3 = (TextMessage)cons.receive(1000);
+ m3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m3);
assertEquals("XATest2", m3.getText());
@@ -781,10 +781,10 @@
conn2.start();
Session sessReceiver = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer cons = sessReceiver.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
}
@@ -834,7 +834,7 @@
conn2.start();
Session sessReceiver = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer cons = sessReceiver.createConsumer(queue);
- Message m2 = cons.receive(1000);
+ Message m2 = cons.receive(MIN_TIMEOUT);
assertNull(m2);
}
@@ -883,11 +883,11 @@
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
@@ -899,7 +899,7 @@
tx = tm.getTransaction();
tx.enlistResource(res);
- Message m3 = cons.receive(1000);
+ Message m3 = cons.receive(MIN_TIMEOUT);
assertNull(m3);
@@ -953,12 +953,12 @@
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage m2 = (TextMessage)cons.receive(1000);
+ TextMessage m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest1", m2.getText());
- m2 = (TextMessage)cons.receive(1000);
+ m2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m2);
assertEquals("XATest2", m2.getText());
@@ -972,12 +972,12 @@
tx = tm.getTransaction();
tx.enlistResource(res);
- TextMessage m3 = (TextMessage)cons.receive(1000);
+ TextMessage m3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m3);
assertEquals("XATest1", m3.getText());
- m3 = (TextMessage)cons.receive(1000);
+ m3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(m3);
assertEquals("XATest2", m3.getText());
@@ -1039,7 +1039,7 @@
//Receive the messages, one on each consumer
MessageConsumer cons1 = sess1.createConsumer(queue);
- TextMessage r1 = (TextMessage)cons1.receive(1000);
+ TextMessage r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish1", r1.getText());
@@ -1047,7 +1047,7 @@
cons1.close();
MessageConsumer cons2 = sess2.createConsumer(queue);
- TextMessage r2 = (TextMessage)cons2.receive(1000);
+ TextMessage r2 = (TextMessage)cons2.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish2", r2.getText());
@@ -1059,7 +1059,7 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r3);
@@ -1117,7 +1117,7 @@
//Receive the messages, one on each consumer
MessageConsumer cons1 = sess1.createConsumer(queue);
- TextMessage r1 = (TextMessage)cons1.receive(1000);
+ TextMessage r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish1", r1.getText());
@@ -1125,7 +1125,7 @@
cons1.close();
MessageConsumer cons2 = sess2.createConsumer(queue);
- TextMessage r2 = (TextMessage)cons2.receive(1000);
+ TextMessage r2 = (TextMessage)cons2.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish2", r2.getText());
@@ -1137,7 +1137,7 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r3);
}
@@ -1198,12 +1198,12 @@
//Receive the messages, two on each consumer
MessageConsumer cons1 = sess1.createConsumer(queue);
- TextMessage r1 = (TextMessage)cons1.receive(1000);
+ TextMessage r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish1", r1.getText());
- r1 = (TextMessage)cons1.receive(1000);
+ r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish2", r1.getText());
@@ -1211,12 +1211,12 @@
cons1.close();
MessageConsumer cons2 = sess2.createConsumer(queue);
- TextMessage r2 = (TextMessage)cons2.receive(1000);
+ TextMessage r2 = (TextMessage)cons2.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish3", r2.getText());
- r2 = (TextMessage)cons2.receive(1000);
+ r2 = (TextMessage)cons2.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish4", r2.getText());
@@ -1231,19 +1231,19 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish1", r3.getText());
- r3 = (TextMessage)cons.receive(1000);
+ r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish2", r3.getText());
- TextMessage r4 = (TextMessage)cons.receive(1000);
+ TextMessage r4 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r4);
assertEquals("jellyfish3", r4.getText());
- r4 = (TextMessage)cons.receive(1000);
+ r4 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r4);
assertEquals("jellyfish4", r4.getText());
@@ -1305,12 +1305,12 @@
//Receive the messages, two on each consumer
MessageConsumer cons1 = sess1.createConsumer(queue);
- TextMessage r1 = (TextMessage)cons1.receive(1000);
+ TextMessage r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish1", r1.getText());
- r1 = (TextMessage)cons1.receive(1000);
+ r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish2", r1.getText());
@@ -1318,12 +1318,12 @@
cons1.close();
MessageConsumer cons2 = sess2.createConsumer(queue);
- TextMessage r2 = (TextMessage)cons2.receive(1000);
+ TextMessage r2 = (TextMessage)cons2.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish3", r2.getText());
- r2 = (TextMessage)cons2.receive(1000);
+ r2 = (TextMessage)cons2.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish4", r2.getText());
@@ -1344,19 +1344,19 @@
//or res2 determines the order the messages are put back in the queue
//This test assumes it is called in order res1, res2
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish3", r3.getText());
- r3 = (TextMessage)cons.receive(1000);
+ r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish4", r3.getText());
- TextMessage r4 = (TextMessage)cons.receive(1000);
+ TextMessage r4 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r4);
assertEquals("jellyfish1", r4.getText());
- r4 = (TextMessage)cons.receive(1000);
+ r4 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r4);
assertEquals("jellyfish2", r4.getText());
@@ -1414,22 +1414,22 @@
tx.enlistResource(res2);
MessageConsumer cons1 = sess1.createConsumer(queue);
- TextMessage r1 = (TextMessage)cons1.receive(1000);
+ TextMessage r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish1", r1.getText());
- r1 = (TextMessage)cons1.receive(1000);
+ r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish2", r1.getText());
- r1 = (TextMessage)cons1.receive(1000);
+ r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish3", r1.getText());
- r1 = (TextMessage)cons1.receive(1000);
+ r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish4", r1.getText());
@@ -1454,19 +1454,19 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish1", r3.getText());
- r3 = (TextMessage)cons.receive(1000);
+ r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish2", r3.getText());
- TextMessage r4 = (TextMessage)cons.receive(1000);
+ TextMessage r4 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r4);
assertEquals("jellyfish3", r4.getText());
- r4 = (TextMessage)cons.receive(1000);
+ r4 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r4);
assertEquals("jellyfish4", r4.getText());
@@ -1532,11 +1532,11 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r1 = (TextMessage)cons.receive(1000);
+ TextMessage r1 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("echidna1", r1.getText());
- TextMessage r2 = (TextMessage)cons.receive(1000);
+ TextMessage r2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("echidna2", r2.getText());
@@ -1604,11 +1604,11 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r1 = (TextMessage)cons.receive(1000);
+ TextMessage r1 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("echidna1", r1.getText());
- TextMessage r2 = (TextMessage)cons.receive(1000);
+ TextMessage r2 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("echidna2", r2.getText());
@@ -1675,7 +1675,7 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r1 = (TextMessage)cons.receive(1000);
+ TextMessage r1 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r1);
@@ -1741,7 +1741,7 @@
MessageConsumer cons = sess.createConsumer(queue);
conn2.start();
- TextMessage r1 = (TextMessage)cons.receive(1000);
+ TextMessage r1 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r1);
@@ -1797,7 +1797,7 @@
//Receive one message in one tx
- TextMessage r1 = (TextMessage)cons1.receive(1000);
+ TextMessage r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish1", r1.getText());
@@ -1810,7 +1810,7 @@
tx2.enlistResource(res1);
//Receive 2nd message in a different tx
- TextMessage r2 = (TextMessage)cons1.receive(1000);
+ TextMessage r2 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish2", r2.getText());
@@ -1822,7 +1822,7 @@
Session sess = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn2.start();
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r3);
//now resume the first tx and then commit it
@@ -1882,7 +1882,7 @@
//Receive one message in one tx
- TextMessage r1 = (TextMessage)cons1.receive(1000);
+ TextMessage r1 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("jellyfish1", r1.getText());
@@ -1895,7 +1895,7 @@
tx2.enlistResource(res1);
//Receive 2nd message in a different tx
- TextMessage r2 = (TextMessage)cons1.receive(1000);
+ TextMessage r2 = (TextMessage)cons1.receive(MAX_TIMEOUT);
assertNotNull(r2);
assertEquals("jellyfish2", r2.getText());
@@ -1910,11 +1910,11 @@
conn2.start();
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish2", r3.getText());
- r3 = (TextMessage)cons.receive(1000);
+ r3 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r3);
@@ -1923,10 +1923,10 @@
tm.rollback();
//Verify the first message is now available
- r3 = (TextMessage)cons.receive(1000);
+ r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("jellyfish1", r3.getText());
- r3 = (TextMessage)cons.receive(1000);
+ r3 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r3);
}
@@ -1993,10 +1993,10 @@
Session sess = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn2.start();
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage r1 = (TextMessage)cons.receive(1000);
+ TextMessage r1 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r1);
assertEquals("kangaroo2", r1.getText());
- TextMessage r2 = (TextMessage)cons.receive(1000);
+ TextMessage r2 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r2);
//now resume the first tx and then commit it
@@ -2004,7 +2004,7 @@
tm.commit();
//verify that the first text message is received
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("kangaroo1", r3.getText());
@@ -2072,7 +2072,7 @@
Session sess = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
conn2.start();
MessageConsumer cons = sess.createConsumer(queue);
- TextMessage r1 = (TextMessage)cons.receive(1000);
+ TextMessage r1 = (TextMessage)cons.receive(MIN_TIMEOUT);
assertNull(r1);
@@ -2082,7 +2082,7 @@
tm.commit();
//verify that the first text message is received
- TextMessage r3 = (TextMessage)cons.receive(1000);
+ TextMessage r3 = (TextMessage)cons.receive(MAX_TIMEOUT);
assertNotNull(r3);
assertEquals("kangaroo1", r3.getText());
More information about the jboss-cvs-commits
mailing list