[jboss-cvs] JBoss Messaging SVN: r2920 - trunk/tests/src/org/jboss/test/messaging/jms/clustering.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 20 11:03:46 EDT 2007
Author: timfox
Date: 2007-07-20 11:03:45 -0400 (Fri, 20 Jul 2007)
New Revision: 2920
Modified:
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java
Log:
More speedups
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -130,6 +130,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
// Private -------------------------------------------------------
@@ -567,27 +576,22 @@
Map recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(queue[failoverNodeId].getQueueName());
Map ids = (Map)recoveryArea.get(new Integer(3));
assertNotNull(ids);
- assertEquals(numMessages, ids.size());
+ assertEquals(numMessages, ids.size());
-
-
//We now add a new node - this should cause the failover node to change
ServerManagement.start(4, "all", false);
ServerManagement.deployQueue("testDistributedQueue", 4);
- Thread.sleep(5000);
+ Thread.sleep(5000);
-
recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
assertEquals(0, recoveryMapSize);
recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(queue[failoverNodeId].getQueueName());
ids = (Map)recoveryArea.get(new Integer(3));
assertNull(ids);
-
-
-
+
dumpFailoverMap(ServerManagement.getServer(3).getFailoverMap());
int newFailoverNodeId = this.getFailoverNodeForNode(factory, 3);
@@ -601,10 +605,8 @@
recoveryArea = ServerManagement.getServer(newFailoverNodeId).getRecoveryArea(queue[3].getQueueName());
ids = (Map)recoveryArea.get(new Integer(3));
assertNotNull(ids);
- assertEquals(numMessages, ids.size());
+ assertEquals(numMessages, ids.size());
-
-
//Now kill the node
ServerManagement.kill(3);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterConnectionManagerTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -388,7 +388,7 @@
//Send some messages on node 0
- final int NUM_MESSAGES = 100;
+ final int NUM_MESSAGES = 20;
Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterViewUpdateTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -81,8 +81,8 @@
assertEquals(2, cfDelegate.getDelegates().length);
conn.close();
- log.info("sleeping 10 secs ...");
- Thread.sleep(10000);
+ log.info("sleeping 5 secs ...");
+ Thread.sleep(5000);
// Second part, verifies a possible race condition on failoverMap and handleFilover
@@ -93,7 +93,6 @@
conn1.close();
log.info("Done!!");
-
}
public void testUpdateMixedConnectionFactory() throws Exception
@@ -139,18 +138,16 @@
conn.close();
httpConn.close();
- log.info("sleeping 10 secs ...");
- Thread.sleep(10000);
+ log.info("sleeping 5 secs ...");
+ Thread.sleep(5000);
// Second part, verifies a possible racing condition on failoverMap and handleFilover
log.info("ServerId=" + getServerId(conn1));
assertTrue(1 != getServerId(conn1));
- //Session sess = conn1.createSession(true, Session.SESSION_TRANSACTED);
conn1.close();
httpConn.close();
-
}
/**
@@ -181,7 +178,7 @@
ServerManagement.kill(1);
- Thread.sleep(10000);
+ Thread.sleep(5000);
// This will force Failover from Valve to kick in
conn1.createSession(true, Session.SESSION_TRANSACTED);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -149,11 +149,11 @@
{
if (ServerManagement.isStarted(i))
{
- log.info("stopping server " + i);
- ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ //log.info("stopping server " + i);
+ //ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
ServerManagement.undeployQueue("testDistributedQueue", i);
ServerManagement.undeployTopic("testDistributedTopic", i);
- ServerManagement.stop(i);
+ //ServerManagement.stop(i);
}
ic[i].close();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -341,7 +341,7 @@
// wait for the client-side failover to complete
- while(true)
+ while (true)
{
FailoverEvent event = failoverListener.getEvent(30000);
if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
@@ -421,7 +421,7 @@
{
try
{
- ServerManagement.getServer(1).undeployConnectionFactory(new ObjectName("org.jboss.messaging:service=LBConnectionFactory"));
+ ServerManagement.getServer(0).undeployConnectionFactory(new ObjectName("org.jboss.messaging:service=LBConnectionFactory"));
}
catch (Exception ignore)
{
@@ -429,6 +429,14 @@
try
{
+ ServerManagement.getServer(1).undeployConnectionFactory(new ObjectName("org.jboss.messaging:service=LBConnectionFactory"));
+ }
+ catch (Exception ignore)
+ {
+ }
+
+ try
+ {
ServerManagement.getServer(2).undeployConnectionFactory(new ObjectName("org.jboss.messaging:service=LBConnectionFactory"));
}
catch (Exception ignore)
@@ -437,12 +445,28 @@
try
{
+ ServerManagement.getServer(0).undeployConnectionFactory(new ObjectName("org.jboss.messaging:service=FOConnectionFactory"));
+ }
+ catch (Exception ignore)
+ {
+ }
+
+ try
+ {
ServerManagement.getServer(1).undeployConnectionFactory(new ObjectName("org.jboss.messaging:service=FOConnectionFactory"));
}
catch (Exception ignore)
{
}
+ try
+ {
+ ServerManagement.getServer(2).undeployConnectionFactory(new ObjectName("org.jboss.messaging:service=FOConnectionFactory"));
+ }
+ catch (Exception ignore)
+ {
+ }
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -136,7 +136,7 @@
for (int i = 0; i < numMessages / 6; i++)
{
- tm0_1 = (TextMessage)cons0_1.receive(5000000);
+ tm0_1 = (TextMessage)cons0_1.receive(5000);
assertNotNull(tm0_1);
@@ -153,7 +153,7 @@
for (int i = 0; i < numMessages / 6; i++)
{
- tm0_2 = (TextMessage)cons0_2.receive(5000000);
+ tm0_2 = (TextMessage)cons0_2.receive(5000);
assertNotNull(tm0_2);
@@ -173,7 +173,7 @@
for (int i = 0; i < numMessages / 6; i++)
{
- tm1_1 = (TextMessage)cons1_1.receive(5000000);
+ tm1_1 = (TextMessage)cons1_1.receive(5000);
assertNotNull(tm1_1);
@@ -190,7 +190,7 @@
for (int i = 0; i < numMessages / 6; i++)
{
- tm1_2 = (TextMessage)cons1_2.receive(5000000);
+ tm1_2 = (TextMessage)cons1_2.receive(5000);
assertNotNull(tm1_2);
@@ -210,7 +210,7 @@
for (int i = 0; i < numMessages / 6; i++)
{
- tm2_1 = (TextMessage)cons2_1.receive(5000000);
+ tm2_1 = (TextMessage)cons2_1.receive(5000);
assertNotNull(tm2_1);
@@ -227,7 +227,7 @@
for (int i = 0; i < numMessages / 6; i++)
{
- tm2_2 = (TextMessage)cons2_2.receive(5000000);
+ tm2_2 = (TextMessage)cons2_2.receive(5000);
assertNotNull(tm2_2);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedTopicTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -142,12 +142,43 @@
super.setUp();
+ ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 300000, 3000, 3000, 0, false);
+
+ ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 300000, 3000, 3000, 1, false);
+
+ ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 300000, 3000, 3000, 2, false);
+
+
log.debug("setup done");
}
protected void tearDown() throws Exception
{
super.tearDown();
+
+ try
+ {
+ ServerManagement.undeployTopic("nonClusteredTopic", 0);
+ }
+ catch (Exception ignore)
+ {
+ }
+
+ try
+ {
+ ServerManagement.undeployTopic("nonClusteredTopic", 1);
+ }
+ catch (Exception ignore)
+ {
+ }
+
+ try
+ {
+ ServerManagement.undeployTopic("nonClusteredTopic", 2);
+ }
+ catch (Exception ignore)
+ {
+ }
}
// Private -------------------------------------------------------
@@ -202,20 +233,20 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons0.receive(1000);
+ TextMessage tm = (TextMessage)cons0.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- Message msg = cons0.receive(1000);
+ Message msg = cons0.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons1.receive(1000);
+ TextMessage tm = (TextMessage)cons1.receive(3000);
assertNotNull(tm);
@@ -223,46 +254,46 @@
assertEquals("message" + i, tm.getText());
}
- msg = cons1.receive(1000);
+ msg = cons1.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons2.receive(1000);
+ TextMessage tm = (TextMessage)cons2.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = cons2.receive(1000);
+ msg = cons2.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons3.receive(1000);
+ TextMessage tm = (TextMessage)cons3.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = cons3.receive(1000);
+ msg = cons3.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons4.receive(1000);
+ TextMessage tm = (TextMessage)cons4.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = cons4.receive(1000);
+ msg = cons4.receive(3000);
assertNull(msg);
}
@@ -347,40 +378,40 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons0.receive(1000);
+ TextMessage tm = (TextMessage)cons0.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- Message msg = cons0.receive(1000);
+ Message msg = cons0.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons1.receive(1000);
+ TextMessage tm = (TextMessage)cons1.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = cons1.receive(1000);
+ msg = cons1.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons2.receive(1000);
+ TextMessage tm = (TextMessage)cons2.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = cons2.receive(1000);
+ msg = cons2.receive(3000);
assertNull(msg);
@@ -390,7 +421,7 @@
if (c == 0)
{
- TextMessage tm = (TextMessage)cons3.receive(1000);
+ TextMessage tm = (TextMessage)cons3.receive(3000);
assertNotNull(tm);
@@ -398,7 +429,7 @@
}
}
- msg = cons3.receive(1000);
+ msg = cons3.receive(3000);
assertNull(msg);
@@ -408,7 +439,7 @@
if (c == 1)
{
- TextMessage tm = (TextMessage)cons4.receive(1000);
+ TextMessage tm = (TextMessage)cons4.receive(3000);
assertNotNull(tm);
@@ -416,7 +447,7 @@
}
}
- msg = cons4.receive(1000);
+ msg = cons4.receive(3000);
assertNull(msg);
}
@@ -517,52 +548,52 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)alpha.receive(1000);
+ TextMessage tm = (TextMessage)alpha.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- Message msg = alpha.receive(1000);
+ Message msg = alpha.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)beta.receive(1000);
+ TextMessage tm = (TextMessage)beta.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = beta.receive(1000);
+ msg = beta.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)gamma.receive(1000);
+ TextMessage tm = (TextMessage)gamma.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = gamma.receive(1000);
+ msg = gamma.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)delta.receive(1000);
+ TextMessage tm = (TextMessage)delta.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = delta.receive(1000);
+ msg = delta.receive(3000);
assertNull(msg);
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)epsilon.receive(1000);
+ TextMessage tm = (TextMessage)epsilon.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- msg = epsilon.receive(1000);
+ msg = epsilon.receive(3000);
assertNull(msg);
//close beta
@@ -591,7 +622,7 @@
for (int i = 0; i < NUM_MESSAGES / 2; i++)
{
- TextMessage tm = (TextMessage)beta0.receive(1000);
+ TextMessage tm = (TextMessage)beta0.receive(3000);
assertNotNull(tm);
if (tm.getText().substring("message2-".length()).equals("1"))
@@ -602,7 +633,7 @@
assertEquals("message2-" + (i * 2 + offset), tm.getText());
}
- msg = beta0.receive(2000);
+ msg = beta0.receive(3000);
assertNull(msg);
if (offset == 1)
@@ -616,12 +647,12 @@
for (int i = 0; i < NUM_MESSAGES / 2; i++)
{
- TextMessage tm = (TextMessage)beta1.receive(1000);
+ TextMessage tm = (TextMessage)beta1.receive(3000);
assertNotNull(tm);
assertEquals("message2-" + (i * 2 + offset), tm.getText());
}
- msg = beta1.receive(2000);
+ msg = beta1.receive(3000);
assertNull(msg);
//Send some more at node 0
@@ -635,12 +666,12 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)beta0.receive(1000);
+ TextMessage tm = (TextMessage)beta0.receive(3000);
assertNotNull(tm);
assertEquals("message3-" + i, tm.getText());
}
- msg = beta0.receive(2000);
+ msg = beta0.receive(3000);
assertNull(msg);
//So now we have a beta on node 1 and a beta on node 0 and the messages are on node2
@@ -751,18 +782,18 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons1.receive(1000);
+ TextMessage tm = (TextMessage)cons1.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- Message m = cons2.receive(2000);
+ Message m = cons2.receive(3000);
assertNull(m);
- m = cons3.receive(2000);
+ m = cons3.receive(3000);
assertNull(m);
@@ -781,18 +812,18 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons2.receive(1000);
+ TextMessage tm = (TextMessage)cons2.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons1.receive(2000);
+ m = cons1.receive(3000);
assertNull(m);
- m = cons3.receive(2000);
+ m = cons3.receive(3000);
assertNull(m);
@@ -811,18 +842,18 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons3.receive(1000);
+ TextMessage tm = (TextMessage)cons3.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons1.receive(2000);
+ m = cons1.receive(3000);
assertNull(m);
- m = cons2.receive(2000);
+ m = cons2.receive(3000);
assertNull(m);
@@ -954,7 +985,7 @@
for (int i = 0; i < NUM_MESSAGES / 2; i++)
{
- TextMessage tm = (TextMessage)cons1.receive(1000);
+ TextMessage tm = (TextMessage)cons1.receive(3000);
assertNotNull(tm);
if (tm.getText().substring("message2-".length()).equals("1"))
@@ -965,7 +996,7 @@
assertEquals("message2-" + (i * 2 + offset), tm.getText());
}
- Message msg = cons1.receive(2000);
+ Message msg = cons1.receive(3000);
assertNull(msg);
if (offset == 1)
@@ -979,12 +1010,12 @@
for (int i = 0; i < NUM_MESSAGES / 2; i++)
{
- TextMessage tm = (TextMessage)cons2.receive(1000);
+ TextMessage tm = (TextMessage)cons2.receive(3000);
assertNotNull(tm);
assertEquals("message2-" + (i * 2 + offset), tm.getText());
}
- msg = cons2.receive(2000);
+ msg = cons2.receive(3000);
assertNull(msg);
cons1.close();
@@ -1033,12 +1064,6 @@
try
{
- ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 200000, 2000, 2000, 0, false);
-
- ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 200000, 2000, 2000, 1, false);
-
- ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 200000, 2000, 2000, 2, false);
-
Topic topic0 = (Topic)ic[0].lookup("/nonClusteredTopic");
Topic topic1 = (Topic)ic[1].lookup("/nonClusteredTopic");
Topic topic2 = (Topic)ic[2].lookup("/nonClusteredTopic");
@@ -1081,13 +1106,13 @@
// Try and consume at node 1
- Message m = cons1.receive(2000);
+ Message m = cons1.receive(3000);
assertNull(m);
//And at node 2
- m = cons2.receive(2000);
+ m = cons2.receive(3000);
assertNull(m);
@@ -1095,14 +1120,14 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons0.receive(1000);
+ TextMessage tm = (TextMessage)cons0.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons0.receive(2000);
+ m = cons0.receive(3000);
assertNull(m);
@@ -1122,13 +1147,13 @@
// Try and consume at node 0
- m = cons0.receive(2000);
+ m = cons0.receive(3000);
assertNull(m);
//And at node 2
- m = cons2.receive(2000);
+ m = cons2.receive(3000);
assertNull(m);
@@ -1136,14 +1161,14 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons1.receive(1000);
+ TextMessage tm = (TextMessage)cons1.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons1.receive(2000);
+ m = cons1.receive(3000);
assertNull(m);
@@ -1163,13 +1188,13 @@
// Try and consume at node 0
- m = cons0.receive(2000);
+ m = cons0.receive(3000);
assertNull(m);
//And at node 1
- m = cons1.receive(2000);
+ m = cons1.receive(3000);
assertNull(m);
@@ -1177,14 +1202,14 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons2.receive(1000);
+ TextMessage tm = (TextMessage)cons2.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons2.receive(2000);
+ m = cons2.receive(3000);
assertNull(m);
}
@@ -1224,12 +1249,7 @@
try
{
- ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 200000, 2000, 2000, 0, false);
-
- ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 200000, 2000, 2000, 1, false);
-
- ServerManagement.deployTopic("nonClusteredTopic", "nonClusteredTopic", 200000, 2000, 2000, 2, false);
-
+
Topic topic0 = (Topic)ic[0].lookup("/nonClusteredTopic");
Topic topic1 = (Topic)ic[1].lookup("/nonClusteredTopic");
Topic topic2 = (Topic)ic[2].lookup("/nonClusteredTopic");
@@ -1281,7 +1301,7 @@
cons1 = sess1.createDurableSubscriber(topic1, "mysub1");
- Message m = cons1.receive(2000);
+ Message m = cons1.receive(3000);
assertNull(m);
@@ -1291,7 +1311,7 @@
cons2 = sess2.createDurableSubscriber(topic2, "mysub1");
- m = cons2.receive(2000);
+ m = cons2.receive(3000);
assertNull(m);
@@ -1303,14 +1323,14 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons0.receive(1000);
+ TextMessage tm = (TextMessage)cons0.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons0.receive(2000);
+ m = cons0.receive(3000);
assertNull(m);
@@ -1334,7 +1354,7 @@
// Try and consume at node 0
- m = cons0.receive(2000);
+ m = cons0.receive(3000);
assertNull(m);
@@ -1344,7 +1364,7 @@
cons2 = sess2.createDurableSubscriber(topic2, "mysub1");
- m = cons2.receive(2000);
+ m = cons2.receive(3000);
assertNull(m);
@@ -1356,14 +1376,14 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons1.receive(1000);
+ TextMessage tm = (TextMessage)cons1.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons1.receive(2000);
+ m = cons1.receive(3000);
assertNull(m);
@@ -1387,7 +1407,7 @@
// Try and consume at node 0
- m = cons0.receive(2000);
+ m = cons0.receive(3000);
assertNull(m);
@@ -1399,7 +1419,7 @@
cons1 = sess1.createDurableSubscriber(topic1, "mysub1");
- m = cons1.receive(2000);
+ m = cons1.receive(3000);
assertNull(m);
@@ -1413,14 +1433,14 @@
for (int i = 0; i < NUM_MESSAGES; i++)
{
- TextMessage tm = (TextMessage)cons2.receive(1000);
+ TextMessage tm = (TextMessage)cons2.receive(3000);
assertNotNull(tm);
assertEquals("message" + i, tm.getText());
}
- m = cons2.receive(2000);
+ m = cons2.receive(3000);
assertNull(m);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -317,6 +317,7 @@
conn.start();
+ log.info("*** sending message");
Message m = session.createTextMessage("nik");
prod.send(m);
@@ -1902,6 +1903,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
// Private --------------------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -626,6 +626,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
// Private --------------------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultiThreadFailoverTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -475,6 +475,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -324,6 +324,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
// Private --------------------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/NoFailoverTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -175,6 +175,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
// Private --------------------------------------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -302,6 +302,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java 2007-07-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -29,7 +29,9 @@
import javax.jms.TextMessage;
import javax.jms.Topic;
+import org.jboss.test.messaging.tools.ServerManagement;
+
/**
* A test for temporary destinations in a clustered enviroment.
* See http://jira.jboss.org/jira/browse/JBMESSAGING-841.
@@ -228,6 +230,15 @@
protected void tearDown() throws Exception
{
super.tearDown();
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
// Private --------------------------------------------------------------------------------------
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-20 10:24:57 UTC (rev 2919)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/XAFailoverTest.java 2007-07-20 15:03:45 UTC (rev 2920)
@@ -90,6 +90,15 @@
{
tm.resume(suspended);
}
+
+ for (int i = 0; i < nodeCount; i++)
+ {
+ if (ServerManagement.isStarted(i))
+ {
+ ServerManagement.log(ServerManagement.INFO, "Undeploying Server " + i, i);
+ ServerManagement.stop(i);
+ }
+ }
}
public void testSimpleXAConnectionFailover() throws Exception
More information about the jboss-cvs-commits
mailing list