https://issues.apache.org/jira/browse/AMQ-5621

Convert to JUnit 4 while fixing sporadic failure due to the expiry
setting being left at default of 30 seconds, which on a fast machine
means the expiry tests sometime finish before the task kicks in.

activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java

@@ -16,6 +16,10 @@
  */
 package org.apache.activemq.advisory;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,8 +35,6 @@ import javax.jms.Session;
 import javax.jms.TemporaryQueue;
 import javax.jms.Topic;
 
-import junit.framework.TestCase;
-
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
@@ -41,16 +43,21 @@ import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-public class AdvisoryTempDestinationTests extends TestCase {
+public class AdvisoryTempDestinationTests {
 
     protected static final int MESSAGE_COUNT = 2000;
+    protected static final int EXPIRE_MESSAGE_PERIOD = 10000;
+
     protected BrokerService broker;
     protected Connection connection;
     protected String bindAddress = ActiveMQConnectionFactory.DEFAULT_BROKER_BIND_URL;
     protected int topicCount;
 
-
+    @Test(timeout = 60000)
     public void testNoSlowConsumerAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         TemporaryQueue queue = s.createTemporaryQueue();
@@ -60,8 +67,8 @@ public class AdvisoryTempDestinationTests extends TestCase {
             public void onMessage(Message message) {
             }
         });
-        Topic advisoryTopic = AdvisorySupport
+
-                .getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
+        Topic advisoryTopic = AdvisorySupport.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
         s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         MessageConsumer advisoryConsumer = s.createConsumer(advisoryTopic);
         // start throwing messages at the consumer
@@ -75,14 +82,14 @@ public class AdvisoryTempDestinationTests extends TestCase {
         assertNull(msg);
     }
 
+    @Test(timeout = 60000)
     public void testSlowConsumerAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         TemporaryQueue queue = s.createTemporaryQueue();
         MessageConsumer consumer = s.createConsumer(queue);
         assertNotNull(consumer);
 
-        Topic advisoryTopic = AdvisorySupport
+        Topic advisoryTopic = AdvisorySupport.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
-                .getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
         s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         MessageConsumer advisoryConsumer = s.createConsumer(advisoryTopic);
         // start throwing messages at the consumer
@@ -96,6 +103,7 @@ public class AdvisoryTempDestinationTests extends TestCase {
         assertNotNull(msg);
     }
 
+    @Test(timeout = 60000)
     public void testMessageDeliveryAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         TemporaryQueue queue = s.createTemporaryQueue();
@@ -115,6 +123,7 @@ public class AdvisoryTempDestinationTests extends TestCase {
         assertNotNull(msg);
     }
 
+    @Test(timeout = 60000)
     public void testTempMessageConsumedAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         TemporaryQueue queue = s.createTemporaryQueue();
@@ -141,6 +150,7 @@ public class AdvisoryTempDestinationTests extends TestCase {
         assertEquals(originalId, id);
     }
 
+    @Test(timeout = 60000)
     public void testMessageExpiredAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Queue queue = s.createQueue(getClass().getName());
@@ -158,34 +168,30 @@ public class AdvisoryTempDestinationTests extends TestCase {
             producer.send(m);
         }
 
-        Message msg = advisoryConsumer.receive(5000);
+        Message msg = advisoryConsumer.receive(EXPIRE_MESSAGE_PERIOD);
         assertNotNull(msg);
     }
 
-    @Override
+    @Before
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         if (broker == null) {
             broker = createBroker();
         }
         ConnectionFactory factory = createConnectionFactory();
         connection = factory.createConnection();
         connection.start();
-        super.setUp();
     }
 
