[hornetq-commits] JBoss hornetq SVN: r12183 - in trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration: xa and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Feb 23 09:19:25 EST 2012
Author: borges
Date: 2012-02-23 09:19:24 -0500 (Thu, 23 Feb 2012)
New Revision: 12183
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaTest.java
Log:
Improve tests tearDown() to avoid leaks
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2012-02-23 14:19:03 UTC (rev 12182)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2012-02-23 14:19:24 UTC (rev 12183)
@@ -48,7 +48,7 @@
* A BridgeReconnectTest
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- *
+ *
* Created 20 Jan 2009 19:20:41
*
*
@@ -167,15 +167,15 @@
waitForServerStart(service2);
- locator = HornetQClient.createServerLocatorWithoutHA(server0tc, server2tc);
+ locator = addServerLocator(HornetQClient.createServerLocatorWithoutHA(server0tc, server2tc));
- ClientSessionFactory csf0 = locator.createSessionFactory(server2tc);
+ ClientSessionFactory csf0 = addSessionFactory(locator.createSessionFactory(server2tc));
ClientSession session0 = csf0.createSession(false, true, true);
ClientProducer prod0 = session0.createProducer(testAddress);
- ClientSessionFactory csf2 = locator.createSessionFactory(server2tc);
+ ClientSessionFactory csf2 = addSessionFactory(locator.createSessionFactory(server2tc));
ClientSession session2 = csf2.createSession(false, true, true);
@@ -305,12 +305,12 @@
// Now we will simulate a failure of the bridge connection between server0 and server1
server0.stop(true);
- locator = HornetQClient.createServerLocatorWithHA(server2tc);
+ locator = addServerLocator(HornetQClient.createServerLocatorWithHA(server2tc));
locator.setReconnectAttempts(100);
- ClientSessionFactory csf0 = locator.createSessionFactory(server2tc);
+ ClientSessionFactory csf0 = addSessionFactory(locator.createSessionFactory(server2tc));
ClientSession session0 = csf0.createSession(false, true, true);
- ClientSessionFactory csf2 = locator.createSessionFactory(server2tc);
+ ClientSessionFactory csf2 = addSessionFactory(locator.createSessionFactory(server2tc));
ClientSession session2 = csf2.createSession(false, true, true);
ClientProducer prod0 = session0.createProducer(testAddress);
@@ -430,7 +430,7 @@
server1.start();
server0.start();
- locator = HornetQClient.createServerLocatorWithHA(server0tc, server1tc);
+ locator = addServerLocator(HornetQClient.createServerLocatorWithHA(server0tc, server1tc));
ClientSessionFactory csf0 = locator.createSessionFactory(server0tc);
ClientSession session0 = csf0.createSession(false, true, true);
@@ -574,11 +574,11 @@
{
server1.start();
server0.start();
-
+
waitForServerStart(server0);
waitForServerStart(server1);
- locator = HornetQClient.createServerLocatorWithHA(server0tc, server1tc);
+ locator = addServerLocator(HornetQClient.createServerLocatorWithHA(server0tc, server1tc));
ClientSessionFactory csf0 = locator.createSessionFactory(server0tc);
ClientSession session0 = csf0.createSession(false, true, true);
@@ -644,7 +644,7 @@
Assert.assertEquals(0, server0.getRemotingService().getConnections().size());
Assert.assertEquals(0, server1.getRemotingService().getConnections().size());
}
-
+
public void testFailoverThenFailAgainAndReconnect() throws Exception
{
Map<String, Object> server0Params = new HashMap<String, Object>();
@@ -715,7 +715,7 @@
server1.start();
server0.start();
- locator = HornetQClient.createServerLocatorWithHA(server0tc, server1tc);
+ locator = addServerLocator(HornetQClient.createServerLocatorWithHA(server0tc, server1tc));
ClientSessionFactory csf0 = locator.createSessionFactory(server0tc);
ClientSession session0 = csf0.createSession(false, true, true);
@@ -733,7 +733,7 @@
InVMConnector.failOnCreateConnection = true;
InVMConnector.numberOfFailures = reconnectAttempts - 1;
forwardingConnection.fail(new HornetQException(HornetQException.NOT_CONNECTED));
-
+
final int numMessages = NUM_MESSAGES;
SimpleString propKey = new SimpleString("propkey");
@@ -790,8 +790,8 @@
supposed = i;
}
}
-
+
session0.close();
session1.close();
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2012-02-23 14:19:03 UTC (rev 12182)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2012-02-23 14:19:24 UTC (rev 12183)
@@ -13,7 +13,6 @@
package org.hornetq.tests.integration.cluster.bridge;
-import java.util.ArrayList;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -42,19 +41,9 @@
public abstract class BridgeTestBase extends UnitTestCase
{
- private ArrayList<HornetQServer> servers;
-
@Override
- public void setUp() throws Exception
- {
- super.setUp();
- servers = new ArrayList<HornetQServer>();
- }
-
- @Override
public void tearDown() throws Exception
{
- servers = null;
InVMConnector.failOnCreateConnection = false;
super.tearDown();
@@ -112,7 +101,6 @@
service = new InVMNodeManagerServer(serviceConf, nodeManager);
}
addServer(service);
- servers.add(service);
return service;
}
@@ -161,7 +149,6 @@
service = new InVMNodeManagerServer(serviceConf, nodeManager);
}
addServer(service);
- servers.add(service);
return service;
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaTest.java 2012-02-23 14:19:03 UTC (rev 12182)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/xa/BasicXaTest.java 2012-02-23 14:19:24 UTC (rev 12183)
@@ -94,13 +94,8 @@
ServerLocator locator = createInVMNonHALocator();
ClientSessionFactory factory = createSessionFactory(locator);
- ClientSession session = null;
+ ClientSession session = addClientSession(factory.createSession(true, false, false));
- try
- {
-
- session = factory.createSession(true, false, false);
-
session.createQueue("Test", "Test");
ClientProducer prod = session.createProducer("Test");
@@ -112,13 +107,6 @@
ClientConsumer cons = session.createConsumer("Test");
assertNotNull("Send went through an invalid XA Session", cons.receiveImmediate());
- }
- finally
- {
- factory.close();
-
- session.close();
- }
}
@@ -129,13 +117,8 @@
ClientSessionFactory factory = createSessionFactory(locator);
- ClientSession session = null;
+ ClientSession session = addClientSession(factory.createSession(false, true, true));
- try
- {
-
- session = factory.createSession(false, true, true);
-
session.createQueue("Test", "Test");
ClientProducer prod = session.createProducer("Test");
@@ -144,7 +127,7 @@
session.close();
- session = factory.createSession(true, false, false);
+ session = addClientSession(factory.createSession(true, false, false));
session.start();
@@ -159,7 +142,7 @@
session.close();
- session = factory.createSession(false, false, false);
+ session = addClientSession(factory.createSession(false, false, false));
session.start();
@@ -168,14 +151,6 @@
msg = cons.receiveImmediate();
assertNull("Acknowledge went through invalid XA Session", msg);
-
-
-
- }
- finally
- {
- session.close();
- }
}
More information about the hornetq-commits
mailing list