Author: borges Date: 2012-02-03 08:28:11 -0500 (Fri, 03 Feb 2012) New Revision: 12082 Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/largemessage/LargeMessageTestBase.java Log: improve tearDown Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java 2012-02-03 13:27:53 UTC (rev 12081) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionFactoryOnGCest.java 2012-02-03 13:28:11 UTC (rev 12082) @@ -12,23 +12,14 @@ */ package org.hornetq.tests.integration.jms.connection; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintStream; -import java.io.StringReader; import java.util.concurrent.atomic.AtomicInteger; import javax.jms.Connection; -import javax.jms.ConnectionFactory; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.JMSFactoryType; import org.hornetq.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.tests.util.JMSTestBase; @@ -42,20 +33,7 @@ */ public class CloseConnectionFactoryOnGCest extends JMSTestBase { - private static final Logger log = Logger.getLogger(CloseConnectionFactoryOnGCest.class); - @Override - protected void setUp() throws Exception - { - super.setUp(); - } - - @Override - protected void tearDown() throws Exception - { - super.tearDown(); - } - public void testCloseCFOnGC() throws Exception { Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2012-02-03 13:27:53 UTC (rev 12081) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2012-02-03 13:28:11 UTC (rev 12082) @@ -23,17 +23,16 @@ import junit.framework.Assert; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.JMSFactoryType; -import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.CloseListener; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.spi.core.protocol.RemotingConnection; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.UnitTestCase; /** - * + * * A CloseConnectionOnGCTest * * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> @@ -42,8 +41,6 @@ */ public class CloseConnectionOnGCTest extends JMSTestBase { - private static final Logger log = Logger.getLogger(CloseConnectionOnGCTest.class); - private HornetQConnectionFactory cf; @Override @@ -51,7 +48,7 @@ { super.setUp(); - cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } @@ -59,7 +56,8 @@ @Override protected void tearDown() throws Exception { - cf = null; + if (cf != null) + cf.close(); super.tearDown(); } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/largemessage/LargeMessageTestBase.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/largemessage/LargeMessageTestBase.java 2012-02-03 13:27:53 UTC (rev 12081) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/largemessage/LargeMessageTestBase.java 2012-02-03 13:28:11 UTC (rev 12082) @@ -69,18 +69,7 @@ // Package protected --------------------------------------------- // Protected ----------------------------------------------------- - - public LargeMessageTestBase(String test) - { - super(test); - } - - public LargeMessageTestBase() - { - super(); - } - @Override protected void tearDown() throws Exception {