-    @Override
+    @After
-    protected void tearDown() throws Exception {
+    public void tearDown() throws Exception {
-        super.tearDown();
         connection.close();
         if (broker != null) {
             broker.stop();
         }
     }
 
-    protected ActiveMQConnectionFactory createConnectionFactory()
+    protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
-            throws Exception {
+        ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(ActiveMQConnection.DEFAULT_BROKER_URL);
-        ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(
-                ActiveMQConnection.DEFAULT_BROKER_URL);
         return cf;
     }
 
@@ -218,6 +224,7 @@ public class AdvisoryTempDestinationTests extends TestCase {
 
     private PolicyEntry createPolicyEntry(ConstantPendingMessageLimitStrategy strategy) {
         PolicyEntry policy = new PolicyEntry();
+        policy.setExpireMessagesPeriod(EXPIRE_MESSAGE_PERIOD);
         policy.setAdvisoryForFastProducers(true);
         policy.setAdvisoryForConsumed(true);
         policy.setAdvisoryForDelivery(true);

activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java

@@ -16,6 +16,10 @@
  */
 package org.apache.activemq.advisory;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -27,29 +31,34 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import junit.framework.TestCase;
-
 import org.apache.activemq.ActiveMQConnection;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQPrefetchPolicy;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.policy.*;
+import org.apache.activemq.broker.region.policy.ConstantPendingMessageLimitStrategy;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
-import org.apache.activemq.command.ActiveMQTopic;
+import org.junit.After;
-import org.apache.activemq.util.Wait;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
 
 /**
- *
+ * Test for advisory messages sent under the right circumstances.
  */
-public class AdvisoryTests extends TestCase {
+public class AdvisoryTests {
+
     protected static final int MESSAGE_COUNT = 2000;
     protected BrokerService broker;
     protected Connection connection;
     protected String bindAddress = ActiveMQConnectionFactory.DEFAULT_BROKER_BIND_URL;
     protected int topicCount;
 
+    protected final int EXPIRE_MESSAGE_PERIOD = 10000;
 
+    @Test(timeout = 60000)
     public void testNoSlowConsumerAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Queue queue = s.createQueue(getClass().getName());
@@ -59,8 +68,8 @@ public class AdvisoryTests extends TestCase {
             public void onMessage(Message message) {
             }
         });
-        Topic advisoryTopic = AdvisorySupport
+
-                .getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
+        Topic advisoryTopic = AdvisorySupport.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
         s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         MessageConsumer advisoryConsumer = s.createConsumer(advisoryTopic);
         // start throwing messages at the consumer
@@ -74,14 +83,14 @@ public class AdvisoryTests extends TestCase {
         assertNull(msg);
     }
 
+    @Test(timeout = 60000)
     public void testSlowConsumerAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Queue queue = s.createQueue(getClass().getName());
         MessageConsumer consumer = s.createConsumer(queue);
         assertNotNull(consumer);
 
-        Topic advisoryTopic = AdvisorySupport
+        Topic advisoryTopic = AdvisorySupport.getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
-                .getSlowConsumerAdvisoryTopic((ActiveMQDestination) queue);
         s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         MessageConsumer advisoryConsumer = s.createConsumer(advisoryTopic);
         // start throwing messages at the consumer
@@ -95,6 +104,7 @@ public class AdvisoryTests extends TestCase {
         assertNotNull(msg);
     }
 
+    @Test(timeout = 60000)
     public void testMessageDeliveryAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Queue queue = s.createQueue(getClass().getName());
@@ -114,6 +124,7 @@ public class AdvisoryTests extends TestCase {
         assertNotNull(msg);
     }
 
+    @Test(timeout = 60000)
     public void testMessageConsumedAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Queue queue = s.createQueue(getClass().getName());
@@ -140,6 +151,7 @@ public class AdvisoryTests extends TestCase {
         assertEquals(originalId, id);
     }
 
+    @Test(timeout = 60000)
     public void testMessageExpiredAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Queue queue = s.createQueue(getClass().getName());
@@ -157,10 +169,11 @@ public class AdvisoryTests extends TestCase {
             producer.send(m);
         }
 
-        Message msg = advisoryConsumer.receive(2000);
+        Message msg = advisoryConsumer.receive(EXPIRE_MESSAGE_PERIOD);
         assertNotNull(msg);
     }
 
+    @Test(timeout = 60000)
     public void testMessageDLQd() throws Exception {
         ActiveMQPrefetchPolicy policy = new ActiveMQPrefetchPolicy();
         policy.setTopicPrefetch(2);
@@ -170,20 +183,22 @@ public class AdvisoryTests extends TestCase {
 
         Topic advisoryTopic = s.createTopic(">");
         for (int i = 0; i < 100; i++) {
-            MessageConsumer advisoryConsumer = s.createConsumer(advisoryTopic);
+            s.createConsumer(advisoryTopic);
         }
 
-
         MessageProducer producer = s.createProducer(topic);
         int count = 10;
         for (int i = 0; i < count; i++) {
             BytesMessage m = s.createBytesMessage();
             producer.send(m);
         }
+
         // we should get here without StackOverflow
     }
 
-    public void xtestMessageDiscardedAdvisory() throws Exception {
+    @Ignore
+    @Test(timeout = 60000)
+    public void testMessageDiscardedAdvisory() throws Exception {
         Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
         Topic topic = s.createTopic(getClass().getName());
         MessageConsumer consumer = s.createConsumer(topic);
@@ -203,30 +218,26 @@ public class AdvisoryTests extends TestCase {
         assertNotNull(msg);
     }
 
-    @Override
+    @Before
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
         if (broker == null) {
             broker = createBroker();
         }
         ConnectionFactory factory = createConnectionFactory();
         connection = factory.createConnection();
         connection.start();
-        super.setUp();
     }
 
-    @Override
+    @After
     protected void tearDown() throws Exception {
-        super.tearDown();
         connection.close();
         if (broker != null) {
             broker.stop();
         }
     }
 
-    protected ActiveMQConnectionFactory createConnectionFactory()
+    protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
-            throws Exception {
+        ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(ActiveMQConnection.DEFAULT_BROKER_URL);
-        ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(
-                ActiveMQConnection.DEFAULT_BROKER_URL);
         return cf;
     }
 
@@ -240,6 +251,7 @@ public class AdvisoryTests extends TestCase {
     protected void configureBroker(BrokerService answer) throws Exception {
         answer.setPersistent(false);
         PolicyEntry policy = new PolicyEntry();
+        policy.setExpireMessagesPeriod(EXPIRE_MESSAGE_PERIOD);
         policy.setAdvisoryForFastProducers(true);
         policy.setAdvisoryForConsumed(true);
         policy.setAdvisoryForDelivery(true);