[jboss-cvs] JBoss Messaging SVN: r3443 - branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 7 06:23:37 EST 2007
Author: ataylor
Date: 2007-12-07 06:23:37 -0500 (Fri, 07 Dec 2007)
New Revision: 3443
Modified:
branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
Log:
rolled back changes
Modified: branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-12-07 08:36:48 UTC (rev 3442)
+++ branches/Branch_MC_Integration_New/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java 2007-12-07 11:23:37 UTC (rev 3443)
@@ -84,7 +84,7 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons.receive(10000);
+ TextMessage tm = (TextMessage)cons.receive(500);
assertNotNull(tm);
@@ -154,7 +154,7 @@
{
while (count < numMessages)
{
- this.wait(2000);
+ this.wait();
}
}
}
@@ -223,7 +223,7 @@
prod.send(tm);
- TextMessage tm2 = (TextMessage)cons1.receive(10000);
+ TextMessage tm2 = (TextMessage)cons1.receive();
assertNotNull(tm2);
@@ -260,7 +260,7 @@
/**
- * The simplest possible receive(10000) test for a non-persistent message.
+ * The simplest possible receive() test for a non-persistent message.
*/
public void testReceive() throws Exception
{
@@ -282,7 +282,7 @@
MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
- // startServerPeer consumer connection before the message is submitted
+ // start consumer connection before the message is submitted
consumerConnection.start();
TextMessage tm = producerSession.createTextMessage("someText");
@@ -291,7 +291,7 @@
queueProducer.send(tm);
- TextMessage m = (TextMessage)queueConsumer.receive(10000);
+ TextMessage m = (TextMessage)queueConsumer.receive();
assertEquals(tm.getText(), m.getText());
}
@@ -329,7 +329,7 @@
MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
- // startServerPeer consumer connection before the message is submitted
+ // start consumer connection before the message is submitted
consumerConnection.start();
TextMessage tm = producerSession.createTextMessage("someText");
@@ -338,7 +338,7 @@
queueProducer.send(tm);
- TextMessage m = (TextMessage)queueConsumer.receive(10000);
+ TextMessage m = (TextMessage)queueConsumer.receive();
assertEquals(tm.getText(), m.getText());
}
@@ -383,10 +383,10 @@
queueProducer.send(tm);
- // startServerPeer consumer connection after the message is submitted
+ // start consumer connection after the message is submitted
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(10000);
+ TextMessage m = (TextMessage)queueConsumer.receive(2000);
assertEquals(tm.getText(), m.getText());
}
@@ -430,7 +430,7 @@
queueProducer.send(tm);
- // startServerPeer consumer connection after the message is submitted
+ // start consumer connection after the message is submitted
consumerConnection.start();
//NOTE! There semantics of receiveNoWait do not guarantee the message is available
@@ -490,7 +490,7 @@
queueConsumer.setMessageListener(l);
- // startServerPeer consumer connection after the message is submitted
+ // start consumer connection after the message is submitted
consumerConnection.start();
// wait for the listener to receive the message
@@ -584,7 +584,7 @@
MessageConsumer cons = sessReceive.createConsumer(queue1);
- TextMessage m2 = (TextMessage)cons.receive(10000);
+ TextMessage m2 = (TextMessage)cons.receive(1500);
assertNotNull(m2);
@@ -637,7 +637,7 @@
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(10000);
+ TextMessage m = (TextMessage)queueConsumer.receive(1500);
assertEquals(m.getText(), "One");
@@ -647,7 +647,7 @@
try
{
- queueConsumer.receive(10000);
+ queueConsumer.receive(2000);
fail("should throw exception");
}
catch(javax.jms.IllegalStateException e)
@@ -701,7 +701,7 @@
consumerConnection.start();
- Message r = queueConsumer.receive(10000);
+ Message r = queueConsumer.receive(2000);
assertEquals(m.getJMSMessageID(), r.getJMSMessageID());
}
@@ -757,7 +757,7 @@
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(10000);
+ TextMessage m = (TextMessage)queueConsumer.receive(1500);
assertEquals("One", m.getText());
@@ -769,7 +769,7 @@
MessageConsumer queueConsumer2 = consumerSession.createConsumer(queue1);
- m = (TextMessage)queueConsumer2.receive(10000);
+ m = (TextMessage)queueConsumer2.receive(1500);
assertNotNull(m);
@@ -811,7 +811,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(10000);
+ TextMessage rm1 = (TextMessage)cons1.receive();
assertNotNull(rm1);
assertEquals("a", rm1.getText());
@@ -821,11 +821,11 @@
sess.commit();
- TextMessage rm2 = (TextMessage)cons2.receive(10000);
+ TextMessage rm2 = (TextMessage)cons2.receive(1500);
assertNotNull(rm2);
assertEquals("b", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(10000);
+ TextMessage rm3 = (TextMessage)cons2.receive(1500);
assertNotNull(rm3);
assertEquals("c", rm3.getText());
@@ -866,7 +866,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(10000);
+ TextMessage rm1 = (TextMessage)cons1.receive(1500);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -876,11 +876,11 @@
sess.commit();
- TextMessage rm2 = (TextMessage)cons2.receive(10000);
+ TextMessage rm2 = (TextMessage)cons2.receive(1500);
assertNotNull(rm2);
assertEquals("hello2", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(10000);
+ TextMessage rm3 = (TextMessage)cons2.receive(1500);
assertNotNull(rm3);
assertEquals("hello3", rm3.getText());
@@ -920,7 +920,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(10000);
+ TextMessage rm1 = (TextMessage)cons1.receive(1500);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -930,11 +930,11 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- TextMessage rm2 = (TextMessage)cons2.receive(10000);
+ TextMessage rm2 = (TextMessage)cons2.receive(1500);
assertNotNull(rm2);
assertEquals("hello2", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(10000);
+ TextMessage rm3 = (TextMessage)cons2.receive(1500);
assertNotNull(rm3);
assertEquals("hello3", rm3.getText());
@@ -975,7 +975,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(10000);
+ TextMessage rm1 = (TextMessage)cons1.receive(1500);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
log.trace(rm1.getJMSMessageID());
@@ -985,14 +985,14 @@
sess.rollback();
log.trace("rolled back");
- TextMessage rm2 = (TextMessage)cons1.receive(10000);
+ TextMessage rm2 = (TextMessage)cons1.receive(1500);
assertEquals("hello1", rm2.getText());
log.trace(rm1.getJMSMessageID());
- TextMessage rm3 = (TextMessage)cons1.receive(10000);
+ TextMessage rm3 = (TextMessage)cons1.receive(1500);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons1.receive(10000);
+ TextMessage rm4 = (TextMessage)cons1.receive(1500);
assertEquals("hello3", rm4.getText());
sess.commit();
@@ -1032,7 +1032,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(10000);
+ TextMessage rm1 = (TextMessage)cons1.receive(1500);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -1046,15 +1046,15 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- TextMessage rm2 = (TextMessage)cons2.receive(10000);
+ TextMessage rm2 = (TextMessage)cons2.receive(1500);
assertNotNull(rm2);
assertEquals("hello1", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(10000);
+ TextMessage rm3 = (TextMessage)cons2.receive(1500);
assertNotNull(rm3);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons2.receive(10000);
+ TextMessage rm4 = (TextMessage)cons2.receive(1500);
assertNotNull(rm4);
assertEquals("hello3", rm4.getText());
@@ -1095,22 +1095,22 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(10000);
+ TextMessage rm1 = (TextMessage)cons1.receive(1500);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
//redeliver
sess.recover();
- TextMessage rm2 = (TextMessage)cons1.receive(10000);
+ TextMessage rm2 = (TextMessage)cons1.receive(1500);
assertNotNull(rm2);
assertEquals("hello1", rm2.getText());
- TextMessage rm3 = (TextMessage)cons1.receive(10000);
+ TextMessage rm3 = (TextMessage)cons1.receive(1500);
assertNotNull(rm3);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons1.receive(10000);
+ TextMessage rm4 = (TextMessage)cons1.receive(1500);
assertNotNull(rm4);
assertEquals("hello3", rm4.getText());
@@ -1150,7 +1150,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage rm1 = (TextMessage)cons1.receive(10000);
+ TextMessage rm1 = (TextMessage)cons1.receive(1500);
assertNotNull(rm1);
assertEquals("hello1", rm1.getText());
@@ -1165,15 +1165,15 @@
log.debug("receiving ...");
- TextMessage rm2 = (TextMessage)cons2.receive(10000);
+ TextMessage rm2 = (TextMessage)cons2.receive(1500);
assertNotNull(rm2);
assertEquals("hello1", rm2.getText());
- TextMessage rm3 = (TextMessage)cons2.receive(10000);
+ TextMessage rm3 = (TextMessage)cons2.receive(1500);
assertNotNull(rm3);
assertEquals("hello2", rm3.getText());
- TextMessage rm4 = (TextMessage)cons2.receive(10000);
+ TextMessage rm4 = (TextMessage)cons2.receive(1500);
assertNotNull(rm4);
assertEquals("hello3", rm4.getText());
@@ -1221,7 +1221,7 @@
MessageConsumer cons1 = sess.createConsumer(queue1);
- TextMessage r1 = (TextMessage)cons1.receive(10000);
+ TextMessage r1 = (TextMessage)cons1.receive();
assertEquals(tm1.getText(), r1.getText());
@@ -1230,11 +1230,11 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- TextMessage r2 = (TextMessage)cons2.receive(10000);
+ TextMessage r2 = (TextMessage)cons2.receive();
assertEquals(tm2.getText(), r2.getText());
- TextMessage r3 = (TextMessage)cons2.receive(10000);
+ TextMessage r3 = (TextMessage)cons2.receive();
assertEquals(tm3.getText(), r3.getText());
@@ -1281,9 +1281,9 @@
MessageConsumer cons2 = sess.createConsumer(queue1);
- Message r1 = cons2.receive(10000);
- Message r2 = cons2.receive(10000);
- Message r3 = cons2.receive(10000);
+ Message r1 = cons2.receive();
+ Message r2 = cons2.receive();
+ Message r3 = cons2.receive();
//Messages should be received?
assertNotNull(r1);
@@ -1330,7 +1330,7 @@
MessageConsumer cons = sessReceive.createConsumer(queue1);
- TextMessage m2 = (TextMessage)cons.receive(10000);
+ TextMessage m2 = (TextMessage)cons.receive(1500);
assertNotNull(m2);
@@ -1397,14 +1397,14 @@
{
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage m = (TextMessage)cons.receive(10000);
+ TextMessage m = (TextMessage)cons.receive(5000);
if (m == null)
{
log.error("Didn't receive all the messages");
failed = true;
break;
}
- log.info("received message");
+ log.trace("received message");
if (!m.getText().equals("testing"))
{
failed = true;
@@ -1714,7 +1714,7 @@
}
}, "Producer").start();
- assertNull(topicConsumer.receive(10000));
+ assertNull(topicConsumer.receive(1500));
}
finally
{
@@ -1770,7 +1770,7 @@
}
}, "Producer").start();
- Message m2 = topicConsumer.receive(10000);
+ Message m2 = topicConsumer.receive(1500);
assertEquals(m1.getJMSMessageID(), m2.getJMSMessageID());
}
finally
@@ -1941,7 +1941,7 @@
for (int i = 0; i < count; i++)
{
- Message m = queueConsumer.receive(10000);
+ Message m = queueConsumer.receive(1500);
assertNotNull(m);
}
}
@@ -2067,7 +2067,7 @@
}, "closing thread");
closerThread.start();
- assertNull(topicConsumer.receive(10000));
+ assertNull(topicConsumer.receive(1500));
// wait for the closing thread to finish
latch.acquire();
@@ -2269,7 +2269,7 @@
//// MessageListenerImpl l = new MessageListenerImpl();
//// topicConsumer.setMessageListener(l);
////
-//// consumerConnection.startServerPeer();
+//// consumerConnection.start();
////
//// int NUM_MESSAGES = 10;
//// for(int i = 0; i < NUM_MESSAGES; i++)
@@ -2303,7 +2303,7 @@
//// MessageListenerImpl l = new MessageListenerImpl();
//// QueueConsumer.setMessageListener(l);
////
-//// consumerConnection.startServerPeer();
+//// consumerConnection.start();
////
//// int NUM_MESSAGES = 10;
//// for(int i = 0; i < NUM_MESSAGES; i++)
@@ -2460,7 +2460,7 @@
// queueConsumer.setMessageListener(myListener);
//
// log.trace("Starting consumer connection");
-// consumerConnection.startServerPeer();
+// consumerConnection.start();
//
// final int MESSAGE_COUNT = 100;
//
@@ -2474,7 +2474,7 @@
// Thread.sleep(500L);
//
// log.trace("Stopping consumer connection");
-// consumerConnection.stopServerPeer();
+// consumerConnection.stop();
//
// int countAfterStop = messagesReceived.get();
// assertTrue("Should have received some messages before stopping", countAfterStop > 0);
@@ -2491,14 +2491,14 @@
// assertEquals("Should not receive any messages after the connection has been stopped", countAfterStop, messagesReceived.get());
//
// log.trace("Restarting consumer connection");
-// consumerConnection.startServerPeer();
+// consumerConnection.start();
//
// log.trace("Sleeping to allow remaining messages to arrive");
// Thread.sleep(15000);
// assertEquals("Should have received all messages after restarting", MESSAGE_COUNT, messagesReceived.get());
// }
- // Test that stopServerPeer doesn't in any way break subsequent close
+ // Test that stop doesn't in any way break subsequent close
public void testCloseAfterStop() throws Exception
{
Connection producerConnection = null;
@@ -2592,7 +2592,7 @@
MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(10000);
+ TextMessage m = (TextMessage)queueConsumer.receive(1500);
assertEquals("One", m.getText());
consumerConnection.close();
@@ -2604,7 +2604,7 @@
queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- m = (TextMessage)queueConsumer.receive(10000);
+ m = (TextMessage)queueConsumer.receive(1500);
assertEquals("Two", m.getText());
}
finally
@@ -2646,7 +2646,7 @@
MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- TextMessage m = (TextMessage)queueConsumer.receive(10000);
+ TextMessage m = (TextMessage)queueConsumer.receive(1500);
assertEquals("One", m.getText());
consumerSession.commit();
@@ -2659,7 +2659,7 @@
queueConsumer = consumerSession.createConsumer(queue1);
consumerConnection.start();
- m = (TextMessage)queueConsumer.receive(10000);
+ m = (TextMessage)queueConsumer.receive(1500);
assertEquals("Two", m.getText());
}
finally
@@ -2727,7 +2727,7 @@
{
try
{
- m = consumer.receive(10000);
+ m = consumer.receive(1500);
}
catch (Exception e)
{
@@ -2845,8 +2845,8 @@
TextMessage tm = sess3.createTextMessage("nurse!");
prod.send(tm);
- TextMessage tm1 = (TextMessage)cons1.receive(10000);
- TextMessage tm2 = (TextMessage)cons2.receive(10000);
+ TextMessage tm1 = (TextMessage)cons1.receive(1500);
+ TextMessage tm2 = (TextMessage)cons2.receive(1500);
assertNotNull(tm1);
assertNotNull(tm2);
@@ -2861,12 +2861,12 @@
sess2.recover();
- tm2 = (TextMessage)cons2.receive(10000);
+ tm2 = (TextMessage)cons2.receive(1500);
assertNotNull(tm2);
assertEquals("nurse!", tm2.getText());
//but tm1 should not be redelivered
- tm1 = (TextMessage)cons1.receive(10000);
+ tm1 = (TextMessage)cons1.receive(1500);
assertNull(tm1);
}
finally
@@ -2992,7 +2992,7 @@
MessageConsumer theConsumer = sessReceive.createConsumer(queue1);
- Message m2 = theConsumer.receive(10000);
+ Message m2 = theConsumer.receive(1500);
log.trace("m2 is " + m2);
@@ -3000,19 +3000,19 @@
assertEquals("aardvark", m2.getStringProperty("p1"));
- BytesMessage bm2 = (BytesMessage)theConsumer.receive(10000);
+ BytesMessage bm2 = (BytesMessage)theConsumer.receive(1500);
assertEquals("aardvark", bm2.readUTF());
- MapMessage mm2 = (MapMessage)theConsumer.receive(10000);
+ MapMessage mm2 = (MapMessage)theConsumer.receive(1500);
assertEquals("aardvark", mm2.getString("s1"));
- ObjectMessage om2 = (ObjectMessage)theConsumer.receive(10000);
+ ObjectMessage om2 = (ObjectMessage)theConsumer.receive(1500);
assertEquals("aardvark", (String)om2.getObject());
- StreamMessage sm2 = (StreamMessage)theConsumer.receive(10000);
+ StreamMessage sm2 = (StreamMessage)theConsumer.receive(1500);
assertEquals("aardvark", sm2.readString());
- TextMessage tm2 = (TextMessage)theConsumer.receive(10000);
+ TextMessage tm2 = (TextMessage)theConsumer.receive(1500);
assertEquals("aardvark", tm2.getText());
}
finally
@@ -3059,7 +3059,7 @@
int count = 0;
while (true)
{
- TextMessage tm = (TextMessage)durable.receive(10000);
+ TextMessage tm = (TextMessage)durable.receive(1500);
if (tm == null)
{
break;
@@ -3368,7 +3368,7 @@
int count = 0;
while (true)
{
- TextMessage tm = (TextMessage)durable2.receive(10000);
+ TextMessage tm = (TextMessage)durable2.receive(1500);
if (tm == null)
{
break;
@@ -3430,7 +3430,7 @@
for (int i = 0; i < NUM_TO_RECEIVE1; i++)
{
- TextMessage tm = (TextMessage)durable.receive(10000);
+ TextMessage tm = (TextMessage)durable.receive(1500);
if (tm == null)
{
fail();
@@ -3452,7 +3452,7 @@
conn2.start();
- TextMessage tm = (TextMessage)durable2.receive(10000);
+ TextMessage tm = (TextMessage)durable2.receive(1500);
assertNull(tm);
durable2.close();
@@ -4034,9 +4034,7 @@
/** Blocks the calling thread until at least a message is received */
public void waitForMessages() throws InterruptedException
{
- log.info("waiting for messages");
latch.acquire();
- log.info("waiting for messages done");
}
public void onMessage(Message m)
@@ -4045,26 +4043,26 @@
{
TextMessage tm = (TextMessage)m;
- log.info("Got message:" + tm.getText() + " count is " + count);
+ log.trace("Got message:" + tm.getText() + " count is " + count);
if (count == 0)
{
if (!("a".equals(tm.getText())))
{
- log.info("Should be a but was " + tm.getText());
+ log.trace("Should be a but was " + tm.getText());
failed = true;
latch.release();
}
if (transacted)
{
sess.rollback();
- log.info("rollback() called");
+ log.trace("rollback() called");
}
else
{
- log.info("Calling recover");
+ log.trace("Calling recover");
sess.recover();
- log.info("recover() called");
+ log.trace("recover() called");
}
}
@@ -4072,7 +4070,7 @@
{
if (!("a".equals(tm.getText())))
{
- log.info("Should be a but was " + tm.getText());
+ log.trace("Should be a but was " + tm.getText());
failed = true;
latch.release();
}
@@ -4086,7 +4084,7 @@
{
if (!("b".equals(tm.getText())))
{
- log.info("Should be b but was " + tm.getText());
+ log.trace("Should be b but was " + tm.getText());
failed = true;
latch.release();
}
@@ -4095,7 +4093,7 @@
{
if (!("c".equals(tm.getText())))
{
- log.info("Should be c but was " + tm.getText());
+ log.trace("Should be c but was " + tm.getText());
failed = true;
latch.release();
}
@@ -4105,7 +4103,7 @@
}
else
{
- log.info("Acknowledging session");
+ log.trace("Acknowledging session");
tm.acknowledge();
}
latch.release();
@@ -4114,7 +4112,7 @@
}
catch (JMSException e)
{
- log.info("Caught JMSException", e);
+ log.trace("Caught JMSException", e);
failed = true;
latch.release();
}
More information about the jboss-cvs-commits
mailing list