http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java index cdf6143..8a9871e 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java @@ -95,10 +95,12 @@ public class ConsumerListenerTest extends EmbeddedBrokerTestSupport implements C assertConsumerEvent(0, false); } + @Override public void onConsumerEvent(ConsumerEvent event) { eventQueue.add(event); } + @Override protected void setUp() throws Exception { super.setUp(); @@ -108,6 +110,7 @@ public class ConsumerListenerTest extends EmbeddedBrokerTestSupport implements C consumerEventSource.setConsumerListener(this); } + @Override protected void tearDown() throws Exception { if (consumerEventSource != null) { consumerEventSource.stop(); @@ -137,6 +140,7 @@ public class ConsumerListenerTest extends EmbeddedBrokerTestSupport implements C Session answer = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); MessageConsumer consumer = answer.createConsumer(destination); consumer.setMessageListener(new MessageListener() { + @Override public void onMessage(Message message) { LOG.info("Received message by: " + consumerText + " message: " + message); }
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java index 8a22786..0f0e118 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java @@ -92,6 +92,7 @@ public class DestinationListenerTest extends EmbeddedBrokerTestSupport implement LOG.info("New destinations are: " + newDestinations); } + @Override public void onDestinationEvent(DestinationEvent event) { ActiveMQDestination destination = event.getDestination(); if (event.isAddOperation()) { @@ -104,6 +105,7 @@ public class DestinationListenerTest extends EmbeddedBrokerTestSupport implement } } + @Override protected void setUp() throws Exception { super.setUp(); @@ -119,6 +121,7 @@ public class DestinationListenerTest extends EmbeddedBrokerTestSupport implement return broker; } + @Override protected void tearDown() throws Exception { if (connection != null) { connection.close(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java index 5c8ea89..4d84c02 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java @@ -94,10 +94,12 @@ public class TempDestDeleteTest extends EmbeddedBrokerTestSupport implements Con return rb.getTopicRegion().getDestinationMap().containsKey(dest) || rb.getQueueRegion().getDestinationMap().containsKey(dest) || rb.getTempTopicRegion().getDestinationMap().containsKey(dest) || rb.getTempQueueRegion().getDestinationMap().containsKey(dest); } + @Override public void onConsumerEvent(ConsumerEvent event) { eventQueue.add(event); } + @Override protected void setUp() throws Exception { super.setUp(); connection = createConnection(); @@ -114,6 +116,7 @@ public class TempDestDeleteTest extends EmbeddedBrokerTestSupport implements Con queueConsumerEventSource.setConsumerListener(this); } + @Override protected void tearDown() throws Exception { if (connection != null) { connection.close(); @@ -133,6 +136,7 @@ public class TempDestDeleteTest extends EmbeddedBrokerTestSupport implements Con MessageConsumer consumer = session.createConsumer(dest); consumer.setMessageListener(new MessageListener() { + @Override public void onMessage(Message message) { LOG.info("Received message by: " + consumerText + " message: " + message); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/blob/FTPTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/blob/FTPTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/blob/FTPTestSupport.java index 8d66d46..467f0e0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/blob/FTPTestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/blob/FTPTestSupport.java @@ -47,6 +47,7 @@ public abstract class FTPTestSupport extends EmbeddedBrokerTestSupport { final File ftpHomeDirFile = new File("target/FTPBlobTest/ftptest"); + @Override protected void setUp() throws Exception { if (ftpHomeDirFile.getParentFile().exists()) { @@ -100,6 +101,7 @@ public abstract class FTPTestSupport extends EmbeddedBrokerTestSupport { connection.start(); } + @Override protected void tearDown() throws Exception { if (connection != null) { connection.stop(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java index 4081593..1c6a6c1 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java @@ -52,6 +52,7 @@ public class AMQ4351Test extends BrokerTestSupport { junit.textui.TestRunner.run(suite()); } + @Override protected BrokerService createBroker() throws Exception { BrokerService broker = new BrokerService(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java index cd616c2..b2f3204 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerBenchmark.java @@ -80,6 +80,7 @@ public class BrokerBenchmark extends BrokerTestSupport { final AtomicInteger receiveCounter = new AtomicInteger(0); for (int i = 0; i < consumerCount; i++) { new Thread() { + @Override public void run() { try { @@ -147,6 +148,7 @@ public class BrokerBenchmark extends BrokerTestSupport { // Send the messages in an async thread. for (int i = 0; i < prodcuerCount; i++) { new Thread() { + @Override public void run() { try { StubConnection connection = new StubConnection(broker); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java index 2d0da8b..155dbe8 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java @@ -173,6 +173,7 @@ public class BrokerRedeliveryTest extends org.apache.activemq.TestSupport { broker = null; } + @Override protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { return new ActiveMQConnectionFactory("vm://localhost"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java index 9532a2e..db8db63 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java @@ -53,6 +53,7 @@ public class CreateDestinationsOnStartupViaXBeanTest extends EmbeddedBrokerTestS assertEquals("Could not find destination: " + destination + ". Size of found destinations: " + answer, size, answer.size()); } + @Override protected BrokerService createBroker() throws Exception { XBeanBrokerFactory factory = new XBeanBrokerFactory(); BrokerService answer = factory.createBroker(new URI(getBrokerConfigUri())); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java index e2779b1..5a71517 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java @@ -20,6 +20,7 @@ import junit.framework.Test; public class DedicatedTaskRunnerBrokerTest extends BrokerTest { + @Override protected BrokerService createBroker() throws Exception { BrokerService broker = super.createBroker(); broker.setDedicatedTaskRunner(true); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java index d88afc7..1f8d1ae 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java @@ -112,6 +112,7 @@ public class DoubleSubscriptionTest extends NetworkTestSupport { assertNoMessagesLeft(connection3); } + @Override protected String getRemoteURI() { return remoteURI; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java index 45cf41a..ea37fb3 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java @@ -42,8 +42,10 @@ public class MarshallingBrokerTest extends BrokerTest { addCombinationValues("wireFormat", new Object[]{wf1, wf2,}); } + @Override protected StubConnection createConnection() throws Exception { return new StubConnection(broker) { + @Override public Response request(Command command) throws Exception { Response r = super.request((Command) wireFormat.unmarshal(wireFormat.marshal(command))); if (r != null) { @@ -52,6 +54,7 @@ public class MarshallingBrokerTest extends BrokerTest { return r; } + @Override public void send(Command command) throws Exception { super.send((Command) wireFormat.unmarshal(wireFormat.marshal(command))); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java index b112515..f4f1b0e 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java @@ -62,6 +62,7 @@ public class MessageExpirationTest extends BrokerTestSupport { return broker; } + @Override protected PolicyEntry getDefaultPolicy() { PolicyEntry policy = super.getDefaultPolicy(); // disable spooling @@ -107,6 +108,7 @@ public class MessageExpirationTest extends BrokerTestSupport { // Produce in an async thread since the producer will be getting blocked // by the usage manager.. new Thread() { + @Override public void run() { // m1 and m3 should not expire.. but the others should. try { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java index 8010961..886e38c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java @@ -61,12 +61,14 @@ public class QueueMbeanRestartTest extends TestSupport { this.persistenceAdapterChoice = choice; } + @Override @Before public void setUp() throws Exception { topic = false; super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java index a1555de..bd04635 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java @@ -51,6 +51,7 @@ public class ReconnectWithJMXEnabledTest extends EmbeddedBrokerTestSupport { useConnection(connection); } + @Override protected void setUp() throws Exception { bindAddress = "tcp://localhost:0"; super.setUp(); @@ -61,6 +62,7 @@ public class ReconnectWithJMXEnabledTest extends EmbeddedBrokerTestSupport { return new ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getPublishableConnectString()); } + @Override protected void tearDown() throws Exception { if (connection != null) { connection.close(); @@ -69,6 +71,7 @@ public class ReconnectWithJMXEnabledTest extends EmbeddedBrokerTestSupport { super.tearDown(); } + @Override protected BrokerService createBroker() throws Exception { BrokerService answer = new BrokerService(); answer.setUseJmx(true); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/SpringTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/SpringTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/SpringTest.java index db79ce8..8f37e6b 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/SpringTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/SpringTest.java @@ -82,6 +82,7 @@ public class SpringTest extends TestCase { * * @throws Exception */ + @Override protected void tearDown() throws Exception { if (consumer != null) { consumer.stop(); @@ -95,6 +96,7 @@ public class SpringTest extends TestCase { } } + @Override protected void setUp() throws Exception { if (System.getProperty("basedir") == null) { File file = new File("."); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubBroker.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubBroker.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubBroker.java index 3a8d7ff..fd84bee 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubBroker.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubBroker.java @@ -50,10 +50,12 @@ public class StubBroker extends EmptyBroker { } } + @Override public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception { addConnectionData.add(new AddConnectionData(context, info)); } + @Override public void removeConnection(ConnectionContext context, ConnectionInfo info, Throwable error) throws Exception { removeConnectionData.add(new RemoveConnectionData(context, info, error)); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubConnection.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubConnection.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubConnection.java index 904cf8a..531cc4c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubConnection.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/StubConnection.java @@ -59,6 +59,7 @@ public class StubConnection implements Service { listener = transportListener; this.transport = transport; transport.setTransportListener(new DefaultTransportListener() { + @Override public void onCommand(Object command) { try { if (command.getClass() == ShutdownInfo.class) { @@ -71,6 +72,7 @@ public class StubConnection implements Service { } } + @Override public void onException(IOException e) { if (listener != null) { listener.onException(e); @@ -143,9 +145,11 @@ public class StubConnection implements Service { return transport; } + @Override public void start() throws Exception { } + @Override public void stop() throws Exception { shuttingDown = true; if (transport != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java index 2314b31..b0905dc 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/TopicSubscriptionTest.java @@ -32,6 +32,7 @@ import static org.junit.Assert.*; @RunWith(BlockJUnit4ClassRunner.class) public class TopicSubscriptionTest extends QueueSubscriptionTest { + @Override @Before public void setUp() throws Exception { super.setUp(); @@ -39,12 +40,14 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { topic = true; } + @Override @After public void tearDown() throws Exception { super.tearDown(); ThreadTracker.result(); } + @Override @Test(timeout = 60 * 1000) public void testManyProducersManyConsumers() throws Exception { consumerCount = 40; @@ -59,6 +62,7 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { assertDestinationMemoryUsageGoesToZero(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersLargeMessagesOnePrefetch() throws Exception { consumerCount = 2; @@ -73,6 +77,7 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { assertDestinationMemoryUsageGoesToZero(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersSmallMessagesOnePrefetch() throws Exception { consumerCount = 2; @@ -87,6 +92,7 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { assertDestinationMemoryUsageGoesToZero(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersSmallMessagesLargePrefetch() throws Exception { consumerCount = 2; @@ -100,6 +106,7 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { assertTotalMessagesReceived(messageCount * consumerCount * producerCount); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersLargeMessagesLargePrefetch() throws Exception { consumerCount = 2; @@ -114,6 +121,7 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { assertDestinationMemoryUsageGoesToZero(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerManyConsumersFewMessages() throws Exception { consumerCount = 50; @@ -128,6 +136,7 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { assertDestinationMemoryUsageGoesToZero(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerManyConsumersManyMessages() throws Exception { consumerCount = 50; @@ -142,6 +151,7 @@ public class TopicSubscriptionTest extends QueueSubscriptionTest { assertDestinationMemoryUsageGoesToZero(); } + @Override @Test(timeout = 60 * 1000) public void testManyProducersOneConsumer() throws Exception { consumerCount = 1; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.java index 0c7c2e8..fe214d4 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuplexNetworkBridgeTest.java @@ -41,6 +41,7 @@ public class AdvisoryDuplexNetworkBridgeTest extends AdvisoryNetworkBridgeTest { broker2.waitUntilStarted(); } + @Override public void assertCreatedByDuplex(boolean createdByDuplex) { assertTrue(createdByDuplex); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java index 0e17f70..ae41515 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java @@ -33,6 +33,7 @@ import javax.management.remote.JMXServiceURL; public class AdvisoryJmxTest extends EmbeddedBrokerTestSupport { + @Override protected BrokerService createBroker() throws Exception { BrokerService answer = new BrokerService(); answer.setPersistent(isPersistent()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java index 280705e..f5c42f0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest.java @@ -76,6 +76,7 @@ public class DbRestartJDBCQueueMasterSlaveLeaseQuiesceTest extends DbRestartJDBC } // ignore this test case + @Override public void testAdvisory() throws Exception { } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java index d30ea81..5669ffc 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java @@ -41,6 +41,7 @@ public class DbRestartJDBCQueueMasterSlaveTest extends JDBCQueueMasterSlaveTest private static final transient Logger LOG = LoggerFactory.getLogger(DbRestartJDBCQueueMasterSlaveTest.class); + @Override protected void messageSent() throws Exception { verifyExpectedBroker(inflightMessageCount); if (++inflightMessageCount == failureCount) { @@ -50,6 +51,7 @@ public class DbRestartJDBCQueueMasterSlaveTest extends JDBCQueueMasterSlaveTest LOG.info("DB STOPPED!@!!!!"); Thread dbRestartThread = new Thread("db-re-start-thread") { + @Override public void run() { delayTillRestartRequired(); ds.setShutdownDatabase("false"); @@ -75,6 +77,7 @@ public class DbRestartJDBCQueueMasterSlaveTest extends JDBCQueueMasterSlaveTest master.waitUntilStopped(); } + @Override protected void sendToProducer(MessageProducer producer, Destination producerDestination, Message message) throws JMSException { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java index 923b8ad..f172074 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java @@ -49,6 +49,7 @@ public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnection BrokerService broker; final CountDownLatch restartDBLatch = new CountDownLatch(1); + @Override protected void setUp() throws Exception { setAutoFail(true); topic = false; @@ -76,11 +77,13 @@ public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnection super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); broker.stop(); } + @Override protected Session createSendSession(Connection sendConnection) throws Exception { if (transactedSends) { return sendConnection.createSession(true, Session.SESSION_TRANSACTED); @@ -90,6 +93,7 @@ public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnection } } + @Override protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { ActiveMQConnectionFactory f = new ActiveMQConnectionFactory("failover://" + broker.getTransportConnectors().get(0).getPublishableConnectString()); f.setExceptionListener(this); @@ -110,6 +114,7 @@ public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnection LOG.info("DB STOPPED!@!!!!"); Thread dbRestartThread = new Thread("db-re-start-thread") { + @Override public void run() { LOG.info("Sleeping for 10 seconds before allowing db restart"); try { @@ -126,6 +131,7 @@ public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnection } } + @Override protected void sendToProducer(MessageProducer producer, Destination producerDestination, Message message) throws JMSException { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java index a30ddb7..1d2cd1f 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/JDBCQueueMasterSlaveTest.java @@ -40,12 +40,14 @@ public class JDBCQueueMasterSlaveTest extends QueueMasterSlaveTestSupport { protected String MASTER_URL = "tcp://localhost:62001"; protected String SLAVE_URL = "tcp://localhost:62002"; + @Override protected void setUp() throws Exception { // startup db sharedDs = new SyncCreateDataSource((EmbeddedDataSource) DataSourceServiceSupport.createDataSource(IOHelper.getDefaultDataDirectory())); super.setUp(); } + @Override protected void createMaster() throws Exception { master = new BrokerService(); master.setBrokerName("master"); @@ -68,10 +70,12 @@ public class JDBCQueueMasterSlaveTest extends QueueMasterSlaveTestSupport { brokerService.setIoExceptionHandler(stopBrokerOnStoreException); } + @Override protected void createSlave() throws Exception { // use a separate thread as the slave will block waiting for // the exclusive db lock Thread t = new Thread() { + @Override public void run() { try { BrokerService broker = new BrokerService(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java index cc1a527..93377f0 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTestUsingSharedFileTest.java @@ -18,17 +18,21 @@ package org.apache.activemq.broker.ft; public class QueueMasterSlaveTestUsingSharedFileTest extends QueueMasterSlaveTestSupport { + @Override protected String getSlaveXml() { return "org/apache/activemq/broker/ft/sharedFileSlave.xml"; } + @Override protected String getMasterXml() { return "org/apache/activemq/broker/ft/sharedFileMaster.xml"; } + @Override protected void createSlave() throws Exception { // Start the Brokers async since starting them up could be a blocking operation.. new Thread(new Runnable() { + @Override public void run() { try { QueueMasterSlaveTestUsingSharedFileTest.super.createSlave(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/SyncCreateDataSource.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/SyncCreateDataSource.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/SyncCreateDataSource.java index a86937b..c565b49 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/SyncCreateDataSource.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/SyncCreateDataSource.java @@ -82,6 +82,7 @@ public class SyncCreateDataSource implements DataSource { return delegate; } + @Override public Logger getParentLogger() throws SQLFeatureNotSupportedException { return null; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java index cf97994..65de05e 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/kahaDbJdbcLeaseQueueMasterSlaveTest.java @@ -36,12 +36,14 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup protected String MASTER_URL = "tcp://localhost:62001"; protected String SLAVE_URL = "tcp://localhost:62002"; + @Override protected void setUp() throws Exception { // startup db sharedDs = new SyncCreateDataSource((EmbeddedDataSource) DataSourceServiceSupport.createDataSource(IOHelper.getDefaultDataDirectory())); super.setUp(); } + @Override protected void createMaster() throws Exception { master = new BrokerService(); master.setBrokerName("master"); @@ -67,10 +69,12 @@ public class kahaDbJdbcLeaseQueueMasterSlaveTest extends QueueMasterSlaveTestSup brokerService.setIoExceptionHandler(stopBrokerOnStoreException); } + @Override protected void createSlave() throws Exception { // use a separate thread as the slave will block waiting for // the exclusive db lock Thread t = new Thread() { + @Override public void run() { try { BrokerService broker = new BrokerService(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/mKahaDbQueueMasterSlaveTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/mKahaDbQueueMasterSlaveTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/mKahaDbQueueMasterSlaveTest.java index 5eafadc..e06bb20 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/mKahaDbQueueMasterSlaveTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/ft/mKahaDbQueueMasterSlaveTest.java @@ -31,6 +31,7 @@ public class mKahaDbQueueMasterSlaveTest extends QueueMasterSlaveTestSupport { protected String MASTER_URL = "tcp://localhost:62001"; protected String SLAVE_URL = "tcp://localhost:62002"; + @Override protected void createMaster() throws Exception { master = new BrokerService(); master.setBrokerName("master"); @@ -52,10 +53,12 @@ public class mKahaDbQueueMasterSlaveTest extends QueueMasterSlaveTestSupport { master.start(); } + @Override protected void createSlave() throws Exception { // use a separate thread as the slave will block waiting for // the exclusive db lock Thread t = new Thread() { + @Override public void run() { try { BrokerService broker = new BrokerService(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java index e6057e4..24878a2 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java @@ -211,6 +211,7 @@ public class PurgeTest extends EmbeddedBrokerTestSupport { return objectName; } + @Override protected void setUp() throws Exception { bindAddress = "tcp://localhost:0"; useTopic = false; @@ -218,6 +219,7 @@ public class PurgeTest extends EmbeddedBrokerTestSupport { mbeanServer = broker.getManagementContext().getMBeanServer(); } + @Override protected void tearDown() throws Exception { if (connection != null) { connection.close(); @@ -226,6 +228,7 @@ public class PurgeTest extends EmbeddedBrokerTestSupport { super.tearDown(); } + @Override protected BrokerService createBroker() throws Exception { BrokerService answer = new BrokerService(); answer.setUseJmx(true); @@ -248,6 +251,7 @@ public class PurgeTest extends EmbeddedBrokerTestSupport { /** * Returns the name of the destination used in this test case */ + @Override protected String getDestinationString() { return getClass().getName() + "." + getName(true); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java index c832238..8d6de73 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mKahaDBXARecoveryBrokerTest.java @@ -56,6 +56,7 @@ public class mKahaDBXARecoveryBrokerTest extends XARecoveryBrokerTest { junit.textui.TestRunner.run(suite()); } + @Override protected ActiveMQDestination createDestination() { return new ActiveMQQueue("test,special"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mLevelDBXARecoveryBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mLevelDBXARecoveryBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mLevelDBXARecoveryBrokerTest.java index 0b66883..b766a86 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mLevelDBXARecoveryBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/mLevelDBXARecoveryBrokerTest.java @@ -57,14 +57,17 @@ public class mLevelDBXARecoveryBrokerTest extends XARecoveryBrokerTest { junit.textui.TestRunner.run(suite()); } + @Override protected ActiveMQDestination createDestination() { return new ActiveMQQueue("test,special"); } + @Override public void testQueuePersistentPreparedAcksAvailableAfterRestartAndRollback() throws Exception { // super.testQueuePersistentPreparedAcksAvailableAfterRestartAndRollback(); } + @Override public void testQueuePersistentUncommittedAcksLostOnRestart() throws Exception { // super.testQueuePersistentUncommittedAcksLostOnRestart(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java index 1244581..82ca731 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java @@ -83,6 +83,7 @@ public class MessageAuthenticationTest extends EmbeddedBrokerTestSupport { BrokerService answer = new BrokerService(); answer.setPersistent(false); answer.setMessageAuthorizationPolicy(new MessageAuthorizationPolicy() { + @Override public boolean isAllowedToConsume(ConnectionContext context, Message message) { try { Object value = message.getProperty("myHeader"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java index a22dc25..148a0db 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java @@ -36,6 +36,7 @@ public class DeadLetterTest extends DeadLetterTestSupport { protected int rollbackCount; + @Override protected void doTest() throws Exception { connection.start(); @@ -72,11 +73,13 @@ public class DeadLetterTest extends DeadLetterTestSupport { LOG.info("Rolled back: " + rollbackCount + " times"); } + @Override protected void setUp() throws Exception { transactedMode = true; super.setUp(); } + @Override protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { ActiveMQConnectionFactory answer = super.createConnectionFactory(); RedeliveryPolicy policy = new RedeliveryPolicy(); @@ -88,6 +91,7 @@ public class DeadLetterTest extends DeadLetterTestSupport { return answer; } + @Override protected Destination createDlqDestination() { return new ActiveMQQueue("ActiveMQ.DLQ"); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java index d61baa9..e636d35 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java @@ -62,6 +62,7 @@ public abstract class DeadLetterTestSupport extends TestSupport { protected int acknowledgeMode = Session.CLIENT_ACKNOWLEDGE; private Destination destination; + @Override protected void setUp() throws Exception { super.setUp(); broker = createBroker(); @@ -77,6 +78,7 @@ public abstract class DeadLetterTestSupport extends TestSupport { return toString(); } + @Override protected void tearDown() throws Exception { if (connection != null) { connection.close(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java index 138b91f..eed3e08 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java @@ -33,6 +33,7 @@ public class IndividualDeadLetterViaXmlTest extends DeadLetterTest { private static final Logger LOG = LoggerFactory.getLogger(IndividualDeadLetterViaXmlTest.class); + @Override protected BrokerService createBroker() throws Exception { BrokerFactoryBean factory = new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/broker/policy/individual-dlq.xml")); factory.afterPropertiesSet(); @@ -40,6 +41,7 @@ public class IndividualDeadLetterViaXmlTest extends DeadLetterTest { return answer; } + @Override protected Destination createDlqDestination() { String queueName = "Test.DLQ." + getClass().getName() + "." + getName(); LOG.info("Using queue name: " + queueName); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java index 3ee3702..cdbd6fb 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java @@ -41,6 +41,7 @@ public class MessageListenerDeadLetterTest extends DeadLetterTestSupport { private final Error[] error = new Error[1]; + @Override protected void doTest() throws Exception { messageCount = 200; connection.start(); @@ -72,6 +73,7 @@ public class MessageListenerDeadLetterTest extends DeadLetterTestSupport { } } + @Override protected void makeDlqConsumer() throws JMSException { dlqDestination = createDlqDestination(); @@ -96,6 +98,7 @@ public class MessageListenerDeadLetterTest extends DeadLetterTestSupport { ; + @Override protected ActiveMQConnectionFactory createConnectionFactory() throws Exception { ActiveMQConnectionFactory answer = super.createConnectionFactory(); RedeliveryPolicy policy = new RedeliveryPolicy(); @@ -108,6 +111,7 @@ public class MessageListenerDeadLetterTest extends DeadLetterTestSupport { return answer; } + @Override protected Destination createDlqDestination() { return new ActiveMQQueue("ActiveMQ.DLQ"); } @@ -125,6 +129,7 @@ public class MessageListenerDeadLetterTest extends DeadLetterTestSupport { deliveryCount = delvery; } + @Override public void onMessage(Message message) { try { int expectedMessageId = rollbacks.get() / deliveryCount; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java index 28773f6..7258f42 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java @@ -39,12 +39,15 @@ import org.apache.activemq.command.ActiveMQDestination; public class NoConsumerDeadLetterTest extends DeadLetterTestSupport { // lets disable the inapplicable tests + @Override public void testDurableQueueMessage() throws Exception { } + @Override public void testDurableTopicMessage() throws Exception { } + @Override protected void doTest() throws Exception { makeDlqConsumer(); sendMessages(); @@ -87,6 +90,7 @@ public class NoConsumerDeadLetterTest extends DeadLetterTestSupport { assertNotNull("Message not received", received); } + @Override protected BrokerService createBroker() throws Exception { BrokerService broker = super.createBroker(); @@ -101,6 +105,7 @@ public class NoConsumerDeadLetterTest extends DeadLetterTestSupport { return broker; } + @Override protected Destination createDlqDestination() { if (this.topic) { return AdvisorySupport.getNoTopicConsumersAdvisoryTopic((ActiveMQDestination) getDestination()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java index 1c1fa2c..4d123fe 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java @@ -33,6 +33,7 @@ import javax.jms.Session; @RunWith(BlockJUnit4ClassRunner.class) public class RoundRobinDispatchPolicyTest extends QueueSubscriptionTest { + @Override protected BrokerService createBroker() throws Exception { BrokerService broker = super.createBroker(); @@ -47,6 +48,7 @@ public class RoundRobinDispatchPolicyTest extends QueueSubscriptionTest { return broker; } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersSmallMessagesOnePrefetch() throws Exception { super.testOneProducerTwoConsumersSmallMessagesOnePrefetch(); @@ -57,12 +59,14 @@ public class RoundRobinDispatchPolicyTest extends QueueSubscriptionTest { assertEachConsumerReceivedAtLeastXMessages(1); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersSmallMessagesLargePrefetch() throws Exception { super.testOneProducerTwoConsumersSmallMessagesLargePrefetch(); assertMessagesDividedAmongConsumers(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersLargeMessagesOnePrefetch() throws Exception { super.testOneProducerTwoConsumersLargeMessagesOnePrefetch(); @@ -73,12 +77,14 @@ public class RoundRobinDispatchPolicyTest extends QueueSubscriptionTest { assertEachConsumerReceivedAtLeastXMessages(1); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerTwoConsumersLargeMessagesLargePrefetch() throws Exception { super.testOneProducerTwoConsumersLargeMessagesLargePrefetch(); assertMessagesDividedAmongConsumers(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerManyConsumersFewMessages() throws Exception { super.testOneProducerManyConsumersFewMessages(); @@ -88,12 +94,14 @@ public class RoundRobinDispatchPolicyTest extends QueueSubscriptionTest { assertMessagesDividedAmongConsumers(); } + @Override @Test(timeout = 60 * 1000) public void testOneProducerManyConsumersManyMessages() throws Exception { super.testOneProducerManyConsumersManyMessages(); assertMessagesDividedAmongConsumers(); } + @Override @Test(timeout = 60 * 1000) public void testManyProducersManyConsumers() throws Exception { super.testManyProducersManyConsumers(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java index de51ff9..4e5f2c7 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java @@ -65,9 +65,11 @@ public class SecureDLQTest extends DeadLetterTestSupport { } // lets disable the inapplicable tests + @Override public void testTransientTopicMessage() throws Exception { } + @Override public void testDurableTopicMessage() throws Exception { } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java index 842da31..252b703 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java @@ -338,10 +338,12 @@ public class QueueDuplicatesFromStoreTest extends TestCase { return 0; } + @Override public void incrementConsumedCount() { } + @Override public void resetConsumedCount() { } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java index 2bff33c..3e1abff 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java @@ -59,6 +59,7 @@ public class QueuePurgeTest extends CombinationTestSupport { Queue queue; MessageConsumer consumer; + @Override protected void setUp() throws Exception { setMaxTestTime(10 * 60 * 1000); // 10 mins setAutoFail(true); @@ -80,6 +81,7 @@ public class QueuePurgeTest extends CombinationTestSupport { connection.start(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (consumer != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java index 9445fe5..959c8db 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/QueueResendDuringShutdownTest.java @@ -190,6 +190,7 @@ public class QueueResendDuringShutdownTest { final MessageConsumer fConsumer = consumer; consumer.setMessageListener(new MessageListener() { + @Override public void onMessage(Message msg) { LOG.debug("got a message on consumer {}", fConsumer); messageReceived(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java index a54c840..a2ec1f7 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/SubscriptionAddRemoveQueueTest.java @@ -102,6 +102,7 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { public void testNoDispatchToRemovedConsumers() throws Exception { final AtomicInteger producerId = new AtomicInteger(); Runnable sender = new Runnable() { + @Override public void run() { AtomicInteger id = new AtomicInteger(); int producerIdAndIncrement = producerId.getAndIncrement(); @@ -121,6 +122,7 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { }; Runnable subRemover = new Runnable() { + @Override public void run() { for (Subscription sub : subs) { try { @@ -177,9 +179,11 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { List<MessageReference> dispatched = Collections.synchronizedList(new ArrayList<MessageReference>()); + @Override public void acknowledge(ConnectionContext context, MessageAck ack) throws Exception { } + @Override public void add(MessageReference node) throws Exception { // immediate dispatch QueueMessageReference qmr = (QueueMessageReference) node; @@ -187,6 +191,7 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { dispatched.add(qmr); } + @Override public ConnectionContext getContext() { return null; } @@ -227,75 +232,94 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { public void resetConsumedCount() { } + @Override public void add(ConnectionContext context, Destination destination) throws Exception { } + @Override public void destroy() { } + @Override public void gc() { } + @Override public ConsumerInfo getConsumerInfo() { return info; } + @Override public long getDequeueCounter() { return 0; } + @Override public long getDispatchedCounter() { return 0; } + @Override public int getDispatchedQueueSize() { return 0; } + @Override public long getEnqueueCounter() { return 0; } + @Override public int getInFlightSize() { return 0; } + @Override public int getInFlightUsage() { return 0; } + @Override public ObjectName getObjectName() { return null; } + @Override public int getPendingQueueSize() { return 0; } + @Override public int getPrefetchSize() { return 0; } + @Override public String getSelector() { return null; } + @Override public boolean isBrowser() { return false; } + @Override public boolean isFull() { return false; } + @Override public boolean isHighWaterMark() { return false; } + @Override public boolean isLowWaterMark() { return false; } + @Override public boolean isRecoveryRequired() { return false; } @@ -304,17 +328,21 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { return false; } + @Override public boolean matches(MessageReference node, MessageEvaluationContext context) throws IOException { return true; } + @Override public boolean matches(ActiveMQDestination destination) { return false; } + @Override public void processMessageDispatchNotification(MessageDispatchNotification mdn) throws Exception { } + @Override public Response pullMessage(ConnectionContext context, MessagePull pull) throws Exception { return null; } @@ -324,31 +352,39 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { return false; } + @Override public List<MessageReference> remove(ConnectionContext context, Destination destination) throws Exception { return new ArrayList<MessageReference>(dispatched); } + @Override public void setObjectName(ObjectName objectName) { } + @Override public void setSelector(String selector) throws InvalidSelectorException, UnsupportedOperationException { } + @Override public void updateConsumerPrefetch(int newPrefetch) { } + @Override public boolean addRecoveredMessage(ConnectionContext context, MessageReference message) throws Exception { return false; } + @Override public ActiveMQDestination getActiveMQDestination() { return null; } + @Override public int getLockPriority() { return 0; } + @Override public boolean isLockExclusive() { return false; } @@ -359,6 +395,7 @@ public class SubscriptionAddRemoveQueueTest extends TestCase { public void removeDestination(Destination destination) { } + @Override public int countBeforeFull() { return 10; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java index 460cb06..fc5d5e6 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorDurableTest.java @@ -31,11 +31,13 @@ import org.apache.activemq.broker.BrokerService; */ public class CursorDurableTest extends CursorSupport { + @Override protected Destination getDestination(Session session) throws JMSException { String topicName = getClass().getName(); return session.createTopic(topicName); } + @Override protected Connection getConsumerConnection(ConnectionFactory fac) throws JMSException { Connection connection = fac.createConnection(); connection.setClientID("testConsumer"); @@ -43,6 +45,7 @@ public class CursorDurableTest extends CursorSupport { return connection; } + @Override protected MessageConsumer getConsumer(Connection connection) throws Exception { Session consumerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Topic topic = (Topic) getDestination(consumerSession); @@ -50,6 +53,7 @@ public class CursorDurableTest extends CursorSupport { return consumer; } + @Override protected void configureBroker(BrokerService answer) throws Exception { answer.setDeleteAllMessagesOnStartup(true); answer.addConnector(bindAddress); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java index 6523109..f5f3e4c 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorQueueStoreTest.java @@ -35,11 +35,13 @@ import org.apache.activemq.broker.region.policy.StorePendingQueueMessageStorageP */ public class CursorQueueStoreTest extends CursorSupport { + @Override protected Destination getDestination(Session session) throws JMSException { String queueName = "QUEUE" + getClass().getName(); return session.createQueue(queueName); } + @Override protected Connection getConsumerConnection(ConnectionFactory fac) throws JMSException { Connection connection = fac.createConnection(); connection.setClientID("testConsumer"); @@ -47,6 +49,7 @@ public class CursorQueueStoreTest extends CursorSupport { return connection; } + @Override protected MessageConsumer getConsumer(Connection connection) throws Exception { Session consumerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); Destination dest = getDestination(consumerSession); @@ -54,6 +57,7 @@ public class CursorQueueStoreTest extends CursorSupport { return consumer; } + @Override protected void configureBroker(BrokerService answer) throws Exception { PolicyEntry policy = new PolicyEntry(); policy.setPendingQueuePolicy(new StorePendingQueueMessageStoragePolicy()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java index 4d03fa1..4ffb73d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java @@ -115,6 +115,7 @@ public abstract class CursorSupport extends CombinationTestSupport { final CountDownLatch latch = new CountDownLatch(1); consumer.setMessageListener(new MessageListener() { + @Override public void onMessage(Message msg) { try { // sleep to act as a slow consumer @@ -164,6 +165,7 @@ public abstract class CursorSupport extends CombinationTestSupport { return connection; } + @Override protected void setUp() throws Exception { if (broker == null) { broker = createBroker(); @@ -171,6 +173,7 @@ public abstract class CursorSupport extends CombinationTestSupport { super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (broker != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java index c3a6a2f..55430ae 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreBasedCursorTest.java @@ -52,6 +52,7 @@ public class StoreBasedCursorTest extends TestCase { // gives the usageChange listener in the cursor an opportunity to kick in. int memoryLimit = 12 * messageSize; + @Override protected void setUp() throws Exception { super.setUp(); if (broker == null) { @@ -60,6 +61,7 @@ public class StoreBasedCursorTest extends TestCase { } } + @Override protected void tearDown() throws Exception { super.tearDown(); if (broker != null) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java index 68a2b51..1320432 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorJDBCNoDuplicateTest.java @@ -27,6 +27,7 @@ import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; */ public class StoreQueueCursorJDBCNoDuplicateTest extends StoreQueueCursorNoDuplicateTest { + @Override protected BrokerService createBroker() throws Exception { BrokerService broker = super.createBroker(); PersistenceAdapter persistenceAdapter = new JDBCPersistenceAdapter(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java index 616b374..a22fe62 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/cursors/StoreQueueCursorMemoryNoDuplicateTest.java @@ -25,6 +25,7 @@ import org.apache.activemq.broker.BrokerService; */ public class StoreQueueCursorMemoryNoDuplicateTest extends StoreQueueCursorNoDuplicateTest { + @Override protected BrokerService createBroker() throws Exception { BrokerService broker = super.createBroker(); broker.setPersistent(false); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java index 538593b..f51de26 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupHashBucketTest.java @@ -22,6 +22,7 @@ package org.apache.activemq.broker.region.group; */ public class MessageGroupHashBucketTest extends MessageGroupMapTest { + @Override protected MessageGroupMap createMessageGroupMap() { return new MessageGroupHashBucket(1024, 64); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java index 9c80487..a890ea3 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/region/group/MessageGroupMapTest.java @@ -75,6 +75,7 @@ public class MessageGroupMapTest extends TestCase { assertContains(set, "2"); } + @Override protected void setUp() throws Exception { super.setUp(); map = createMessageGroupMap(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java index 8d030e0..49d5bd5 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreBrokerTest.java @@ -29,6 +29,7 @@ import org.apache.activemq.broker.BrokerTest; */ public class DefaultStoreBrokerTest extends BrokerTest { + @Override protected BrokerService createBroker() throws Exception { return BrokerFactory.createBroker(new URI("broker://()/localhost?deleteAllMessagesOnStartup=true")); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java index f75373d..7aa2d13 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/store/DefaultStoreRecoveryBrokerTest.java @@ -29,10 +29,12 @@ import org.apache.activemq.broker.RecoveryBrokerTest; */ public class DefaultStoreRecoveryBrokerTest extends RecoveryBrokerTest { + @Override protected BrokerService createBroker() throws Exception { return BrokerFactory.createBroker(new URI("broker://()/localhost?deleteAllMessagesOnStartup=true")); } + @Override protected BrokerService createRestartedBroker() throws Exception { return BrokerFactory.createBroker(new URI("broker://()/localhost")); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java index a0e5abd..cc4b36a 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java @@ -37,11 +37,13 @@ public class PluginBrokerTest extends JmsTopicSendReceiveTest { private static final Logger LOG = LoggerFactory.getLogger(PluginBrokerTest.class); private BrokerService broker; + @Override protected void setUp() throws Exception { broker = createBroker(); super.setUp(); } + @Override protected void tearDown() throws Exception { super.tearDown(); if (broker != null) { @@ -58,6 +60,7 @@ public class PluginBrokerTest extends JmsTopicSendReceiveTest { return BrokerFactory.createBroker(new URI("xbean:" + uri)); } + @Override protected void assertMessageValid(int index, Message message) throws JMSException { // check if broker path has been set assertEquals("localhost", message.getStringProperty("BrokerPath")); @@ -77,6 +80,7 @@ public class PluginBrokerTest extends JmsTopicSendReceiveTest { super.assertMessageValid(index, message); } + @Override protected void sendMessage(int index, Message message) throws Exception { if (index == 7) { producer.send(producerDestination, message, Message.DEFAULT_DELIVERY_MODE, Message.DEFAULT_PRIORITY, 2000); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TimeStampingBrokerPluginTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TimeStampingBrokerPluginTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TimeStampingBrokerPluginTest.java index 0d1cbbc..d14caaa 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TimeStampingBrokerPluginTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TimeStampingBrokerPluginTest.java @@ -50,6 +50,7 @@ public class TimeStampingBrokerPluginTest extends TestCase { String queue = "TEST.FOO"; long expiry = 500; + @Override @Before public void setUp() throws Exception { TimeStampingBrokerPlugin tsbp = new TimeStampingBrokerPlugin(); @@ -95,6 +96,7 @@ public class TimeStampingBrokerPluginTest extends TestCase { producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT); } + @Override @After public void tearDown() throws Exception { // Clean up http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TraceBrokerPathPluginTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TraceBrokerPathPluginTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TraceBrokerPathPluginTest.java index b385c5a..cd55d4d 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TraceBrokerPathPluginTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/util/TraceBrokerPathPluginTest.java @@ -54,6 +54,7 @@ public class TraceBrokerPathPluginTest extends TestCase { String queue = "TEST.FOO"; String traceProperty = "BROKER_PATH"; + @Override @Before public void setUp() throws Exception { TraceBrokerPathPlugin tbppA = new TraceBrokerPathPlugin(); @@ -98,6 +99,7 @@ public class TraceBrokerPathPluginTest extends TestCase { } + @Override @After public void tearDown() throws Exception { // Clean up http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java index 4a0f7cc..2d8adb5 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java @@ -113,6 +113,7 @@ public class CompositeQueueTest extends EmbeddedBrokerTestSupport { return new ActiveMQQueue("MY.QUEUE"); } + @Override protected void tearDown() throws Exception { if (connection != null) { connection.close(); @@ -120,6 +121,7 @@ public class CompositeQueueTest extends EmbeddedBrokerTestSupport { super.tearDown(); } + @Override protected BrokerService createBroker() throws Exception { XBeanBrokerFactory factory = new XBeanBrokerFactory(); BrokerService answer = factory.createBroker(new URI(getBrokerConfigUri())); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java ---------------------------------------------------------------------- diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java index 0035fe3..9ada103 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/broker/virtual/CompositeTopicTest.java @@ -27,18 +27,22 @@ import org.apache.activemq.command.ActiveMQTopic; */ public class CompositeTopicTest extends CompositeQueueTest { + @Override protected Destination getConsumer1Dsetination() { return new ActiveMQQueue("FOO"); } + @Override protected Destination getConsumer2Dsetination() { return new ActiveMQTopic("BAR"); } + @Override protected Destination getProducerDestination() { return new ActiveMQTopic("MY.TOPIC"); } + @Override protected String getBrokerConfigUri() { return "org/apache/activemq/broker/virtual/composite-topic.xml"; }
