Author: clebert.suconic(a)jboss.com Date: 2009-08-25 19:35:52 -0400 (Tue, 25 Aug 2009) New Revision: 7915 Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/largemessage/JMSLargeMessageTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java Log: few tweaks on JMSTestBase and modifying some tests to use it Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-08-25 23:30:51 UTC (rev 7914) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2009-08-25 23:35:52 UTC (rev 7915) @@ -24,6 +24,7 @@ import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; +import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.UnitTestCase; /** @@ -34,31 +35,15 @@ * * */ -public class CloseConnectionOnGCTest extends UnitTestCase +public class CloseConnectionOnGCTest extends JMSTestBase { - private HornetQServer server; - - private JMSServerManagerImpl jmsServer; - private HornetQConnectionFactory cf; - private static final String Q_NAME = "ConnectionTestQueue"; - @Override protected void setUp() throws Exception { super.setUp(); - - Configuration conf = new ConfigurationImpl(); - conf.setSecurityEnabled(false); - conf.setJMXManagementEnabled(true); - conf.getAcceptorConfigurations() - .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - server = HornetQ.newHornetQServer(conf, false); - jmsServer = new JMSServerManagerImpl(server); - jmsServer.setContext(new NullInitialContext()); - jmsServer.start(); - jmsServer.createQueue(Q_NAME, Q_NAME, null, true); + cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnPersistentSend(true); cf.setPreAcknowledge(true); @@ -67,26 +52,8 @@ @Override protected void tearDown() throws Exception { - jmsServer.stop(); cf = null; - if (server != null && server.isStarted()) - { - try - { - server.stop(); - } - catch (Exception e) - { - e.printStackTrace(); - } - server = null; - - } - server = null; - jmsServer = null; - cf = null; - super.tearDown(); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-08-25 23:30:51 UTC (rev 7914) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-08-25 23:35:52 UTC (rev 7915) @@ -21,31 +21,19 @@ import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.core.config.Configuration; import org.hornetq.core.config.TransportConfiguration; -import org.hornetq.core.config.impl.ConfigurationImpl; -import org.hornetq.core.server.HornetQ; -import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.jms.HornetQQueue; import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; -import org.hornetq.jms.server.impl.JMSServerManagerImpl; -import org.hornetq.tests.integration.jms.server.management.NullInitialContext; -import org.hornetq.tests.util.UnitTestCase; +import org.hornetq.tests.util.JMSTestBase; import org.hornetq.utils.SimpleString; /** * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> */ -public class ConsumerTest extends UnitTestCase +public class ConsumerTest extends JMSTestBase { - private HornetQServer server; - - private JMSServerManagerImpl jmsServer; - - private HornetQConnectionFactory cf; - private static final String Q_NAME = "ConsumerTestQueue"; private HornetQQueue jBossQueue; @@ -55,45 +43,15 @@ { super.setUp(); - Configuration conf = new ConfigurationImpl(); - conf.setSecurityEnabled(false); - conf.setJMXManagementEnabled(true); - conf.getAcceptorConfigurations() - .add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory")); - server = HornetQ.newHornetQServer(conf, false); - jmsServer = new JMSServerManagerImpl(server); - jmsServer.setContext(new NullInitialContext()); - jmsServer.start(); jmsServer.createQueue(Q_NAME, Q_NAME, null, true); cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - cf.setBlockOnPersistentSend(true); - cf.setPreAcknowledge(true); } @Override protected void tearDown() throws Exception { - jmsServer.stop(); - cf = null; - if (server != null && server.isStarted()) - { - try - { - server.stop(); - } - catch (Exception e) - { - e.printStackTrace(); - } - server = null; - } - server = null; - jmsServer = null; - cf = null; - jBossQueue = null; - super.tearDown(); } @@ -167,7 +125,7 @@ consumer.setMessageListener(null); consumer.receiveNoWait(); } - + public void testCantReceiveWhenListenerIsSet() throws Exception { Connection conn = cf.createConnection(); @@ -188,7 +146,7 @@ } catch (JMSException e) { - //Ok + // Ok } } } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/largemessage/JMSLargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/largemessage/JMSLargeMessageTest.java 2009-08-25 23:30:51 UTC (rev 7914) +++ trunk/tests/src/org/hornetq/tests/integration/jms/largemessage/JMSLargeMessageTest.java 2009-08-25 23:35:52 UTC (rev 7915) @@ -61,7 +61,7 @@ protected void setUp() throws Exception { super.setUp(); - serverManager.createQueue("queue1", "/jms/queue1", null, true); + jmsServer.createQueue("queue1", "/jms/queue1", null, true); queue1 = (Queue)context.lookup("/jms/queue1"); } Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-08-25 23:30:51 UTC (rev 7914) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-08-25 23:35:52 UTC (rev 7915) @@ -60,7 +60,7 @@ protected HornetQServer server; - protected JMSServerManagerImpl serverManager; + protected JMSServerManagerImpl jmsServer; protected ConnectionFactory cf; @@ -108,34 +108,34 @@ server = HornetQ.newHornetQServer(conf, false); - serverManager = new JMSServerManagerImpl(server); + jmsServer = new JMSServerManagerImpl(server); context = new InVMContext(); - serverManager.setContext(context); - serverManager.start(); - serverManager.activated(); + jmsServer.setContext(context); + jmsServer.start(); + jmsServer.activated(); registerConnectionFactory(); } protected void restartServer() throws Exception { - serverManager.start(); - serverManager.activated(); + jmsServer.start(); + jmsServer.activated(); context = new InVMContext(); - serverManager.setContext(context); + jmsServer.setContext(context); registerConnectionFactory(); } protected void killServer() throws Exception { - serverManager.stop(); + jmsServer.stop(); } @Override protected void tearDown() throws Exception { - serverManager.stop(); + jmsServer.stop(); server.stop(); @@ -143,7 +143,7 @@ server = null; - serverManager = null; + jmsServer = null; context = null; @@ -169,7 +169,7 @@ List<String> jndiBindings = new ArrayList<String>(); jndiBindings.add("/cf"); - serverManager.createConnectionFactory("ManualReconnectionToSingleServerTest", + jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,