[jboss-cvs] JBoss Messaging SVN: r2124 - trunk/tests/src/org/jboss/test/messaging/jms/bridge.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 1 09:09:44 EST 2007
Author: timfox
Date: 2007-02-01 09:09:44 -0500 (Thu, 01 Feb 2007)
New Revision: 2124
Modified:
trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
Log:
more timing tweaks
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2007-02-01 13:10:38 UTC (rev 2123)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTest.java 2007-02-01 14:09:44 UTC (rev 2124)
@@ -658,7 +658,7 @@
this.checkAllMessageReceivedInOrder(cf1, destQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
}
finally
@@ -715,7 +715,7 @@
checkAllMessageReceivedInOrder(cf1, destQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
}
finally
@@ -749,7 +749,7 @@
checkAllMessageReceivedInOrder(cf1, destQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
}
finally
@@ -787,7 +787,7 @@
//Verify none are received
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
log.info("Waiting");
Thread.sleep(120000);
@@ -801,9 +801,9 @@
this.checkAllMessageReceivedInOrder(cf1, destQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
}
finally
{
@@ -858,9 +858,9 @@
this.checkAllMessageReceivedInOrder(cf1, destQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
t.join();
@@ -938,9 +938,9 @@
this.checkAllMessageReceivedInOrder(cf0, localDestQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf0, localDestQueue);
+ this.checkNoneReceived(cf0, localDestQueue, 5000);
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
t.join();
@@ -1002,7 +1002,7 @@
//Verify none are received
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
//Send the other half
@@ -1030,9 +1030,9 @@
//Make sure no messages are left
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
}
finally
{
@@ -1067,7 +1067,7 @@
this.sendMessages(cf0, sourceQueue, 0, NUM_MESSAGES / 2, persistent);
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
//Send the other half
@@ -1078,9 +1078,9 @@
this.checkAllMessageReceivedInOrder(cf0, localDestQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf0, localDestQueue);
+ this.checkNoneReceived(cf0, localDestQueue, 5000);
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
//Send another batch with one more than batch size
@@ -1100,9 +1100,9 @@
//Make sure no messages are left
- this.checkNoneReceived(cf0, localDestQueue);
+ this.checkNoneReceived(cf0, localDestQueue, 5000);
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
}
finally
{
@@ -1141,7 +1141,7 @@
//Verify none are received
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 2000);
//Wait a bit longer
@@ -1151,11 +1151,11 @@
this.checkAllMessageReceivedInOrder(cf1, destQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 5000);
//Make sure no messages are left in the source dest
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
}
finally
@@ -1197,7 +1197,7 @@
//Verify none are received
- this.checkNoneReceived(cf0, localDestQueue);
+ this.checkNoneReceived(cf0, localDestQueue, 2000);
//Wait a bit longer
@@ -1207,11 +1207,11 @@
this.checkAllMessageReceivedInOrder(cf0, localDestQueue, 0, NUM_MESSAGES);
- this.checkNoneReceived(cf0, localDestQueue);
+ this.checkNoneReceived(cf0, localDestQueue, 5000);
//Make sure no messages are left in the source dest
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
}
finally
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-02-01 13:10:38 UTC (rev 2123)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2007-02-01 14:09:44 UTC (rev 2124)
@@ -284,7 +284,7 @@
}
}
- protected void checkNoneReceived(ConnectionFactory cf, Destination dest) throws Exception
+ protected void checkNoneReceived(ConnectionFactory cf, Destination dest, long timeout) throws Exception
{
Connection conn = null;
@@ -298,7 +298,7 @@
MessageConsumer cons = sess.createConsumer(dest);
- Message m = cons.receive(5000);
+ Message m = cons.receive(timeout);
assertNull(m);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java 2007-02-01 13:10:38 UTC (rev 2123)
+++ trunk/tests/src/org/jboss/test/messaging/jms/bridge/ReconnectTest.java 2007-02-01 14:09:44 UTC (rev 2124)
@@ -161,7 +161,7 @@
//Verify none are received
- checkNoneReceived(cf1, destQueue);
+ checkNoneReceived(cf1, destQueue, 5000);
//Now crash the dest server
@@ -196,7 +196,7 @@
//Make sure no messages are left in the source dest
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
}
finally
{
@@ -251,7 +251,7 @@
//verify none are received
- this.checkNoneReceived(cf1, destQueue);
+ this.checkNoneReceived(cf1, destQueue, 2000);
//Now crash the dest server
@@ -279,7 +279,7 @@
//Make sure no messages are left in the source dest
- checkNoneReceived(cf0, sourceQueue);
+ checkNoneReceived(cf0, sourceQueue, 5000);
log.info("Got here");
@@ -334,7 +334,7 @@
//Verify none are received
- checkNoneReceived(cf1, destQueue);
+ checkNoneReceived(cf1, destQueue, 2000);
//Poison server 1 so it crashes on commit of dest but after prepare
@@ -385,7 +385,7 @@
//Make sure no messages are left in the source dest
- this.checkNoneReceived(cf0, sourceQueue);
+ this.checkNoneReceived(cf0, sourceQueue, 5000);
log.info("Got here");
More information about the jboss-cvs-commits
mailing list