Add parallel test annotations to multiple test classes

activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java

@@ -38,14 +38,17 @@
 import org.apache.activemq.transport.TransportFilter;
 import org.apache.activemq.transport.tcp.SslTransport;
 import org.apache.activemq.transport.tcp.TcpTransport;
+import org.apache.activemq.test.annotations.ParallelTest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import java.util.Arrays;
 import java.util.List;
 
 import static org.junit.Assert.assertArrayEquals;
+import org.junit.experimental.categories.Category;
 
+@Category(ParallelTest.class)
 public class ActiveMQSslConnectionFactoryTest extends CombinationTestSupport {
     private static final Log LOG = LogFactory.getLog(ActiveMQSslConnectionFactoryTest.class);
 

activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSendReceiveTest.java

@@ -28,10 +28,13 @@
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * 
  */
+@Category(ParallelTest.class)
 public class JmsDurableTopicSendReceiveTest extends JmsTopicSendReceiveTest {
     private static final Logger LOG = LoggerFactory.getLogger(JmsDurableTopicSendReceiveTest.class);
 

activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTest.java

@@ -17,10 +17,13 @@
 package org.apache.activemq;
 
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * 
  */
+@Category(ParallelTest.class)
 public class JmsQueueSendReceiveTest extends JmsTopicSendReceiveTest {
 
     /**

activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendReceiveWithMessageExpirationTest.java

@@ -42,10 +42,13 @@
 import org.apache.activemq.util.Wait;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  *
  */
+@Category(ParallelTest.class)
 public class JmsSendReceiveWithMessageExpirationTest extends TestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(JmsSendReceiveWithMessageExpirationTest.class);

activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java

@@ -32,6 +32,7 @@
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.transport.vm.VMTransport;
 import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -44,10 +45,12 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.experimental.categories.Category;
 
 /**
  * @version
  */
+@Category(ParallelTest.class)
 public class JmsTempDestinationTest extends TestCase {
 
     private static final Logger LOG = LoggerFactory.getLogger(JmsTempDestinationTest.class);

activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRedeliverTest.java

@@ -28,10 +28,13 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * 
  */
+@Category(ParallelTest.class)
 public class JmsTopicRedeliverTest extends TestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRedeliverTest.class);

activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicRequestReplyTest.java

@@ -34,10 +34,13 @@
 import org.apache.activemq.test.TestSupport;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * 
  */
+@Category(ParallelTest.class)
 public class JmsTopicRequestReplyTest extends TestSupport implements MessageListener {
     private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRequestReplyTest.class);
 

activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSelectorTest.java

@@ -30,10 +30,13 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  *
  */
+@Category(ParallelTest.class)
 public class JmsTopicSelectorTest extends TestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSelectorTest.class);
 

activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveTest.java

@@ -25,10 +25,13 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * 
  */
+@Category(ParallelTest.class)
 public class JmsTopicSendReceiveTest extends JmsSendReceiveTestSupport {
     private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveTest.class);
 

activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsTest.java

@@ -22,10 +22,13 @@
 import jakarta.jms.JMSException;
 import jakarta.jms.MessageConsumer;
 import jakarta.jms.Session;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * @version
  */
+@Category(ParallelTest.class)
 public class JmsTopicSendReceiveWithTwoConnectionsTest extends JmsSendReceiveTestSupport {
 
     private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory

activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicTransactionTest.java

@@ -17,11 +17,14 @@
 package org.apache.activemq;
 
 import org.apache.activemq.test.JmsResourceProvider;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 
 /**
  * 
  */
+@Category(ParallelTest.class)
 public class JmsTopicTransactionTest extends JmsTransactionTestSupport {
 
     /**

activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java

@@ -29,10 +29,13 @@
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
 import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.experimental.categories.Category;
 
+@Category(ParallelTest.class)
 public class ProducerFlowControlSendFailTest extends ProducerFlowControlTest {
 
     protected BrokerService createBroker() throws Exception {

activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java

@@ -35,6 +35,7 @@
 import org.apache.activemq.transport.tcp.TcpTransport;
 import org.apache.activemq.util.DefaultTestAppender;
 import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.Appender;
@@ -47,7 +48,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.junit.experimental.categories.Category;
 
+@Category(ParallelTest.class)
 public class ProducerFlowControlTest extends JmsTestSupport {
     static final Logger LOG = LoggerFactory.getLogger(ProducerFlowControlTest.class);
     ActiveMQQueue queueA = new ActiveMQQueue("QUEUE.A");

activemq-unit-tests/src/test/java/org/apache/activemq/broker/AMQ4351Test.java

@@ -34,13 +34,16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * Implements the test case attached to:
  * https://issues.apache.org/jira/browse/AMQ-4351
  *
  * This version avoids the spring deps.
  */
+@Category(ParallelTest.class)
 public class AMQ4351Test extends BrokerTestSupport {
 
     private static final Logger LOG = LoggerFactory.getLogger(AMQ4351Test.class);

activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java

@@ -35,9 +35,12 @@
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.RemoveInfo;
 import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
 
 
 
+@Category(ParallelTest.class)
 public class BrokerTest extends BrokerTestSupport {
 
     public ActiveMQDestination destination;

activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java

@@ -23,9 +23,12 @@
 import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.command.SessionId;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
 
 
 
+@Category(ParallelTest.class)
 public class ConcurrentConnectSimulationTest extends BrokerTestSupport {
 
     /*

activemq-unit-tests/src/test/java/org/apache/activemq/broker/DedicatedTaskRunnerBrokerTest.java

@@ -17,7 +17,10 @@
 package org.apache.activemq.broker;
 
 import junit.framework.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
+@Category(ParallelTest.class)
 public class DedicatedTaskRunnerBrokerTest extends BrokerTest {
 
     protected BrokerService createBroker() throws Exception {

activemq-unit-tests/src/test/java/org/apache/activemq/broker/DoubleSubscriptionTest.java

@@ -29,12 +29,15 @@
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.SessionInfo;
 import org.apache.activemq.network.NetworkTestSupport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * Pretend to be an abusive client that sends multiple identical ConsumerInfo
  * commands and make sure the broker doesn't stall because of it.
  */
 
+@Category(ParallelTest.class)
 public class DoubleSubscriptionTest extends NetworkTestSupport {
 
     public ActiveMQDestination destination;

activemq-unit-tests/src/test/java/org/apache/activemq/broker/DurablePersistentFalseRestartTest.java

@@ -29,7 +29,10 @@
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.apache.activemq.transport.failover.FailoverTransport;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
+@Category(ParallelTest.class)
 public class DurablePersistentFalseRestartTest extends BrokerRestartTestSupport {
 
     @Override

activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerNoCacheTest.java

@@ -20,7 +20,10 @@
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
+@Category(ParallelTest.class)
 public class JdbcXARecoveryBrokerNoCacheTest extends JdbcXARecoveryBrokerTest {
 
     @Override

activemq-unit-tests/src/test/java/org/apache/activemq/broker/JdbcXARecoveryBrokerTest.java

@@ -25,7 +25,10 @@
 import org.apache.activemq.util.IOHelper;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 import org.apache.derby.jdbc.EmbeddedXADataSource;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
+@Category(ParallelTest.class)
 public class JdbcXARecoveryBrokerTest extends XARecoveryBrokerTest {
 
     EmbeddedXADataSource dataSource;

activemq-unit-tests/src/test/java/org/apache/activemq/broker/KahaDBXARecoveryBrokerTest.java

@@ -29,7 +29,10 @@
 import org.apache.activemq.command.TransactionInfo;
 import org.apache.activemq.command.XATransactionId;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
+@Category(ParallelTest.class)
 public class KahaDBXARecoveryBrokerTest  extends XARecoveryBrokerTest {
 
     @Override

activemq-unit-tests/src/test/java/org/apache/activemq/broker/MarshallingBrokerTest.java

@@ -24,12 +24,15 @@
 import org.apache.activemq.command.Response;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.activemq.wireformat.WireFormat;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 /**
  * Runs against the broker but marshals all request and response commands.
  * 
  * 
  */
+@Category(ParallelTest.class)
 public class MarshallingBrokerTest extends BrokerTest {
 
     public WireFormat wireFormat = new OpenWireFormat();

activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java

@@ -33,9 +33,12 @@
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.SessionInfo;
 import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
 
 
 
+@Category(ParallelTest.class)
 public class MessageExpirationTest extends BrokerTestSupport {
 
     public ActiveMQDestination destination;

activemq-unit-tests/src/test/java/org/apache/activemq/broker/NioQueueSubscriptionTest.java

@@ -43,8 +43,11 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 @RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
 public class NioQueueSubscriptionTest extends QueueSubscriptionTest {
 
     protected static final Logger LOG = LoggerFactory.getLogger(NioQueueSubscriptionTest.class);

activemq-unit-tests/src/test/java/org/apache/activemq/broker/OutOfOrderXMLTest.java

@@ -19,8 +19,11 @@
 import java.net.URI;
 import org.apache.activemq.xbean.XBeanBrokerFactory;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 // https://issues.apache.org/activemq/browse/AMQ-2939
+@Category(ParallelTest.class)
 public class OutOfOrderXMLTest {
 
     @Test

activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueMbeanRestartTest.java

@@ -34,8 +34,11 @@
 import org.junit.runners.Parameterized;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 @RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
 public class QueueMbeanRestartTest extends TestSupport {
     private static final transient Logger LOG = LoggerFactory.getLogger(QueueMbeanRestartTest.class);
 

activemq-unit-tests/src/test/java/org/apache/activemq/broker/QueueSubscriptionTest.java

@@ -24,8 +24,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.experimental.categories.Category;
+import org.apache.activemq.test.annotations.ParallelTest;
 
 @RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
 public class QueueSubscriptionTest extends JmsMultipleClientsTestSupport {
     protected int messageCount = 1000; // 1000 Messages per producer
     protected int prefetchCount = 10;