[hornetq-commits] JBoss hornetq SVN: r12128 - in trunk: tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp and 3 other directories.

Author: borges Date: 2012-02-16 09:07:03 -0500 (Thu, 16 Feb 2012) New Revision: 12128 Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java Log: Tidy-up tearDown code to avoid any leakage and thus hangs. 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 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -606,24 +606,6 @@ } } - protected ServerLocator createInVMNonHALocator() - { - return createNonHALocator(false); - } - - protected ServerLocator createNettyNonHALocator() - { - return createNonHALocator(true); - } - - protected ServerLocator createNonHALocator(final boolean isNetty) - { - ServerLocator locatorWithoutHA = isNetty ? HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY)) - : HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - return addServerLocator(locatorWithoutHA); - - } - protected ServerLocator createInVMLocator(final int serverID) { TransportConfiguration tnspConfig = createInVMTransportConnectorConfig(serverID, UUIDGenerator.getInstance().generateStringUUID()); Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -59,6 +59,7 @@ import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; import org.hornetq.core.client.impl.ClientSessionFactoryImpl; @@ -1498,6 +1499,25 @@ } + protected ServerLocator createInVMNonHALocator() + { + return createNonHALocator(false); + } + + protected ServerLocator createNettyNonHALocator() + { + return createNonHALocator(true); + } + + protected ServerLocator createNonHALocator(final boolean isNetty) + { + ServerLocator locatorWithoutHA = + isNetty + ? HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY)) + : HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + return addServerLocator(locatorWithoutHA); + } + protected static final void stopComponent(HornetQComponent component) { if (component == null) @@ -1579,7 +1599,7 @@ } } - protected final void addSessionFactory(ClientSessionFactory sf) + protected final ClientSessionFactory addSessionFactory(ClientSessionFactory sf) { if (sf != null) { @@ -1588,6 +1608,7 @@ sessionFactories.add(sf); } } + return sf; } private void assertAllClientConsumersAreClosed() Modified: trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java =================================================================== --- trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -60,22 +60,22 @@ sendFrame(stompSocket, connect); String connected = receiveFrame(stompSocket, inputBuffer, 10000); Assert.assertTrue(connected.startsWith("CONNECTED")); - + sendFrame(stompSocket_2, connect); connected = receiveFrame(stompSocket_2, inputBuffer_2, 10000); Assert.assertTrue(connected.startsWith("CONNECTED")); - + final int count = 1000; final CountDownLatch latch = new CountDownLatch(count); - - String subscribe = + + String subscribe = "SUBSCRIBE\n" + "destination:" + getQueueName() + "\n" + "ack:auto\n\n" + Stomp.NULL; sendFrame(stompSocket_2, subscribe); Thread.sleep(2000); - + new Thread() { @Override @@ -142,7 +142,7 @@ config.getAcceptorConfigurations().add(stompTransport); config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); config.getQueueConfigurations().add(new CoreQueueConfiguration(getQueueName(), getQueueName(), null, false)); - return HornetQServers.newHornetQServer(config); + return addServer(HornetQServers.newHornetQServer(config)); } @Override @@ -157,7 +157,6 @@ { stompSocket_2.close(); } - server.stop(); super.tearDown(); } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -17,25 +17,26 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; -import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; /** - * + * * There is a bug in JDK1.3, 1.4 whereby writeUTF fails if more than 64K bytes are written * we need to work with all size of strings - * + * * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4806007 * http://jira.jboss.com/jira/browse/JBAS-2641 - * + * * @author <a href=&quot;tim.fox(a)jboss.com&quot;&gt;Tim Fox</a> * @version $Revision: 6016 $ * @@ -204,29 +205,11 @@ Configuration config = createBasicConfig(); config.setSecurityEnabled(false); - config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); - server = HornetQServers.newHornetQServer(config, false); + config.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); + server = addServer(HornetQServers.newHornetQServer(config, false)); server.start(); - locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); - sf = locator.createSessionFactory(); + locator = createInVMNonHALocator(); + sf = createSessionFactory(locator); session = sf.createSession(); } - - @Override - protected void tearDown() throws Exception - { - session.close(); - - sf.close(); - - locator.close(); - - server.stop(); - - server = null; - sf = null; - session = null; - - super.tearDown(); - } } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -15,7 +15,12 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; @@ -46,8 +51,6 @@ ClientSessionFactory factory = null; ServerLocator locator = null; - try - { server.getConfiguration().setJournalSyncNonTransactional(false); server.getConfiguration().setJournalBufferTimeout_AIO(15000); @@ -78,38 +81,5 @@ Assert.assertNotNull(msg); msg.acknowledge(); - - } - finally - { - if (locator != null) - { - locator.close(); - } - if (factory != null) - { - factory.close(); - } - - if (session != null) - { - session.close(); - } - - if (server != null) - { - server.stop(); - } - } - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -26,7 +26,6 @@ import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.Configuration; -import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; @@ -49,14 +48,12 @@ public void testCoreClientNetty() throws Exception { - testCoreClient("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory", - "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"); + testCoreClient(NETTY_ACCEPTOR_FACTORY, NETTY_CONNECTOR_FACTORY); } public void testCoreClientInVM() throws Exception { - testCoreClient("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory", - "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"); + testCoreClient(INVM_ACCEPTOR_FACTORY, INVM_CONNECTOR_FACTORY); } private void testCoreClient(final String acceptorFactoryClassName, final String connectorFactoryClassName) throws Exception @@ -69,12 +66,14 @@ conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName)); - HornetQServer server = HornetQServers.newHornetQServer(conf, false); + HornetQServer server = addServer(HornetQServers.newHornetQServer(conf, false)); server.start(); - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(connectorFactoryClassName)); + ServerLocator locator = + addServerLocator(HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration( + connectorFactoryClassName))); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -121,19 +120,5 @@ message2.acknowledge(); } - - session.close(); - - locator.close(); - - server.stop(); } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -13,100 +13,70 @@ package org.hornetq.tests.integration.client; +import java.util.concurrent.atomic.AtomicInteger; + import junit.framework.Assert; + import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.Configuration; -import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.ServiceTestBase; -import java.util.concurrent.atomic.AtomicInteger; - public class CreateQueueIdempotentTest extends ServiceTestBase { - private static final Logger log = Logger.getLogger(CreateQueueIdempotentTest.class); - // Constants ----------------------------------------------------- + private HornetQServer server; - // Attributes ---------------------------------------------------- + @Override + public void setUp() throws Exception + { + super.setUp(); - // Static -------------------------------------------------------- + Configuration conf = createDefaultConfig(); + conf.setSecurityEnabled(false); + conf.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); - // Constructors -------------------------------------------------- + server = addServer(HornetQServers.newHornetQServer(conf, true)); + server.start(); + } - // Public -------------------------------------------------------- + public void testSequentialCreateQueueIdempotency() throws Exception + { + final SimpleString QUEUE = new SimpleString("SequentialCreateQueueIdempotency"); - public void testSequentialCreateQueueIdempotency() throws Exception - { - boolean success = false; - final SimpleString QUEUE = new SimpleString("SequentialCreateQueueIdempotency"); + ServerLocator locator = createInVMNonHALocator(); - Configuration conf = createDefaultConfig(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); - conf.setSecurityEnabled(false); + ClientSession session = sf.createSession(false, true, true); - conf.getAcceptorConfigurations().add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); + session.createQueue(QUEUE, QUEUE, null, true); - HornetQServer server = HornetQServers.newHornetQServer(conf, true); + try + { + session.createQueue(QUEUE, QUEUE, null, true); + fail("Expected exception, queue already exists"); + } + catch (HornetQException e) + { + assertEquals("Queue should exist!", HornetQException.QUEUE_EXISTS, e.getCode()); + } + } - server.start(); - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - - ClientSessionFactory sf = locator.createSessionFactory(); - - ClientSession session = sf.createSession(false, true, true); - - session.createQueue(QUEUE, QUEUE, null, true); - - try - { - session.createQueue(QUEUE, QUEUE, null, true); - } - catch (Exception e) - { - if (e instanceof HornetQException) - { - if (((HornetQException) e).getCode() == 101) - { - success = true; - } - } - } - - session.close(); - - locator.close(); - - server.stop(); - - Assert.assertTrue(success); - } - public void testConcurrentCreateQueueIdempotency() throws Exception { - boolean success = true; final String QUEUE = "ConcurrentCreateQueueIdempotency"; AtomicInteger queuesCreated = new AtomicInteger(0); AtomicInteger failedAttempts = new AtomicInteger(0); - Configuration conf = createDefaultConfig(); - - conf.setSecurityEnabled(false); - - conf.getAcceptorConfigurations().add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - - HornetQServer server = HornetQServers.newHornetQServer(conf, true); - - server.start(); final int NUM_THREADS = 5; - + QueueCreator[] queueCreators = new QueueCreator[NUM_THREADS]; @@ -129,20 +99,9 @@ server.stop(); // re-starting the server appears to be an unreliable guide - try - { - server.start(); - } catch (Exception e) - { - System.out.println("THIS BLEW UP!!"); - e.printStackTrace(); - success = false; - } - - server.stop(); + server.start(); - Assert.assertTrue(success); - Assert.assertEquals(1, queuesCreated.intValue()); + Assert.assertEquals(1, queuesCreated.intValue()); Assert.assertEquals(NUM_THREADS - 1, failedAttempts.intValue()); } @@ -175,8 +134,8 @@ try { - locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - ClientSessionFactory sf = locator.createSessionFactory(); + locator = createInVMNonHALocator(); + ClientSessionFactory sf = locator.createSessionFactory(); session = sf.createSession(false, true, true); final SimpleString QUEUE = new SimpleString(queueName); session.createQueue(QUEUE, QUEUE, null, true); Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -86,9 +86,6 @@ server.start(); - try - { - server.createQueue(EXPIRY, EXPIRY, null, true, false); server.createQueue(DLQ, DLQ, null, true, false); @@ -97,7 +94,7 @@ ServerLocator locator = createInVMNonHALocator(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(true, true, 0); @@ -133,17 +130,17 @@ producer.send(message); } - + session.close(); server.stop(); server.start(); - + Queue queueExpiry = server.locateQueue(EXPIRY); Queue myQueue = server.locateQueue(MY_QUEUE); sf = locator.createSessionFactory(); - + Thread.sleep(1500); long timeout = System.currentTimeMillis() + 5000; @@ -153,7 +150,7 @@ myQueue.expireReferences(); Thread.sleep(50); } - + assertEquals(50, queueExpiry.getMessageCount()); session = sf.createSession(false, false); @@ -191,7 +188,7 @@ for (int location = 0; location < messageSize; location++) { - assertEquals(getSamplebyte((long)location), message.getBodyBuffer().readByte()); + assertEquals(getSamplebyte(location), message.getBodyBuffer().readByte()); } message.acknowledge(); } @@ -246,7 +243,7 @@ for (int location = 0; location < messageSize; location++) { - assertEquals(getSamplebyte((long)location), message.getBodyBuffer().readByte()); + assertEquals(getSamplebyte(location), message.getBodyBuffer().readByte()); } message.acknowledge(); } @@ -269,14 +266,9 @@ locator.close(); validateNoFilesOnLargeDir(); - } - finally - { - server.stop(); - } } - /** + /** * Tests if the system would still couple with old data where the LargeMessage was linked to its previous copy * @throws Exception */ @@ -304,18 +296,15 @@ server.start(); - try - { + server.createQueue(EXPIRY, EXPIRY, null, true, false); - server.createQueue(EXPIRY, EXPIRY, null, true, false); - server.createQueue(DLQ, DLQ, null, true, false); server.createQueue(MY_QUEUE, MY_QUEUE, null, true, false); ServerLocator locator = createInVMNonHALocator(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(true, true, 0); @@ -401,7 +390,7 @@ for (int location = 0; location < messageSize; location++) { - assertEquals(getSamplebyte((long)location), message.getBodyBuffer().readByte()); + assertEquals(getSamplebyte(location), message.getBodyBuffer().readByte()); } message.acknowledge(); } @@ -409,13 +398,6 @@ session.commit(); session.close(); - sf.close(); - locator.close(); - } - finally - { - server.stop(); - } } // Package protected --------------------------------------------- Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -125,7 +125,7 @@ server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(false, false, false); @@ -203,15 +203,13 @@ ClientSession session = null; - try - { HornetQServer server = createServer(true, isNetty()); server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); - session = sf.createSession(false, false, false); + session = addClientSession(sf.createSession(false, false, false)); session.createTemporaryQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS); @@ -245,17 +243,6 @@ session.close(); validateNoFilesOnLargeDir(); - } - finally - { - try - { - session.close(); - } - catch (Throwable ignored) - { - } - } } public void testLargeBufferTransacted() throws Exception @@ -276,8 +263,6 @@ ClientSession session = null; - try - { Configuration config = createDefaultConfig(isNetty()); config.setJournalFileSize(journalsize); @@ -288,9 +273,9 @@ server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); - session = sf.createSession(!transacted, !transacted, 0); + session = addClientSession(sf.createSession(!transacted, !transacted, 0)); session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, true); @@ -336,18 +321,7 @@ session.close(); validateNoFilesOnLargeDir(); - } - finally - { - try - { - session.close(); } - catch (Throwable ignored) - { - } - } - } public void testDLALargeMessage() throws Exception { @@ -355,15 +329,13 @@ ClientSession session = null; - try - { HornetQServer server = createServer(true, isNetty()); server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); - session = sf.createSession(false, false, false); + session = addClientSession(sf.createSession(false, false, false)); session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, true); session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS.concat("-2"), true); @@ -455,18 +427,7 @@ session.close(); validateNoFilesOnLargeDir(); - } - finally - { - try - { - session.close(); } - catch (Throwable ignored) - { - } - } - } public void testDeliveryCount() throws Exception { @@ -474,13 +435,11 @@ ClientSession session = null; - try - { HornetQServer server = createServer(true, isNetty()); server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(false, false, false); @@ -530,17 +489,7 @@ session.commit(); validateNoFilesOnLargeDir(); - } - finally - { - try - { - session.close(); - } - catch (Throwable ignored) - { - } - } + } public void testDLAOnExpiryNonDurableMessage() throws Exception @@ -549,13 +498,11 @@ ClientSession session = null; - try - { HornetQServer server = createServer(true, isNetty()); server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); SimpleString ADDRESS_DLA = LargeMessageTest.ADDRESS.concat("-dla"); SimpleString ADDRESS_EXPIRY = LargeMessageTest.ADDRESS.concat("-expiry"); @@ -658,17 +605,7 @@ server.start(); validateNoFilesOnLargeDir(); - } - finally - { - try - { - session.close(); - } - catch (Throwable ignored) - { - } - } + } public void testDLAOnExpiry() throws Exception @@ -677,13 +614,11 @@ ClientSession session = null; - try - { - HornetQServer server = createServer(true, isNetty()); + HornetQServer server = createServer(true, isNetty()); server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); SimpleString ADDRESS_DLA = LargeMessageTest.ADDRESS.concat("-dla"); SimpleString ADDRESS_EXPIRY = LargeMessageTest.ADDRESS.concat("-expiry"); @@ -786,17 +721,6 @@ validateNoFilesOnLargeDir(); } - finally - { - try - { - session.close(); - } - catch (Throwable ignored) - { - } - } - } public void testExpiryLargeMessage() throws Exception { @@ -818,7 +742,7 @@ server.getAddressSettingsRepository().addMatch("*", addressSettings); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(false, false, false); @@ -919,7 +843,7 @@ server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(true, true, 0); @@ -944,28 +868,28 @@ producer.send(clientFile); } - + ClientConsumer consumer = session.createConsumer(ADDRESS); - + session.start(); - + ClientMessage msg = consumer.receive(10000); - + for (int i = 0 ; i < messageSize; i++) { assertEquals(getSamplebyte(i), msg.getBodyBuffer().readByte()); } - + assertNotNull(msg); - + msg.acknowledge(); - + assertNull(consumer.receiveImmediate()); - + session.commit(); - + validateNoFilesOnLargeDir(); - + } finally { @@ -1000,7 +924,7 @@ server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(false, false, false); @@ -1084,7 +1008,7 @@ locator.setCacheLargeMessagesClient(true); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(false, false, false); @@ -2005,7 +1929,7 @@ SimpleString queue[] = new SimpleString[] { new SimpleString("queue1"), new SimpleString("queue2") }; - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); @@ -2073,7 +1997,7 @@ SimpleString queue[] = new SimpleString[] { new SimpleString("queue1"), new SimpleString("queue2") }; - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); @@ -2141,7 +2065,7 @@ server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(isXA, false, false); @@ -2204,7 +2128,7 @@ server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(isXA, false, false); @@ -2329,7 +2253,7 @@ locator.setMinLargeMessageSize(1024); locator.setConsumerWindowSize(1024 * 1024); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(null, null, false, false, false, false, 0); @@ -2432,7 +2356,7 @@ locator.setMinLargeMessageSize(1024); locator.setConsumerWindowSize(1024 * 1024); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(null, null, false, false, false, false, 0); @@ -2543,7 +2467,7 @@ locator.setBlockOnDurableSend(true); locator.setBlockOnAcknowledge(true); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(null, null, false, true, true, false, 0); @@ -2682,7 +2606,7 @@ locator.setBlockOnAcknowledge(true); locator.setCompressLargeMessage(true); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(false, true, true); @@ -2792,7 +2716,7 @@ locator.setMinLargeMessageSize(100 * 1024); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(null, null, false, true, true, false, 0); @@ -2857,8 +2781,6 @@ final int SIZE = 10 * 1024; final int NUMBER_OF_MESSAGES = 1; - try - { server = createServer(true, isNetty()); @@ -2866,7 +2788,7 @@ locator.setMinLargeMessageSize(1024); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); session = sf.createSession(null, null, false, true, true, false, 0); @@ -2914,25 +2836,6 @@ ((Queue)server.getPostOffice().getBinding(LargeMessageTest.ADDRESS).getBindable()).getMessageCount()); log.debug("Thread done"); - } - finally - { - try - { - session.close(); - } - catch (Throwable ignored) - { - } - - try - { - server.stop(); - } - catch (Throwable ignored) - { - } - } } // The ClientConsumer should be able to also send ServerLargeMessages as that's done by the CoreBridge @@ -2942,13 +2845,12 @@ server.start(); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); ClientSession session = sf.createSession(false, false); - try - { - LargeServerMessageImpl fileMessage = new LargeServerMessageImpl((JournalStorageManager)server.getStorageManager()); + LargeServerMessageImpl fileMessage = + new LargeServerMessageImpl((JournalStorageManager)server.getStorageManager()); fileMessage.setMessageID(1005); @@ -2990,13 +2892,6 @@ msg.acknowledge(); session.commit(); - - } - finally - { - sf.close(); - server.stop(); - } } // Package protected --------------------------------------------- @@ -3011,13 +2906,6 @@ locator = createFactory(isNetty()); } - @Override - protected void tearDown() throws Exception - { - locator.close(); - super.tearDown(); - } - protected void testPageOnLargeMessage(final boolean realFiles, final boolean sendBlocking) throws Exception { Configuration config = createDefaultConfig(isNetty()); @@ -3037,7 +2925,7 @@ final int numberOfBytesBigMessage = 400000; - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory()); if (sendBlocking) { Modified: trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java =================================================================== --- trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2012-02-16 14:06:15 UTC (rev 12127) +++ trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2012-02-16 14:07:03 UTC (rev 12128) @@ -36,14 +36,14 @@ public abstract class JMSTestCase extends TestCase { public static final String PROP_FILE_NAME = "provider.properties"; - + public static boolean startServer = true; protected Admin admin; /** * Fails a test with an exception which will be used for a message. - * + * * If the exception is an instance of <code>javax.jms.JMSException</code>, the * message of the failure will contained both the JMSException and its linked exception * (provided there's one). @@ -73,7 +73,7 @@ } /** - * Should be overriden + * Should be overriden * @return */ protected Properties getProviderProperties() throws IOException @@ -103,13 +103,19 @@ @Override protected void tearDown() throws Exception { - admin.stop(); + try + { + admin.stop(); - if (startServer) + if (startServer) + { + admin.stopServer(); + } + } + finally { - admin.stopServer(); + super.tearDown(); } - super.tearDown(); } }