Author: borges Date: 2012-03-19 07:45:00 -0400 (Mon, 19 Mar 2012) New Revision: 12313 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingOrderTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOBufferedJournalCompactTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java Log: Improve tearDown of tests leaving locators/server running, add messages to assertions to make failure reason clearer. Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -279,17 +279,13 @@ } } - /* (non-Javadoc) - * @see org.hornetq.core.server.HornetQComponent#isStarted() - */ + @Override public synchronized boolean isStarted() { return started; } - /* (non-Javadoc) - * @see org.hornetq.core.server.HornetQComponent#start() - */ + @Override public synchronized void start() throws Exception { if (started) Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingOrderTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingOrderTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingOrderTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -63,26 +63,6 @@ public class PagingOrderTest extends ServiceTestBase { - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - public PagingOrderTest(final String name) - { - super(name); - } - - public PagingOrderTest() - { - super(); - } - private static final int PAGE_MAX = 100 * 1024; private static final int PAGE_SIZE = 10 * 1024; @@ -218,8 +198,6 @@ final int numberOfMessages = 500; - try - { ServerLocator locator = createInVMNonHALocator(); locator.setClientFailureCheckPeriod(1000); @@ -349,31 +327,14 @@ assertNotNull(q2); - assertEquals(numberOfMessages, q2.getMessageCount()); - assertEquals(numberOfMessages, q2.getMessagesAdded()); - assertEquals(0, q1.getMessageCount()); + assertEquals("q2 msg count", numberOfMessages, q2.getMessageCount()); + assertEquals("q2 msgs added", numberOfMessages, q2.getMessagesAdded()); + assertEquals("q1 msg count", 0, q1.getMessageCount()); // 0, since nothing was sent to the queue after the server was restarted - assertEquals(0, q1.getMessagesAdded()); + assertEquals("q1 msgs added", 0, q1.getMessagesAdded()); } - catch (Throwable e) - { - e.printStackTrace(); - throw e; - } - finally - { - try - { - server.stop(); - } - catch (Throwable ignored) - { - } - } - } - public void testPageCounter2() throws Throwable { boolean persistentMessages = true; @@ -390,8 +351,6 @@ final int numberOfMessages = 500; - try - { ServerLocator locator = createInVMNonHALocator(); locator.setClientFailureCheckPeriod(1000); @@ -489,24 +448,6 @@ assertEquals(numberOfMessages, q2.getMessagesAdded()); assertEquals(numberOfMessages - 100, q1.getMessageCount()); assertEquals(numberOfMessages, q2.getMessagesAdded()); - - } - catch (Throwable e) - { - e.printStackTrace(); - throw e; - } - finally - { - try - { - server.stop(); - } - catch (Throwable ignored) - { - } - } - } public void testOrderOverRollback() throws Throwable @@ -525,8 +466,6 @@ final int numberOfMessages = 3000; - try - { ServerLocator locator = createInVMNonHALocator(); locator.setClientFailureCheckPeriod(1000); @@ -609,24 +548,6 @@ } session.commit(); - - } - catch (Throwable e) - { - e.printStackTrace(); - throw e; - } - finally - { - try - { - server.stop(); - } - catch (Throwable ignored) - { - } - } - } public void testOrderOverRollback2() throws Throwable Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/SessionTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -116,7 +116,7 @@ } } - // Closing a session if the underlying remoting connection is deaad should cleanly + // Closing a session if the underlying remoting connection is dead should cleanly // release all resources public void testCloseSessionOnDestroyedConnection() throws Exception { Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -111,12 +111,8 @@ clearData(); createConfigs(); - - liveServer.setIdentity(this.getClass().getSimpleName() + "/liveServer"); - liveServer.start(); - waitForServer(liveServer.getServer()); if (backupServer != null) @@ -298,12 +294,12 @@ } } - /** - * @param sessionFactory - * @param seconds - * @param waitForSync - * @param actualServer - */ + /** + * @param sessionFactory + * @param seconds + * @param waitForSync + * @param backup + */ public static void waitForRemoteBackup(ClientSessionFactoryInternal sessionFactory, int seconds, boolean waitForSync, @@ -321,8 +317,10 @@ } if (System.currentTimeMillis() > (time + toWait)) { - fail("backup server never started (" + actualServer.isStarted() + "), or never finished synchronizing (" + - actualServer.isRemoteBackupUpToDate() + ")"); + fail("backup never started (" + actualServer.isStarted() + "), or never finished synchronizing (" + + actualServer.isRemoteBackupUpToDate() + "), or sessionFactory!=null ? " + + (sessionFactory != null) + " || sessionFactory.getBackupConnector()==" + + (sessionFactory != null ? sessionFactory.getBackupConnector() : "not-applicable")); } try { Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/MultipleBackupsFailoverTestBase.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -186,6 +186,7 @@ locator.addClusterTopologyListener(topListener); sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); + addSessionFactory(sf); boolean ok = countDownLatch.await(5, TimeUnit.SECONDS); locator.removeClusterTopologyListener(topListener); @@ -207,7 +208,7 @@ { configs[i] = createTransportConfiguration(isNetty(), false, generateParams(nodes[i], isNetty())); } - return new ServerLocatorImpl(true, configs); + return addServerLocator(new ServerLocatorImpl(true, configs)); } // Private ------------------------------------------------------- Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -44,7 +44,6 @@ */ public class PagingFailoverTest extends FailoverTestBase { - // Constants ----------------------------------------------------- private static final SimpleString ADDRESS = new SimpleString("SimpleAddress"); @@ -71,15 +70,8 @@ @Override protected void tearDown() throws Exception { - try - { - if (session != null) - session.close(); - } - finally - { - super.tearDown(); - } + addClientSession(session); + super.tearDown(); } public void testPageFailBeforeConsume() throws Exception @@ -134,12 +126,9 @@ if (failBeforeConsume) { crash(session); - waitForBackup(sf, 60); + waitForBackup(null, 30); } - - - session.close(); session = sf.createSession(!transacted, !transacted, 0); @@ -192,7 +181,7 @@ Assert.assertEquals(i, result); } } - + public void testExpireMessage() throws Exception { locator.setBlockOnNonDurableSend(true); @@ -200,13 +189,10 @@ locator.setReconnectAttempts(-1); ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - ClientSession session = sf.createSession(true, true, 0); + session = sf.createSession(true, true, 0); - try - { + session.createQueue(PagingFailoverTest.ADDRESS, PagingFailoverTest.ADDRESS, true); - session.createQueue(PagingFailoverTest.ADDRESS, PagingFailoverTest.ADDRESS, true); - ClientProducer prod = session.createProducer(PagingFailoverTest.ADDRESS); final int TOTAL_MESSAGES = 1000; @@ -222,41 +208,20 @@ crash(session); session.close(); - + Queue queue = backupServer.getServer().locateQueue(ADDRESS); - + long timeout = System.currentTimeMillis() + 60000; - System.out.println("Starting now"); + while (timeout > System.currentTimeMillis() && queue.getPageSubscription().isPaging()) { Thread.sleep(100); // Simulating what would happen on expire queue.expireReferences(); } - - try - { - assertFalse(queue.getPageSubscription().isPaging()); - } - catch (Throwable e) - { - e.printStackTrace(); - System.exit(-1); - } - } - finally - { - try - { - session.close(); - } - catch (Exception ignored) - { - } - - locator.close(); - } + assertFalse(queue.getPageSubscription().isPaging()); + } @@ -288,9 +253,4 @@ { return new SameProcessHornetQServer(createServer(true, config)); } - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/RemoteSingleLiveMultipleBackupsFailoverTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -117,31 +117,21 @@ @Override protected void tearDown() throws Exception { + closeAllSessionFactories(); + closeAllServerLocatorsFactories(); for (TestableServer testableServer : servers.values()) { try { - stopComponent(testableServer); + addServer(testableServer.getServer()); testableServer.destroy(); } catch (Exception e) { - e.printStackTrace(); // To change body of catch statement use File | Settings | File Templates. + e.printStackTrace(); } } servers.clear(); - - try - { - if (sf != null) - { - sf.close(); - } - } - catch (Exception e) - { - e.printStackTrace(); - } super.tearDown(); } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -192,6 +192,7 @@ @Override protected void tearDown() throws Exception { + closeServerLocator(locator); for (TestableServer server : servers.values()) { try @@ -204,7 +205,6 @@ } } servers.clear(); - closeServerLocator(locator); super.tearDown(); } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -153,42 +153,18 @@ } } - - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - public void setStarted(boolean init) { started = true; } - /* (non-Javadoc) - * @see org.hornetq.tests.integration.cluster.util.TestableServer#getServer() - */ + @Override public HornetQServer getServer() { return null; } - /* (non-Javadoc) - * @see org.hornetq.tests.integration.cluster.util.TestableServer#setIdentity(java.lang.String) - */ + @Override public void setIdentity(String identity) { } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -27,8 +27,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.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.remoting.impl.netty.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; @@ -40,26 +38,32 @@ */ public class CoreClientOverHttpTest extends UnitTestCase { - public void testCoreHttpClient() throws Exception + private static final SimpleString QUEUE = new SimpleString("CoreClientOverHttpTestQueue"); + private Configuration conf; + private HornetQServer server; + private ServerLocator locator; + + @Override + public void setUp() throws Exception { - final SimpleString QUEUE = new SimpleString("CoreClientOverHttpTestQueue"); + super.setUp(); + conf = createDefaultConfig(); - Configuration conf = createDefaultConfig(); - conf.setSecurityEnabled(false); - HashMap<String, Object> params = new HashMap<String, Object>(); params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); - conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName(), params)); + conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY, params)); - HornetQServer server = HornetQServers.newHornetQServer(conf, false); + server = addServer(HornetQServers.newHornetQServer(conf, false)); server.start(); + locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY, params)); + addServerLocator(locator); + } - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName(), - params)); + public void testCoreHttpClient() throws Exception + { ClientSessionFactory sf = locator.createSessionFactory(); - ClientSession session = sf.createSession(false, true, true); session.createQueue(QUEUE, QUEUE, null, false); @@ -93,32 +97,12 @@ } session.close(); - - locator.close(); - - server.stop(); } public void testCoreHttpClientIdle() throws Exception { - final SimpleString QUEUE = new SimpleString("CoreClientOverHttpTestQueue"); - - Configuration conf = createDefaultConfig(); - - conf.setSecurityEnabled(false); - - HashMap<String, Object> params = new HashMap<String, Object>(); - params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); - conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName(), params)); - - HornetQServer server = HornetQServers.newHornetQServer(conf, false); - - server.start(); - - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName(), - params)); locator.setConnectionTTL(500); - ClientSessionFactory sf = locator.createSessionFactory(); + ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); @@ -129,33 +113,12 @@ Thread.sleep(500 * 5); session.close(); - - locator.close(); - - server.stop(); } // https://issues.jboss.org/browse/JBPAPP-5542 public void testCoreHttpClient8kPlus() throws Exception { - final SimpleString QUEUE = new SimpleString("CoreClientOverHttpTestQueue"); - - Configuration conf = createDefaultConfig(); - - conf.setSecurityEnabled(false); - - HashMap<String, Object> params = new HashMap<String, Object>(); - params.put(TransportConstants.HTTP_ENABLED_PROP_NAME, true); - conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName(), params)); - - HornetQServer server = HornetQServers.newHornetQServer(conf, false); - - server.start(); - - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName(), - params)); - ClientSessionFactory sf = locator.createSessionFactory(); - + ClientSessionFactory sf = createSessionFactory(locator); ClientSession session = sf.createSession(false, true, true); session.createQueue(QUEUE, QUEUE, null, false); @@ -192,10 +155,6 @@ } session.close(); - - locator.close(); - - server.stop(); } private String getFixedSizeString(int size) Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -46,8 +46,6 @@ import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.postoffice.QueueBinding; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; -import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; -import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory; import org.hornetq.core.replication.ReplicationEndpoint; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; @@ -93,16 +91,16 @@ private static String toCSV(final Object[] objects) { - String str = ""; + StringBuilder str = new StringBuilder(); for (int i = 0; i < objects.length; i++) { if (i > 0) { - str += ", "; + str.append(", "); } - str += objects[i]; + str.append(objects[i]); } - return str; + return str.toString(); } // Constructors -------------------------------------------------- @@ -405,8 +403,8 @@ checkResource(ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(topicName)); Topic topic = (Topic)context.lookup(topicJNDIBinding); assertNotNull(topic); - HornetQConnectionFactory cf = new HornetQConnectionFactory(false, - new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = + new HornetQConnectionFactory(false, new TransportConfiguration(INVM_CONNECTOR_FACTORY)); Connection connection = cf.createConnection(); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); // create a consumer will create a Core queue bound to the topic address @@ -722,12 +720,12 @@ conf.setJMXManagementEnabled(true); conf.setPersistenceEnabled(true); - conf.getAcceptorConfigurations().add(new TransportConfiguration(NettyAcceptorFactory.class.getName())); + conf.getAcceptorConfigurations().add(new TransportConfiguration(NETTY_ACCEPTOR_FACTORY)); conf.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY)); - conf.getConnectorConfigurations().put("netty", new TransportConfiguration(NettyConnectorFactory.class.getName())); + conf.getConnectorConfigurations().put("netty", new TransportConfiguration(NETTY_CONNECTOR_FACTORY)); conf.getConnectorConfigurations().put("invm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); - server = HornetQServers.newHornetQServer(conf, mbeanServer, true); + server = addServer(HornetQServers.newHornetQServer(conf, mbeanServer, true)); serverManager = new JMSServerManagerImpl(server); context = new InVMContext(); @@ -743,9 +741,14 @@ @Override protected void tearDown() throws Exception { - stopServer(); - - super.tearDown(); + try + { + stopServer(); + } + finally + { + super.tearDown(); + } } /** Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOBufferedJournalCompactTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOBufferedJournalCompactTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/journal/NIOBufferedJournalCompactTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -28,19 +28,6 @@ public class NIOBufferedJournalCompactTest extends NIOJournalCompactTest { - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- @Override protected SequentialFileFactory getFileFactory() throws Exception { @@ -53,8 +40,4 @@ return new NIOSequentialFileFactory(getTestDir(), true); } - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - } Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -26,8 +26,6 @@ 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.remoting.impl.invm.InVMAcceptorFactory; -import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.tests.integration.cluster.failover.FailoverTestBase; import org.hornetq.tests.util.RandomUtil; @@ -69,9 +67,10 @@ String address = RandomUtil.randomString(); String queue = RandomUtil.randomString(); ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(getConnectorTransportConfiguration(true)); + addServerLocator(locator); locator.setBlockOnNonDurableSend(false); locator.setBlockOnDurableSend(false); - ClientSessionFactory csf = locator.createSessionFactory(); + ClientSessionFactory csf = createSessionFactory(locator); ClientSession session = null; if (transactional) { @@ -81,6 +80,7 @@ { session = csf.createSession(true, true); } + addClientSession(session); session.createQueue(address, queue, true); ClientProducer producer = session.createProducer(address); boolean durable = false; @@ -108,8 +108,8 @@ } session.close(); - locator = HornetQClient.createServerLocatorWithoutHA(getConnectorTransportConfiguration(true)); - csf = locator.createSessionFactory(); + locator = addServerLocator(HornetQClient.createServerLocatorWithoutHA(getConnectorTransportConfiguration(true))); + csf = createSessionFactory(locator); session = csf.createSession(true, true); session.start(); ClientConsumer consumer = session.createConsumer(queue); @@ -135,13 +135,13 @@ @Override protected TransportConfiguration getConnectorTransportConfiguration(final boolean live) { - return createTransportConfiguration(InVMConnectorFactory.class.getName(), live); + return createTransportConfiguration(INVM_CONNECTOR_FACTORY, live); } @Override protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) { - return createTransportConfiguration(InVMAcceptorFactory.class.getName(), live); + return createTransportConfiguration(INVM_ACCEPTOR_FACTORY, live); } private static TransportConfiguration createTransportConfiguration(String name, final boolean live) Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/replication/ReplicationTest.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -40,7 +40,6 @@ 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.HornetQClient; import org.hornetq.api.core.client.ServerLocator; import org.hornetq.core.config.Configuration; import org.hornetq.core.journal.EncodingSupport; @@ -69,8 +68,8 @@ import org.hornetq.core.replication.impl.ReplicatedJournal; import org.hornetq.core.replication.impl.ReplicationManagerImpl; import org.hornetq.core.server.HornetQComponent; +import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.ServerMessage; -import org.hornetq.core.server.impl.HornetQServerImpl; import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.core.settings.impl.AddressSettings; @@ -95,21 +94,16 @@ private ExecutorFactory factory; private ScheduledExecutorService scheduledExecutor; - private HornetQServerImpl backupServer; + private HornetQServer backupServer; /** This field is not always used. */ - private HornetQServerImpl liveServer; + private HornetQServer liveServer; private ServerLocator locator; private ReplicationManager manager; private static final SimpleString ADDRESS = new SimpleString("foobar123"); - // Static -------------------------------------------------------- - // Constructors -------------------------------------------------- - - // Public -------------------------------------------------------- - private void setupServer(boolean backup, boolean netty, String... interceptors) throws Exception { @@ -131,13 +125,13 @@ liveConnector); if (backup) { - liveServer = new HornetQServerImpl(liveConfig); + liveServer = createServer(liveConfig); liveServer.start(); waitForComponent(liveServer); } - backupServer = new HornetQServerImpl(backupConfig); - locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY)); + backupServer = createServer(backupConfig); + locator = createInVMNonHALocator(); backupServer.start(); if (backup) { @@ -173,16 +167,17 @@ public void testConnectIntoNonBackup() throws Exception { setupServer(false, false); - try { - manager = new ReplicationManagerImpl(locator.createSessionFactory().getConnection(), factory); + ClientSessionFactory sf = createSessionFactory(locator); + manager = new ReplicationManagerImpl(sf.getConnection(), factory); + addHornetQComponent(manager); manager.start(); Assert.fail("Exception was expected"); } catch (HornetQException expected) { - // expected + assertEquals(HornetQException.NOT_CONNECTED, expected.getCode()); } } Modified: trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java =================================================================== --- trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java 2012-03-16 15:24:14 UTC (rev 12312) +++ trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java 2012-03-19 11:45:00 UTC (rev 12313) @@ -33,21 +33,18 @@ import org.hornetq.core.journal.impl.ExportJournal; import org.hornetq.core.journal.impl.ImportJournal; import org.hornetq.core.journal.impl.JournalImpl; -import org.hornetq.core.logging.Logger; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.ReusableLatch; /** - * + * * A JournalImplTestBase - * + * * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> * */ public abstract class JournalImplTestBase extends UnitTestCase { - private static final Logger log = Logger.getLogger(JournalImplTestBase.class); - protected List<RecordInfo> records = new LinkedList<RecordInfo>(); protected TestableJournal journal; @@ -70,9 +67,9 @@ protected SequentialFileFactory fileFactory; - private ReusableLatch latchDone = new ReusableLatch(0); + private final ReusableLatch latchDone = new ReusableLatch(0); - private ReusableLatch latchWait = new ReusableLatch(0); + private final ReusableLatch latchWait = new ReusableLatch(0); private Thread compactThread; @@ -93,16 +90,7 @@ @Override protected void tearDown() throws Exception { - if (journal != null) - { - try - { - journal.stop(); - } - catch (Exception ignore) - { - } - } + stopComponent(journal); if (fileFactory != null) { @@ -181,6 +169,7 @@ latchWait.setCount(1); this.compactThread = new Thread() { + @Override public void run() { try