[hornetq-commits] JBoss hornetq SVN: r11793 - in trunk: tests/integration-tests/src/test/java/org/hornetq/tests/integration/client and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Nov 30 05:48:10 EST 2011
Author: borges
Date: 2011-11-30 05:48:09 -0500 (Wed, 30 Nov 2011)
New Revision: 11793
Modified:
trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java
Log:
Improve tearDown to avoid leaving instances running.
Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java 2011-11-30 03:20:21 UTC (rev 11792)
+++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java 2011-11-30 10:48:09 UTC (rev 11793)
@@ -88,14 +88,7 @@
{
for (ServerLocator locator : locators)
{
- try
- {
- locator.close();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ closeServerLocator(locator);
}
locators.clear();
super.tearDown();
@@ -122,6 +115,20 @@
}
}
+ public static final void closeSessionFactory(final ClientSessionFactory sf)
+ {
+ if (sf == null)
+ return;
+ try
+ {
+ sf.close();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
protected void waitForTopology(final HornetQServer server, final int nodes) throws Exception
{
waitForTopology(server, nodes, WAIT_TIMEOUT);
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java 2011-11-30 03:20:21 UTC (rev 11792)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java 2011-11-30 10:48:09 UTC (rev 11793)
@@ -79,6 +79,8 @@
public class PagingTest extends ServiceTestBase
{
private ServerLocator locator;
+ private HornetQServer server;
+ private ClientSessionFactory sf;
static final int MESSAGE_SIZE = 1024; // 1k
public PagingTest(final String name)
@@ -120,6 +122,8 @@
@Override
protected void tearDown() throws Exception
{
+ stopComponent(server);
+ closeSessionFactory(sf);
closeServerLocator(locator);
super.tearDown();
}
@@ -132,8 +136,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
- config,
+ server =
+ createServer(true, config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
new HashMap<String, AddressSettings>());
@@ -146,15 +150,13 @@
final int messagesPerTX = numberOfMessages / numberOfTX;
- try
- {
ServerLocator locator = createInVMNonHALocator();
locator.setBlockOnNonDurableSend(true);
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -341,18 +343,6 @@
Thread.sleep(100);
}
assertFalse(queue.getPageSubscription().getPagingStore().isPaging());
- }
- finally
- {
- try
- {
- server.stop();
- }
- catch (Throwable ignored)
- {
- }
- }
-
}
public void testReceiveImmediate() throws Exception
@@ -363,7 +353,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -375,15 +366,15 @@
final int numberOfMessages = 1000;
+ ServerLocator locator = createInVMNonHALocator();
try
{
- ServerLocator locator = createInVMNonHALocator();
locator.setBlockOnNonDurableSend(true);
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -442,16 +433,12 @@
assertEquals(numberOfMessages, queue.getMessageCount());
- LinkedList<Xid> xids = new LinkedList<Xid>();
-
- int msgReceived = 0;
ClientSession sessionConsumer = sf.createSession(false, false, false);
sessionConsumer.start();
ClientConsumer consumer = sessionConsumer.createConsumer(PagingTest.ADDRESS);
for (int msgCount = 0; msgCount < numberOfMessages; msgCount++)
{
log.info("Received " + msgCount);
- msgReceived++;
ClientMessage msg = consumer.receiveImmediate();
if (msg == null)
{
@@ -487,15 +474,9 @@
}
finally
{
- try
- {
- server.stop();
- }
- catch (Throwable ignored)
- {
- }
+ closeServerLocator(locator);
+ stopComponent(server);
}
-
}
/**
@@ -510,7 +491,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -522,15 +504,13 @@
final int numberOfMessages = 1000;
- try
- {
ServerLocator locator = createInVMNonHALocator();
locator.setBlockOnNonDurableSend(true);
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -716,20 +696,6 @@
sessionConsumer.commit();
sessionConsumer.close();
-
-
- }
- finally
- {
- try
- {
- server.stop();
- }
- catch (Throwable ignored)
- {
- }
- }
-
}
public void testMissingTXEverythingAcked() throws Exception
@@ -740,7 +706,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -764,7 +731,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -922,7 +889,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -946,7 +914,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -1086,7 +1054,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -1106,7 +1075,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -1221,7 +1190,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -1311,7 +1281,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -1522,7 +1492,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -1552,7 +1523,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -1705,7 +1676,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -1725,7 +1697,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -1855,7 +1827,8 @@
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -1870,7 +1843,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -1997,7 +1970,8 @@
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -2014,7 +1988,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
byte[] body = new byte[MESSAGE_SIZE];
@@ -2147,7 +2121,8 @@
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -2164,7 +2139,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
byte[] body = new byte[MESSAGE_SIZE];
@@ -2277,7 +2252,8 @@
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -2302,7 +2278,7 @@
try
{
- final ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
final byte[] body = new byte[MESSAGE_SIZE];
@@ -2408,7 +2384,8 @@
Configuration config = createDefaultConfig();
- final HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_SIZE * 2,
@@ -2429,7 +2406,7 @@
locator.setBlockOnNonDurableSend(true);
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- final ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
final CountDownLatch ready = new CountDownLatch(1);
@@ -2552,7 +2529,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -2571,7 +2549,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
@@ -2685,7 +2663,8 @@
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -2704,7 +2683,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, false, true, false, 0);
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
@@ -2758,7 +2737,8 @@
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -2777,7 +2757,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, false, false, false, 0);
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
@@ -2860,7 +2840,8 @@
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -2877,7 +2858,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, false, false, false, 0);
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
@@ -3004,7 +2985,7 @@
settings.put(PagingTest.ADDRESS.toString(), set);
- HornetQServer server = createServer(true, config, 1024, 10 * 1024, settings);
+ server = createServer(true, config, 1024, 10 * 1024, settings);
server.start();
@@ -3017,7 +2998,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
@@ -3146,7 +3127,7 @@
settings.put(PagingTest.ADDRESS.toString(), set);
- HornetQServer server = createServer(true, config, 1024, 1024 * 1024, settings);
+ server = createServer(true, config, 1024, 1024 * 1024, settings);
server.start();
@@ -3157,7 +3138,7 @@
locator.setAckBatchSize(0);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession();
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
@@ -3240,7 +3221,8 @@
int NUMBER_OF_MESSAGES = 2;
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -3255,7 +3237,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(null, null, false, !transacted, true, false, 0);
for (int i = 0; i < NUMBER_OF_BINDINGS; i++)
@@ -3347,7 +3329,8 @@
{
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -3447,7 +3430,8 @@
{
Configuration config = createDefaultConfig();
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -3558,13 +3542,13 @@
addresses.put(PAGED_ADDRESS.toString(), pagedDestination);
- HornetQServer server = createServer(true, configuration, -1, -1, addresses);
+ server = createServer(true, configuration, -1, -1, addresses);
try
{
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, true, false);
@@ -3667,13 +3651,13 @@
addresses.put(PAGED_ADDRESS_B.toString(), pagedDestinationB);
- HornetQServer server = createServer(true, configuration, -1, -1, addresses);
+ server = createServer(true, configuration, -1, -1, addresses);
try
{
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, true, false);
@@ -3784,7 +3768,7 @@
config.setJournalSyncNonTransactional(false);
config.setJournalFileSize(10 * 1024 * 1024);
- HornetQServer server = createServer(true, config, 512 * 1024, 1024 * 1024, new HashMap<String, AddressSettings>());
+ server = createServer(true, config, 512 * 1024, 1024 * 1024, new HashMap<String, AddressSettings>());
server.start();
@@ -3800,7 +3784,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- final ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(true, true);
@@ -3925,7 +3909,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -3949,7 +3934,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -4050,7 +4035,8 @@
config.setJournalSyncNonTransactional(false);
- HornetQServer server = createServer(true,
+ server =
+ createServer(true,
config,
PagingTest.PAGE_SIZE,
PagingTest.PAGE_MAX,
@@ -4074,7 +4060,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -4177,7 +4163,7 @@
dla.setDeadLetterAddress(new SimpleString("DLA"));
settings.put(ADDRESS.toString(), dla);
- final HornetQServer server = createServer(true, config, PagingTest.PAGE_SIZE, PagingTest.PAGE_MAX, settings);
+ server = createServer(true, config, PagingTest.PAGE_SIZE, PagingTest.PAGE_MAX, settings);
server.start();
@@ -4394,15 +4380,6 @@
finally
{
session.close();
- sf.close();
- locator.close();
- try
- {
- server.stop();
- }
- catch (Throwable ignored)
- {
- }
}
}
@@ -4422,21 +4399,21 @@
dla.setExpiryAddress(new SimpleString("DLA"));
settings.put(ADDRESS.toString(), dla);
- final HornetQServer server = createServer(true, config, PagingTest.PAGE_SIZE, PagingTest.PAGE_MAX, settings);
+ server = createServer(true, config, PagingTest.PAGE_SIZE, PagingTest.PAGE_MAX, settings);
server.start();
final int messageSize = 20;
+ ServerLocator locator = createInVMNonHALocator();
try
{
- ServerLocator locator = createInVMNonHALocator();
locator.setBlockOnNonDurableSend(true);
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
@@ -4552,14 +4529,8 @@
}
finally
{
- locator.close();
- try
- {
- server.stop();
- }
- catch (Throwable ignored)
- {
- }
+ closeServerLocator(locator);
+ stopComponent(server);
}
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-11-30 03:20:21 UTC (rev 11792)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2011-11-30 10:48:09 UTC (rev 11793)
@@ -181,7 +181,7 @@
}
for (int i = 0; i < MAX_SERVERS; i++)
- {
+ {
stopComponent(nodeManagers[i]);
}
UnitTestCase.checkFreePort(ClusterTestBase.PORTS);
@@ -575,8 +575,6 @@
if (holder != null)
{
holder.close();
- // holder.session.close();
-
consumers[i] = null;
}
}
@@ -586,14 +584,8 @@
{
for (int i = 0; i < sfs.length; i++)
{
- ClientSessionFactory sf = sfs[i];
-
- if (sf != null)
- {
- sf.close();
-
- sfs[i] = null;
- }
+ closeSessionFactory(sfs[i]);
+ sfs[i] = null;
}
}
@@ -601,14 +593,8 @@
{
for (int i = 0; i < locators.length; i++)
{
- ServerLocator sf = locators[i];
-
- if (sf != null)
- {
- sf.close();
-
- locators[i] = null;
- }
+ closeServerLocator(locators[i]);
+ locators[i] = null;
}
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-11-30 03:20:21 UTC (rev 11792)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-11-30 10:48:09 UTC (rev 11793)
@@ -204,7 +204,6 @@
session.close();
Assert.assertTrue(retry <= 5);
- closeSessionFactory();
}
public void testNonTransacted() throws Exception
@@ -229,8 +228,6 @@
receiveDurableMessages(consumer);
session.close();
-
- closeSessionFactory();
}
private void createSessionFactory() throws Exception
@@ -377,7 +374,7 @@
session.close();
- closeSessionFactory();
+
}
/**
@@ -432,8 +429,6 @@
Assert.assertEquals(counter, message.getIntProperty("counter").intValue());
session.close();
-
- closeSessionFactory();
}
public void testTransactedMessagesNotSentSoNoRollback() throws Exception
@@ -470,7 +465,7 @@
session.close();
- closeSessionFactory();
+
}
public void testTransactedMessagesWithConsumerStartedBeforeFailover() throws Exception
@@ -514,8 +509,6 @@
session.commit();
session.close();
-
- closeSessionFactory();
}
public void testTransactedMessagesConsumedSoRollback() throws Exception
@@ -558,8 +551,6 @@
session1.close();
session2.close();
-
- closeSessionFactory();
}
public void testTransactedMessagesNotConsumedSoNoRollback() throws Exception
@@ -636,8 +627,6 @@
session1.close();
session2.close();
-
- closeSessionFactory();
}
public void testXAMessagesSentSoRollbackOnEnd() throws Exception
@@ -680,8 +669,6 @@
Assert.assertNull(message);
session.close();
-
- closeSessionFactory();
}
public void testXAMessagesSentSoRollbackOnPrepare() throws Exception
@@ -729,8 +716,6 @@
producer.close();
consumer.close();
session.close();
-
- closeSessionFactory();
}
// This might happen if 1PC optimisation kicks in
@@ -821,8 +806,6 @@
session.commit(xid2, false);
session.close();
-
- closeSessionFactory();
}
public void testXAMessagesConsumedSoRollbackOnEnd() throws Exception
@@ -867,8 +850,6 @@
session1.close();
session2.close();
-
- closeSessionFactory();
}
public void testXAMessagesConsumedSoRollbackOnPrepare() throws Exception
@@ -915,8 +896,6 @@
session1.close();
session2.close();
-
- closeSessionFactory();
}
// 1PC optimisation
@@ -966,8 +945,6 @@
session1.close();
session2.close();
-
- closeSessionFactory();
}
public void testCreateNewFactoryAfterFailover() throws Exception
@@ -990,8 +967,6 @@
session = sendAndConsume(sf, true);
session.close();
-
- closeSessionFactory();
}
public void testFailoverMultipleSessionsWithConsumers() throws Exception
@@ -1055,8 +1030,6 @@
}
sendSession.close();
-
- closeSessionFactory();
}
/*
@@ -1084,8 +1057,6 @@
receiveDurableMessages(consumer);
session.close();
-
- closeSessionFactory();
}
private void sendMessagesSomeDurable(ClientSession session, ClientProducer producer) throws Exception, HornetQException
@@ -1136,8 +1107,6 @@
receiveDurableMessages(consumer);
session.close();
-
- closeSessionFactory();
}
private void receiveDurableMessages(ClientConsumer consumer) throws HornetQException
@@ -1203,8 +1172,6 @@
receiveMessages(consumer, NUM_MESSAGES, NUM_MESSAGES * 2, true);
session.close();
-
- closeSessionFactory();
}
private void receiveMessages(ClientConsumer consumer) throws HornetQException
@@ -1264,8 +1231,6 @@
receiveMessages(consumer);
session.close();
-
- closeSessionFactory();
}
public void _testForceBlockingReturn() throws Exception
@@ -1323,7 +1288,6 @@
Assert.assertEquals(sender.e.getCode(), HornetQException.UNBLOCKED);
session.close();
-
}
public void testCommitOccurredUnblockedAndResendNoDuplicates() throws Exception
@@ -1467,15 +1431,13 @@
Assert.assertNull(message);
session2.close();
-
- closeSessionFactory();
}
private void closeSessionFactory()
{
if (sf == null)
return;
- sf.close();
+ closeSessionFactory(sf);
Assert.assertEquals(0, sf.numSessions());
Assert.assertEquals(0, sf.numConnections());
}
@@ -1715,7 +1677,7 @@
session.close();
- closeSessionFactory();
+
}
public void testLiveAndBackupBackupComesBackNewFactory() throws Exception
@@ -1776,7 +1738,7 @@
session.close();
- closeSessionFactory();
+
}
// Package protected ---------------------------------------------
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java 2011-11-30 03:20:21 UTC (rev 11792)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java 2011-11-30 10:48:09 UTC (rev 11793)
@@ -29,20 +29,6 @@
public class NettyFailoverTest extends FailoverTest
{
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
@Override
protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live)
{
@@ -70,9 +56,4 @@
return new TransportConfiguration(NETTY_CONNECTOR_FACTORY, server1Params);
}
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
More information about the hornetq-commits
mailing list