org.apache.maven.plugins
maven-clean-plugin
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQMessageAuditTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQMessageAuditTest.java
index af18084683a..7527a685652 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQMessageAuditTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQMessageAuditTest.java
@@ -30,12 +30,15 @@
import org.apache.activemq.util.IdGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* ActiveMQMessageAuditTest
*
*
*/
+@Category(ParallelTest.class)
public class ActiveMQMessageAuditTest extends TestCase {
static final Logger LOG = LoggerFactory.getLogger(ActiveMQMessageAuditTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionTxInterruptTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionTxInterruptTest.java
index bc858169080..f06fe1de65f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionTxInterruptTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXAConnectionTxInterruptTest.java
@@ -50,7 +50,10 @@
import static org.junit.Assert.*;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ActiveMQXAConnectionTxInterruptTest {
private static final Logger LOG = LoggerFactory.getLogger(ActiveMQXAConnectionTxInterruptTest.class);
long txGenerator = System.currentTimeMillis();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryTest.java
index 4a7af896d09..06df4b1e287 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.activemq;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class ActiveMQXASslConnectionFactoryTest extends ActiveMQSslConnectionFactoryTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryVmTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryVmTest.java
index b6746bc8f32..bad20c93f97 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryVmTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQXASslConnectionFactoryVmTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq;
import java.net.URI;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test the against the VM transport
*/
+@Category(ParallelTest.class)
public class ActiveMQXASslConnectionFactoryVmTest extends ActiveMQXAConnectionFactoryTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/BrokerDurableRejectedTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/BrokerDurableRejectedTest.java
index 1befc945c4f..6f33f6ee427 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/BrokerDurableRejectedTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/BrokerDurableRejectedTest.java
@@ -24,7 +24,10 @@
import org.apache.activemq.broker.BrokerRegistry;
import org.apache.activemq.transport.stomp.Stomp;
import org.apache.activemq.transport.stomp.StompConnection;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class BrokerDurableRejectedTest extends TestSupport {
protected Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ClientTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ClientTestSupport.java
index b2aab4fa720..3c691c503c6 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ClientTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ClientTestSupport.java
@@ -42,7 +42,10 @@
import org.apache.activemq.command.RemoveInfo;
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ClientTestSupport extends TestCase {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCleanupTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCleanupTest.java
index 94ca659debc..c13f42a0c21 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCleanupTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCleanupTest.java
@@ -20,10 +20,13 @@
import jakarta.jms.Session;
import junit.framework.TestCase;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class ConnectionCleanupTest extends TestCase {
private ActiveMQConnection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java
index 5315ea588e2..5a9e19e06e5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesConcurrentTest.java
@@ -24,10 +24,13 @@
import jakarta.jms.Session;
import junit.framework.TestCase;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class ConnectionCloseMultipleTimesConcurrentTest extends TestCase {
private ActiveMQConnection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesTest.java
index b12c5fa7a22..ff2f1cec84b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ConnectionCloseMultipleTimesTest.java
@@ -20,10 +20,13 @@
import jakarta.jms.Session;
import junit.framework.TestCase;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class ConnectionCloseMultipleTimesTest extends TestCase {
private ActiveMQConnection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java
index c6211007e80..e77167d3e7b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ConsumerReceiveWithTimeoutTest.java
@@ -31,7 +31,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ConsumerReceiveWithTimeoutTest {
private ActiveMQConnection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java
index 0bfa7785a60..593e4fcde13 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/CreateConsumerButDontStartConnectionWarningTest.java
@@ -20,10 +20,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class CreateConsumerButDontStartConnectionWarningTest extends JmsQueueSendReceiveTest {
private static final transient Logger LOG = LoggerFactory.getLogger(CreateConsumerButDontStartConnectionWarningTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerAndConnectionTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerAndConnectionTestSupport.java
index bb4afd65384..12d04877289 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerAndConnectionTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/EmbeddedBrokerAndConnectionTestSupport.java
@@ -17,12 +17,15 @@
package org.apache.activemq;
import jakarta.jms.Connection;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* A base class for a test case which creates an embedded broker and uses a connection and session
*
*
*/
+@Category(ParallelTest.class)
public abstract class EmbeddedBrokerAndConnectionTestSupport extends EmbeddedBrokerTestSupport {
protected Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerStartupDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerStartupDestinationTest.java
index 2652535a1b6..f591e0e5400 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerStartupDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerStartupDestinationTest.java
@@ -28,7 +28,10 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ExclusiveConsumerStartupDestinationTest extends EmbeddedBrokerTestSupport{
private static final String VM_BROKER_URL = "vm://localhost";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerTest.java
index 5fcf856f6da..1fd9c462b09 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ExclusiveConsumerTest.java
@@ -32,7 +32,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ExclusiveConsumerTest {
private static final String VM_BROKER_URL = "vm://localhost";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiredAckAsyncConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiredAckAsyncConsumerTest.java
index 2830a830b04..aabb8046f47 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiredAckAsyncConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiredAckAsyncConsumerTest.java
@@ -47,6 +47,8 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
@@ -60,6 +62,7 @@
* Now only messages tied to the MessageAck are expired which fixes this problem.
*
*/
+@Category(ParallelTest.class)
public class ExpiredAckAsyncConsumerTest {
private static final Logger LOG = LoggerFactory.getLogger(ExpiredAckAsyncConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java
index 383a8a259d3..21b38e9754b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ExpiryHogTest.java
@@ -28,11 +28,14 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.BlockJUnit4ClassRunner;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* User: gtully
*/
@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
public class ExpiryHogTest extends JmsMultipleClientsTestSupport {
boolean sleep = false;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
index 3f76f6b3315..605fb9f6933 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSConsumerTest.java
@@ -53,10 +53,13 @@
import org.slf4j.LoggerFactory;
import static org.apache.activemq.TestSupport.getDestinationConsumers;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test cases used to test the JMS message consumer.
*/
+@Category(ParallelTest.class)
public class JMSConsumerTest extends JmsTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JMSConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
index 15218bd0066..857674fedea 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSDurableTopicRedeliverTest.java
@@ -22,10 +22,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JMSDurableTopicRedeliverTest extends JmsTopicRedeliverTest {
private static final Logger LOG = LoggerFactory.getLogger(JMSDurableTopicRedeliverTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java
index 5e2aabcf810..b170c45b3f1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSExclusiveConsumerTest.java
@@ -24,12 +24,15 @@
import junit.framework.Test;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test cases used to test the JMS message exclusive consumers.
*
*
*/
+@Category(ParallelTest.class)
public class JMSExclusiveConsumerTest extends JmsTestSupport {
public int deliveryMode;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSIndividualAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSIndividualAckTest.java
index d02fcc020ab..50e318136e7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSIndividualAckTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSIndividualAckTest.java
@@ -24,10 +24,13 @@
import jakarta.jms.Queue;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JMSIndividualAckTest extends TestSupport {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSMessageTest.java
index 9431f41dba9..e0f07e0bfab 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSMessageTest.java
@@ -38,12 +38,15 @@
import junit.framework.Test;
import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test cases used to test the JMS message consumer.
*
*
*/
+@Category(ParallelTest.class)
public class JMSMessageTest extends JmsTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSQueueRedeliverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSQueueRedeliverTest.java
index be8a6f26df5..385915d3eb7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSQueueRedeliverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSQueueRedeliverTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+
/**
*
*/
+@Category(ParallelTest.class)
public class JMSQueueRedeliverTest extends JmsTopicRedeliverTest {
protected void setUp() throws Exception {
topic = false;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSUsecaseTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSUsecaseTest.java
index 5767aa5f568..7f78a0e67c7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSUsecaseTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSUsecaseTest.java
@@ -31,7 +31,10 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class JMSUsecaseTest extends JmsTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSXAConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
index 59593f0b141..9d66d936ac7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JMSXAConsumerTest.java
@@ -20,11 +20,14 @@
import jakarta.jms.Session;
import junit.framework.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/*
* allow an XA session to be used as an auto ack session when no XA transaction
* https://issues.apache.org/activemq/browse/AMQ-2659
*/
+@Category(ParallelTest.class)
public class JMSXAConsumerTest extends JMSConsumerTest {
public static Test suite() {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckListenerTest.java
index 3088710bec5..ef5f0867a04 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckListenerTest.java
@@ -23,10 +23,13 @@
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsAutoAckListenerTest extends TestSupport implements MessageListener {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckTest.java
index af2425c589e..5dc5e66c3ce 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsAutoAckTest.java
@@ -23,10 +23,13 @@
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsAutoAckTest extends TestSupport {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckListenerTest.java
index 751b9aa8c1b..219b4f14d71 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckListenerTest.java
@@ -23,10 +23,13 @@
import jakarta.jms.MessageProducer;
import jakarta.jms.Queue;
import jakarta.jms.Session;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsClientAckListenerTest extends TestSupport implements MessageListener {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckTest.java
index e4a764f12b5..405c4abcaaa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsClientAckTest.java
@@ -32,10 +32,13 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test for client ACK support
*/
+@Category(ParallelTest.class)
public class JmsClientAckTest {
@Rule
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java
index cc0f862921c..a598773ee38 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConnectionStartStopTest.java
@@ -30,10 +30,13 @@
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import jakarta.jms.Topic;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsConnectionStartStopTest extends TestSupport {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConsumerResetActiveListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConsumerResetActiveListenerTest.java
index acf38676a70..d7e4109209b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConsumerResetActiveListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsConsumerResetActiveListenerTest.java
@@ -40,7 +40,10 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class JmsConsumerResetActiveListenerTest {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
index 46874d92071..724a921edcc 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsCreateConsumerInOnMessageTest.java
@@ -34,7 +34,10 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class JmsCreateConsumerInOnMessageTest {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableQueueWildcardSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableQueueWildcardSendReceiveTest.java
index af0f8eac008..18889498052 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableQueueWildcardSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableQueueWildcardSendReceiveTest.java
@@ -19,10 +19,13 @@
import jakarta.jms.DeliveryMode;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsDurableQueueWildcardSendReceiveTest extends JmsTopicSendReceiveTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSelectorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSelectorTest.java
index cc212ab9037..dedb8dca351 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSelectorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicSelectorTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+
/**
*
*/
+@Category(ParallelTest.class)
public class JmsDurableTopicSelectorTest extends JmsTopicSelectorTest {
public void setUp() throws Exception {
durable = true;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicTransactionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicTransactionTest.java
index be56b5662db..976a6cb630a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicTransactionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicTransactionTest.java
@@ -19,10 +19,13 @@
import jakarta.jms.DeliveryMode;
import org.apache.activemq.test.JmsResourceProvider;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsDurableTopicTransactionTest extends JmsTopicTransactionTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java
index 30711ae997b..b1f86929493 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsDurableTopicWildcardSendReceiveTest.java
@@ -19,10 +19,13 @@
import jakarta.jms.DeliveryMode;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsDurableTopicWildcardSendReceiveTest extends JmsTopicSendReceiveTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerClosedTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerClosedTest.java
index f5dbe42d98e..450d361b36b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerClosedTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerClosedTest.java
@@ -30,10 +30,13 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test behavior of JMS MessageConsumer API implementation when closed.
*/
+@Category(ParallelTest.class)
public class JmsMessageConsumerClosedTest {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java
index 5f5ca47cb76..383e67e680f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageConsumerTest.java
@@ -38,7 +38,10 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class JmsMessageConsumerTest {
private BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageProcuderClosedTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageProcuderClosedTest.java
index 3353392c5de..1e59b2cdda1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageProcuderClosedTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMessageProcuderClosedTest.java
@@ -27,10 +27,13 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test behavior of JMS MessageProducer API implementation when closed.
*/
+@Category(ParallelTest.class)
public class JmsMessageProcuderClosedTest {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
index 5dabf01ad60..94da5d1b0e4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsMultipleClientsTestSupport.java
@@ -51,6 +51,8 @@
import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Test case support used to test multiple message comsumers and message
@@ -58,6 +60,7 @@
*
*
*/
+@Category(ParallelTest.class)
public class JmsMultipleClientsTestSupport {
@Rule
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserExpirationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserExpirationTest.java
index 9573289ec41..901fbca7e64 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserExpirationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserExpirationTest.java
@@ -39,6 +39,8 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* This test shows that when all messages are expired the QueueBrowser will
@@ -53,6 +55,7 @@
*
* This test is based on a test case submitted by Henno Vermeulen for AMQ-5340
*/
+@Category(ParallelTest.class)
public class JmsQueueBrowserExpirationTest {
private static final int MESSAGES_TO_SEND = 50;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserTest.java
index 7d3fbe57a00..48c0ba098c7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueBrowserTest.java
@@ -40,7 +40,10 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class JmsQueueBrowserTest extends JmsTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ActiveMQXAConnectionFactoryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
index b8d957143dd..916667c1046 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueCompositeSendReceiveTest.java
@@ -30,11 +30,14 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
.getLog(JmsQueueCompositeSendReceiveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueRequestReplyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueRequestReplyTest.java
index 9282c0ce01c..555f033bd48 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueRequestReplyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueRequestReplyTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueRequestReplyTest extends JmsTopicRequestReplyTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSelectorTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSelectorTest.java
index 3c428763c7c..16a02381f14 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSelectorTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSelectorTest.java
@@ -18,10 +18,13 @@
package org.apache.activemq;
import jakarta.jms.*;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueSelectorTest extends JmsTopicSelectorTest {
public void setUp() throws Exception {
topic = false;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java
index f29cc09e6c1..f40e11179c0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveTwoConnectionsTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq;
import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueSendReceiveTwoConnectionsTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java
index cb793d0c3aa..72fd692fc2d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueSendReceiveUsingTwoSessionsTest.java
@@ -16,9 +16,13 @@
*/
package org.apache.activemq;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueSendReceiveUsingTwoSessionsTest extends JmsQueueSendReceiveTest {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueTopicCompositeSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueTopicCompositeSendReceiveTest.java
index 33ec1840b8e..63eb3238389 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueTopicCompositeSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueTopicCompositeSendReceiveTest.java
@@ -22,11 +22,14 @@
import jakarta.jms.Topic;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueTopicCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
.getLog(JmsQueueTopicCompositeSendReceiveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
index fd04f3b2215..c2eba642539 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsQueueWildcardSendReceiveTest.java
@@ -27,10 +27,13 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsQueueWildcardSendReceiveTest extends JmsTopicSendReceiveTest {
private String destination1String = "TEST.ONE.ONE";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java
index f27dbed6e46..481a71c3242 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRedeliveredTest.java
@@ -35,10 +35,13 @@
import org.apache.activemq.command.ConsumerControl;
import org.apache.activemq.transport.vm.VMTransport;
import org.apache.activemq.util.Wait;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsRedeliveredTest extends TestCase {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java
index 64cdcf9ae4f..a47f4024543 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsRollbackRedeliveryTest.java
@@ -40,7 +40,10 @@
import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class JmsRollbackRedeliveryTest {
@Rule
public TestName testName = new TestName();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java
index bac1542cc55..5a56d8b2243 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSendWithAsyncCallbackTest.java
@@ -29,10 +29,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsSendWithAsyncCallbackTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmsSendWithAsyncCallbackTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java
index f07cffe65ea..5edffa1021b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsSessionRecoverTest.java
@@ -33,12 +33,15 @@
import junit.framework.TestCase;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Testcases to see if Session.recover() work.
*
*
*/
+@Category(ParallelTest.class)
public class JmsSessionRecoverTest extends TestCase {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
index 1a32039981b..b0ea3603c36 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTempDestinationTest.java
@@ -16,16 +16,6 @@
*/
package org.apache.activemq;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import jakarta.jms.BytesMessage;
import jakarta.jms.Connection;
import jakarta.jms.DeliveryMode;
@@ -38,15 +28,23 @@
import jakarta.jms.Session;
import jakarta.jms.TemporaryQueue;
import jakarta.jms.TextMessage;
-
import junit.framework.TestCase;
-
import org.apache.activemq.transport.TransportListener;
import org.apache.activemq.transport.vm.VMTransport;
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* @version
*/
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
index f31d6603f01..f93b83efa65 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTestSupport.java
@@ -16,15 +16,6 @@
*/
package org.apache.activemq;
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.Destination;
@@ -32,11 +23,19 @@
import jakarta.jms.MessageConsumer;
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
-
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.command.ActiveMQDestination;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Test cases used to test the JMS message consumer.
*
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicCompositeSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicCompositeSendReceiveTest.java
index 9f519e6351b..f28dd9eb6e8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicCompositeSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicCompositeSendReceiveTest.java
@@ -22,11 +22,14 @@
import jakarta.jms.Topic;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicCompositeSendReceiveTest extends JmsTopicSendReceiveTest {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
.getLog(JmsTopicCompositeSendReceiveTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveSubscriberTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveSubscriberTest.java
index 05633a0c219..b0a0658f5be 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveSubscriberTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveSubscriberTest.java
@@ -20,10 +20,13 @@
import jakarta.jms.MessageConsumer;
import jakarta.jms.Topic;
import jakarta.jms.TopicSession;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicSendReceiveSubscriberTest extends JmsTopicSendReceiveTest {
protected MessageConsumer createConsumer() throws JMSException {
if (durable) {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
index da2c80cdcdc..df2dbe65b06 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendReceiveWithTwoConnectionsWithJMXTest.java
@@ -1,4 +1,6 @@
/**
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -16,10 +18,14 @@
*/
package org.apache.activemq;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+
/**
*
*
*/
+@Category(ParallelTest.class)
public class JmsTopicSendReceiveWithTwoConnectionsWithJMXTest extends
JmsTopicSendReceiveWithTwoConnectionsTest {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendSameMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendSameMessageTest.java
index 458168c7437..46553a30aa5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendSameMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicSendSameMessageTest.java
@@ -17,10 +17,13 @@
package org.apache.activemq;
import jakarta.jms.TextMessage;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicSendSameMessageTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
private static final org.apache.commons.logging.Log LOG = org.apache.commons.logging.LogFactory
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
index a1571ecb75a..c4d28f071ee 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/JmsTopicWildcardSendReceiveTest.java
@@ -26,10 +26,13 @@
import jakarta.jms.TextMessage;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.test.JmsTopicSendReceiveTest;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class JmsTopicWildcardSendReceiveTest extends JmsTopicSendReceiveTest {
private String destination1String = "TEST.ONE.ONE";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/MessageEvictionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/MessageEvictionTest.java
index afc7c736578..0f3c8e6bd52 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/MessageEvictionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/MessageEvictionTest.java
@@ -56,7 +56,10 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class MessageEvictionTest {
static final Logger LOG = LoggerFactory.getLogger(MessageEvictionTest.class);
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java
index 288a1894208..26222b67474 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/MessageListenerRedeliveryTest.java
@@ -48,7 +48,10 @@
import org.junit.rules.TestName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class MessageListenerRedeliveryTest {
private static final Logger LOG = LoggerFactory.getLogger(MessageListenerRedeliveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/MessageTransformationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/MessageTransformationTest.java
index 3c185322dbd..1d95c3c4a0b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/MessageTransformationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/MessageTransformationTest.java
@@ -39,7 +39,10 @@
import org.apache.activemq.command.ActiveMQTempTopic;
import org.apache.activemq.command.ActiveMQTextMessage;
import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class MessageTransformationTest extends TestCase {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
index c455297a913..cb144bbf864 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/OnePrefetchAsyncConsumerTest.java
@@ -45,9 +45,12 @@
import org.junit.runners.BlockJUnit4ClassRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
// see: https://issues.apache.org/activemq/browse/AMQ-2651
@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
public class OnePrefetchAsyncConsumerTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(OnePrefetchAsyncConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
index 1a4e1451d6f..93bebddde8a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
@@ -28,7 +28,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class OptimizedAckTest extends TestSupport {
private static final Logger LOG = LoggerFactory.getLogger(OptimizedAckTest.class);
private ActiveMQConnection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java
index c2efba05e62..72f309758aa 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/PerDestinationStoreLimitTest.java
@@ -40,8 +40,11 @@
import org.apache.activemq.transport.tcp.TcpTransport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
// see: https://issues.apache.org/activemq/browse/AMQ-2668
+@Category(ParallelTest.class)
public class PerDestinationStoreLimitTest extends JmsTestSupport {
static final Logger LOG = LoggerFactory.getLogger(PerDestinationStoreLimitTest.class);
final String oneKb = new String(new byte[1024]);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
index 2e1de711455..5857871ec8c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlSendFailTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.activemq;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
import jakarta.jms.ConnectionFactory;
import jakarta.jms.ExceptionListener;
import jakarta.jms.JMSException;
@@ -27,13 +24,15 @@
import jakarta.jms.ResourceAllocationException;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
-
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.PolicyEntry;
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 java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
public class ProducerFlowControlSendFailTest extends ProducerFlowControlTest {
protected BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
index f46cdc56e98..7dbb49cb963 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ProducerFlowControlTest.java
@@ -16,12 +16,6 @@
*/
package org.apache.activemq;
-import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
import jakarta.jms.Connection;
import jakarta.jms.ConnectionFactory;
import jakarta.jms.DeliveryMode;
@@ -30,7 +24,6 @@
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
-
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.broker.region.Queue;
@@ -48,6 +41,12 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
public class ProducerFlowControlTest extends JmsTestSupport {
static final Logger LOG = LoggerFactory.getLogger(ProducerFlowControlTest.class);
ActiveMQQueue queueA = new ActiveMQQueue("QUEUE.A");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java
index eff67e39626..606ba4e7519 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/QueueConsumerPriorityTest.java
@@ -27,7 +27,10 @@
import junit.framework.TestCase;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class QueueConsumerPriorityTest extends TestCase {
private static final String VM_BROKER_URL = "vm://localhost?broker.persistent=false&broker.useJmx=true";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java
index 377dfa67a57..02089c11808 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ReconnectWithSameClientIDTest.java
@@ -33,7 +33,10 @@
import org.apache.logging.log4j.core.layout.MessageLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class ReconnectWithSameClientIDTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ReconnectWithSameClientIDTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
index 53e341d5422..f78c3bd4fb8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/RedeliveryPolicyTest.java
@@ -43,7 +43,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class RedeliveryPolicyTest extends JmsTestSupport {
static final Logger LOG = LoggerFactory.getLogger(RedeliveryPolicyTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
index d8a9f98f845..10258ed0077 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/RemoveDestinationTest.java
@@ -42,7 +42,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class RemoveDestinationTest {
private static final String VM_BROKER_URL = "vm://localhost?create=false";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/TcpTransportCloseConnectionTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/TcpTransportCloseConnectionTest.java
index f7bd17eba0d..328b420c35c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/TcpTransportCloseConnectionTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/TcpTransportCloseConnectionTest.java
@@ -33,7 +33,10 @@
import org.apache.activemq.broker.BrokerService;
import javax.management.JMException;
import javax.management.ObjectName;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class TcpTransportCloseConnectionTest {
static boolean transportConnectionFailed = false;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java
index 6a14619fdaf..312a57c51d0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/TimeStampTest.java
@@ -30,7 +30,10 @@
import org.apache.activemq.broker.TransportConnector;
import org.apache.activemq.broker.util.UDPTraceBrokerPlugin;
import org.apache.activemq.broker.view.ConnectionDotFilePlugin;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class TimeStampTest extends TestCase {
public void test() throws Exception {
BrokerService broker = new BrokerService();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/TopicSubscriptionCountBeforeFullTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/TopicSubscriptionCountBeforeFullTest.java
index 9539d5d866b..f7edf56f967 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/TopicSubscriptionCountBeforeFullTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/TopicSubscriptionCountBeforeFullTest.java
@@ -28,11 +28,14 @@
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.command.ActiveMQTopic;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* This test shows that the countBeforeFull statistic that is part of a Subscription is correct
* for TopicSubscriptions.
*/
+@Category(ParallelTest.class)
public class TopicSubscriptionCountBeforeFullTest extends TestSupport {
protected BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/TransactionContextTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/TransactionContextTest.java
index ad657c3efc7..496f62a867f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/TransactionContextTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/TransactionContextTest.java
@@ -27,7 +27,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class TransactionContextTest {
TransactionContext underTest;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/XAConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/XAConsumerTest.java
index b71b3d8c3fd..0c94a1184b4 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/XAConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/XAConsumerTest.java
@@ -44,7 +44,10 @@
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class XAConsumerTest extends TestCase {
static final Logger LOG = LoggerFactory.getLogger(XAConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java
index 9cd7da901de..b7297e86503 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/ZeroPrefetchConsumerTest.java
@@ -37,10 +37,13 @@
import org.apache.activemq.spring.SpringConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class ZeroPrefetchConsumerTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(ZeroPrefetchConsumerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
index 9e573dcd391..0210689f180 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTempDestinationTests.java
@@ -42,10 +42,13 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class AdvisoryTempDestinationTests {
protected static final int MESSAGE_COUNT = 2000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
index 8b78f6849fb..008b9367388 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/AdvisoryTests.java
@@ -53,9 +53,11 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
@@ -63,6 +65,7 @@
/**
* Test for advisory messages sent under the right circumstances.
*/
+@Category(ParallelTest.class)
@RunWith(Parameterized.class)
public class AdvisoryTests {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
index ec758d2eae7..b610ab7707e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ConsumerListenerTest.java
@@ -29,6 +29,8 @@
import jakarta.jms.Session;
import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +38,7 @@
*
*
*/
+@Category(ParallelTest.class)
public class ConsumerListenerTest extends EmbeddedBrokerTestSupport implements ConsumerListener {
private static final Logger LOG = LoggerFactory.getLogger(ConsumerListenerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java
index d48ad068ce0..dd0591afb13 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/DestinationListenerTest.java
@@ -30,6 +30,8 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -38,6 +40,7 @@
/**
*
*/
+@Category(ParallelTest.class)
public class DestinationListenerTest extends EmbeddedBrokerTestSupport implements DestinationListener {
private static final transient Logger LOG = LoggerFactory.getLogger(DestinationListenerTest.class);
protected ActiveMQConnection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java
index 72bc4c6d34d..ef3eb8750dd 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/ProducerListenerTest.java
@@ -26,6 +26,8 @@
import jakarta.jms.MessageProducer;
import jakarta.jms.Session;
import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,6 +35,7 @@
*
*
*/
+@Category(ParallelTest.class)
public class ProducerListenerTest extends EmbeddedBrokerTestSupport implements ProducerListener {
private static final Logger LOG = LoggerFactory.getLogger(ProducerListenerTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java
index 6a101bb502a..58458929f19 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestDeleteTest.java
@@ -33,12 +33,15 @@
import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.command.ActiveMQTempQueue;
import org.apache.activemq.command.ActiveMQTempTopic;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
*/
+@Category(ParallelTest.class)
public class TempDestDeleteTest extends EmbeddedBrokerTestSupport implements ConsumerListener {
private static final Logger LOG = LoggerFactory.getLogger(TempDestDeleteTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestLoadTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestLoadTest.java
index 6253c936179..ef00b1269e3 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestLoadTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempDestLoadTest.java
@@ -26,12 +26,15 @@
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.region.Destination;
import org.apache.activemq.broker.region.RegionBroker;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
*/
+@Category(ParallelTest.class)
public class TempDestLoadTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(TempDestLoadTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempQueueMemoryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempQueueMemoryTest.java
index 6dbd9e14e2c..1a4cdefc4b1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempQueueMemoryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/advisory/TempQueueMemoryTest.java
@@ -32,7 +32,10 @@
import org.apache.activemq.broker.region.RegionBroker;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class TempQueueMemoryTest extends EmbeddedBrokerTestSupport {
protected Connection serverConnection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/blob/BlobTransferPolicyUriTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/blob/BlobTransferPolicyUriTest.java
index 28d1bb02ed9..8e83a6c6c72 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/blob/BlobTransferPolicyUriTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/blob/BlobTransferPolicyUriTest.java
@@ -20,6 +20,8 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.command.ActiveMQBlobMessage;
import org.apache.activemq.command.MessageId;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.io.InputStream;
@@ -27,6 +29,7 @@
/**
*
*/
+@Category(ParallelTest.class)
public class BlobTransferPolicyUriTest extends TestCase {
public void testBlobTransferPolicyIsConfiguredViaUri() throws Exception {
ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost?jms.blobTransferPolicy.defaultUploadUrl=http://foo.com");
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java
index 03bcffb7aa1..fe638e06360 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/blob/FilesystemBlobTest.java
@@ -31,11 +31,13 @@
import org.apache.activemq.BlobMessage;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.command.ActiveMQBlobMessage;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.IOHelper;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
+@Category(ParallelTest.class)
public class FilesystemBlobTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(FilesystemBlobTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java
index 09f75b2fbb2..b4dac900b5a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRedeliveryTest.java
@@ -36,7 +36,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class BrokerRedeliveryTest extends org.apache.activemq.TestSupport {
static final Logger LOG = LoggerFactory.getLogger(BrokerRedeliveryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
index 111494a0277..9c9891deb7d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerRestartTestSupport.java
@@ -22,6 +22,8 @@
import org.apache.activemq.util.IOHelper;
+
+
public class BrokerRestartTestSupport extends BrokerTestSupport {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
index 06a18ce7930..b68bcf8cd18 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerServiceTest.java
@@ -30,12 +30,15 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* Tests for the BrokerService class
*
* @author chirino
*/
+@Category(ParallelTest.class)
public class BrokerServiceTest extends TestCase {
public void testAddRemoveTransportsWithJMX() throws Exception {
BrokerService service = new BrokerService();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
index c0d4736980f..4ff34bb36db 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTest.java
@@ -36,6 +36,8 @@
import org.apache.activemq.command.RemoveInfo;
import org.apache.activemq.command.SessionInfo;
+
+
public class BrokerTest extends BrokerTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
index 94a74a932e4..b9a9ec991ef 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/BrokerTestSupport.java
@@ -54,6 +54,8 @@
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.usage.SystemUsage;
+
+
public class BrokerTestSupport extends CombinationTestSupport {
/**
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
index 0c791fdda0d..35b53e63db5 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ConcurrentConnectSimulationTest.java
@@ -24,6 +24,8 @@
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.command.SessionId;
+
+
public class ConcurrentConnectSimulationTest extends BrokerTestSupport {
/*
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java
index 70fda7c7f40..97e6d8594b8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/CreateDestinationsOnStartupViaXBeanTest.java
@@ -24,11 +24,14 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.xbean.XBeanBrokerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*
*/
+@Category(ParallelTest.class)
public class CreateDestinationsOnStartupViaXBeanTest extends EmbeddedBrokerTestSupport {
public void testNewDestinationsAreCreatedOnStartup() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
index 281f10de745..c2533719676 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/MessageExpirationTest.java
@@ -34,6 +34,8 @@
import org.apache.activemq.command.SessionInfo;
import org.apache.activemq.util.Wait;
+
+
public class MessageExpirationTest extends BrokerTestSupport {
public ActiveMQDestination destination;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java
index 45b92eaba8d..ab9958d7193 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ReconnectWithJMXEnabledTest.java
@@ -26,11 +26,14 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*
*/
+@Category(ParallelTest.class)
public class ReconnectWithJMXEnabledTest extends EmbeddedBrokerTestSupport {
protected Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
index 438d6494f03..fdf6cf04f1c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryBrokerTest.java
@@ -29,7 +29,10 @@
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 AdvisoryBrokerTest extends BrokerTestSupport {
public void testConnectionAdvisories() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuringStartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuringStartTest.java
index 069092cf0fa..6f3219a4ced 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuringStartTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryDuringStartTest.java
@@ -22,6 +22,7 @@
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.network.DiscoveryNetworkConnector;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.ServiceStopper;
import org.junit.After;
import org.junit.Test;
@@ -29,12 +30,15 @@
import jakarta.jms.Connection;
import jakarta.jms.MessageConsumer;
import jakarta.jms.Session;
+import org.junit.experimental.categories.Category;
+
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
+@Category(ParallelTest.class)
public class AdvisoryDuringStartTest {
BrokerService brokerService;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java
index 37fa53269fa..dd4bcac1f62 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryJmxTest.java
@@ -30,7 +30,10 @@
import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class AdvisoryJmxTest extends EmbeddedBrokerTestSupport {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.java
index e7ee4394850..6eaaac5576d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/advisory/AdvisoryNetworkBridgeTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.activemq.broker.advisory;
+import jakarta.jms.Connection;
+import jakarta.jms.MessageConsumer;
+import jakarta.jms.Session;
import junit.framework.TestCase;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.advisory.AdvisorySupport;
@@ -24,9 +27,6 @@
import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.BrokerInfo;
-import jakarta.jms.Connection;
-import jakarta.jms.MessageConsumer;
-import jakarta.jms.Session;
import java.net.URI;
public class AdvisoryNetworkBridgeTest extends TestCase {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java
index 97f18c82900..5b8092db13e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java
@@ -36,7 +36,10 @@
import org.junit.After;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnectionsTest implements ExceptionListener {
private static final transient Logger LOG = LoggerFactory.getLogger(DbRestartJDBCQueueTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
index 6910bed2777..ede79d33761 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewSlowStoreStartupTest.java
@@ -24,10 +24,12 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.Wait;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,6 +37,7 @@
* Used to verify that the BrokerView accessed while the BrokerSerivce is waiting
* for a Slow Store startup to complete doesn't throw unexpected NullPointerExceptions.
*/
+@Category(ParallelTest.class)
public class BrokerViewSlowStoreStartupTest {
private static final Logger LOG = LoggerFactory.getLogger(BrokerViewSlowStoreStartupTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java
index c3b0f720252..9444f74e488 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java
@@ -20,13 +20,16 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerRegistry;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.Wait;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@Category(ParallelTest.class)
public class BrokerViewTest {
@Test(timeout=120000)
public void testBrokerViewRetrieveQueuesAndTopicsCount() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java
index 17caea9ae3a..266ead1be4c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/ConcurrentMoveTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.activemq.broker.jmx;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
@@ -26,11 +31,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import jakarta.jms.Connection;
-import jakarta.jms.ConnectionFactory;
-import jakarta.jms.Message;
-import jakarta.jms.MessageProducer;
-import jakarta.jms.Session;
import javax.management.MBeanServer;
import javax.management.MBeanServerInvocationHandler;
import javax.management.MalformedObjectNameException;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java
index 9239b3b62c7..ad754e44430 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/HealthViewMBeanTest.java
@@ -32,9 +32,12 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelTest.class)
public class HealthViewMBeanTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(MBeanTest.class);
protected MBeanServer mbeanServer;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java
index e927ecf450c..347df4f4eed 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXMasterSlaveSharedStoreTest.java
@@ -26,9 +26,12 @@
import org.apache.activemq.TestSupport;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.xbean.XBeanBrokerService;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class JMXMasterSlaveSharedStoreTest extends TestSupport {
protected XBeanBrokerService master;
protected XBeanBrokerService slave;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveDurableSubscriberTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveDurableSubscriberTest.java
index 334f8d6cf14..e9ff5557661 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveDurableSubscriberTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveDurableSubscriberTest.java
@@ -30,9 +30,11 @@
import org.apache.activemq.security.AuthorizationPlugin;
import org.apache.activemq.security.DefaultAuthorizationMap;
import org.apache.activemq.security.JaasAuthenticationPlugin;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +43,7 @@
* brokerServer.getAdminView() when JAAS authentication and authorization are
* setup
*/
+@Category(ParallelTest.class)
public class JMXRemoveDurableSubscriberTest {
private static final Logger LOG = LoggerFactory.getLogger(JMXRemoveDurableSubscriberTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveOfflineDurableSubscriberTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveOfflineDurableSubscriberTest.java
index 233e46b82a1..74054bc9157 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveOfflineDurableSubscriberTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JMXRemoveOfflineDurableSubscriberTest.java
@@ -17,12 +17,15 @@
package org.apache.activemq.broker.jmx;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertTrue;
+@Category(ParallelTest.class)
public class JMXRemoveOfflineDurableSubscriberTest {
private BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxConsumerRemovalTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxConsumerRemovalTest.java
index 51b28794342..c7583db38db 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxConsumerRemovalTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxConsumerRemovalTest.java
@@ -43,11 +43,13 @@
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.Wait;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
+@Category(ParallelTest.class)
public class JmxConsumerRemovalTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(JmxConsumerRemovalTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxOpPageInOnMemoryLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxOpPageInOnMemoryLimitTest.java
index 8e5f2c3ae00..8cbbcd3a6b8 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxOpPageInOnMemoryLimitTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/JmxOpPageInOnMemoryLimitTest.java
@@ -22,11 +22,14 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import jakarta.jms.*;
+import org.junit.experimental.categories.Category;
+
import javax.management.MBeanServer;
import javax.management.MBeanServerInvocationHandler;
import javax.management.MalformedObjectNameException;
@@ -35,6 +38,7 @@
import static org.junit.Assert.*;
// https://issues.apache.org/jira/browse/AMQ-7302
+@Category(ParallelTest.class)
public class JmxOpPageInOnMemoryLimitTest {
BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java
index ed03d901885..dd13199d033 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/Log4JConfigTest.java
@@ -25,11 +25,14 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.LoggerFactory;
+@Category(ParallelTest.class)
public class Log4JConfigTest extends EmbeddedBrokerTestSupport {
private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(Log4JConfigTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java
index b358f248865..001a9f6141a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanOperationTimeoutTest.java
@@ -30,14 +30,17 @@
import javax.management.ObjectName;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
+@Category(ParallelTest.class)
public class MBeanOperationTimeoutTest {
private static final Logger LOG = LoggerFactory.getLogger(MBeanOperationTimeoutTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
index fd464f7c902..a0c2346dd57 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
@@ -61,9 +61,11 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTempQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.JMXSupport;
import org.apache.activemq.util.URISupport;
import org.apache.activemq.util.Wait;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,6 +77,7 @@
* various MBeans after the test has been run then run this test case as a
* command line application.
*/
+@Category(ParallelTest.class)
public class MBeanTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(MBeanTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeLargeMessageTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeLargeMessageTest.java
index 83e4ba4fcaf..ffc956224f1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeLargeMessageTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeLargeMessageTest.java
@@ -21,6 +21,8 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,6 +43,7 @@
/**
* Purging with large message that hit the memory limit boundaries of a queue.
*/
+@Category(ParallelTest.class)
public class PurgeLargeMessageTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(PurgeLargeMessageTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java
index 44bfb191b42..780a7f5aa0e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java
@@ -34,12 +34,15 @@
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A specific test of Queue.purge() functionality
*/
+@Category(ParallelTest.class)
public class PurgeTest extends EmbeddedBrokerTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(PurgeTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/SelectiveMBeanRegistrationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/SelectiveMBeanRegistrationTest.java
index 078e3f72a9e..b9b38bea2bb 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/SelectiveMBeanRegistrationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/SelectiveMBeanRegistrationTest.java
@@ -26,10 +26,12 @@
import javax.management.ObjectName;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.Wait;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,6 +39,7 @@
import static org.junit.Assert.*;
+@Category(ParallelTest.class)
public class SelectiveMBeanRegistrationTest {
private static final Logger LOG = LoggerFactory.getLogger(SelectiveMBeanRegistrationTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/TransportConnectorMBeanTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/TransportConnectorMBeanTest.java
index d795823a804..747933b0b1f 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/TransportConnectorMBeanTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/TransportConnectorMBeanTest.java
@@ -34,13 +34,16 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.network.NetworkConnector;
+import org.apache.activemq.test.annotations.ParallelTest;
import org.apache.activemq.util.JMXSupport;
import org.apache.activemq.util.Wait;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Category(ParallelTest.class)
public class TransportConnectorMBeanTest {
private static final Logger LOG = LoggerFactory.getLogger(TransportConnectorMBeanTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java
index e9f57881742..3f3e7e75475 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/message/security/MessageAuthenticationTest.java
@@ -34,10 +34,13 @@
import org.apache.activemq.security.MessageAuthorizationPolicy;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.spring.ConsumerBean;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class MessageAuthenticationTest extends EmbeddedBrokerTestSupport {
private Connection connection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer0Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer0Test.java
index f80dddb6a5f..c59f46c6fff 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer0Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer0Test.java
@@ -37,8 +37,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AbortSlowAckConsumer0Test extends AbortSlowConsumer0Test {
protected long maxTimeSinceLastAck = 5 * 1000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer1Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer1Test.java
index 964c9096bec..3755cade60c 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer1Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer1Test.java
@@ -28,8 +28,11 @@
import java.util.Arrays;
import java.util.Collection;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AbortSlowAckConsumer1Test extends AbortSlowConsumer1Test {
protected long maxTimeSinceLastAck = 5 * 1000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer2Test.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer2Test.java
index d810dcee010..5585921fcce 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer2Test.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/AbortSlowAckConsumer2Test.java
@@ -28,8 +28,11 @@
import java.util.Arrays;
import java.util.Collection;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
@RunWith(value = Parameterized.class)
+@Category(ParallelTest.class)
public class AbortSlowAckConsumer2Test extends AbortSlowConsumer2Test {
protected long maxTimeSinceLastAck = 5 * 1000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/ClientIdFilterDispatchPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/ClientIdFilterDispatchPolicyTest.java
index 0e80d0de149..8580c8b358b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/ClientIdFilterDispatchPolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/ClientIdFilterDispatchPolicyTest.java
@@ -1,137 +1,140 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.broker.policy;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.region.policy.*;
-import org.apache.activemq.command.ActiveMQTopic;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.BlockJUnit4ClassRunner;
-
-import jakarta.jms.*;
-import java.net.URI;
-
-import static org.junit.Assert.assertEquals;
-
-@RunWith(BlockJUnit4ClassRunner.class)
-public class ClientIdFilterDispatchPolicyTest {
-
- @Test
- public void testClientIdFilter() throws Exception {
- BrokerService broker = BrokerFactory.createBroker(new URI("broker://()/localhost?persistent=false&useJmx=true"));;
-
- PolicyEntry policy = new PolicyEntry();
- policy.setDispatchPolicy(new ClientIdFilterDispatchPolicy());
- //policy.setSubscriptionRecoveryPolicy(new FixedCountSubscriptionRecoveryPolicy());
- PolicyMap pMap = new PolicyMap();
- pMap.setDefaultEntry(policy);
- broker.setDestinationPolicy(pMap);
- broker.start();
-
- // test dispacth
- String topic = "test"+ClientIdFilterDispatchPolicy.PTP_SUFFIX;
- long timeout = 5000L;
- final Result r = new Result();
-
- ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost");
- // 1.consumer1
- Connection connection1 = cf.createConnection();
- connection1.setClientID("test1");
- connection1.start();
- Session session1 = connection1.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer1 = session1.createConsumer(new ActiveMQTopic(topic));
- consumer1.setMessageListener(
- new MessageListener() {
- @Override
- public void onMessage(Message message) {
- try {
- System.out.println(message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID));
- String clientId = message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID);
- //assertEquals("test1", clientId);
- r.test1 = clientId;
- r.count++;
- } catch (JMSException e) {
- e.printStackTrace();
- }
- }
- }
- );
-
- // 2.consumer2
- Connection connection2 = cf.createConnection();
- connection2.setClientID("test2");
- connection2.start();
- Session session2 = connection2.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer2 = session2.createConsumer(new ActiveMQTopic(topic));
- consumer2.setMessageListener(
- new MessageListener() {
- @Override
- public void onMessage(Message message) {
- try {
- System.out.println(message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID));
- String clientId = message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID);
- //assertEquals("test2", clientId);
- r.test2 = clientId;
- r.count++;
- } catch (JMSException e) {
- e.printStackTrace();
- }
- }
- }
- );
-
- // 3.producer
- Message m1 = session1.createTextMessage("test1");
- m1.setStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID, "test1");
- Message m2 = session1.createTextMessage("test2");
- m2.setStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID, "test2");
- Message m3 = session1.createTextMessage("test3");
- m3.setStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID, "test3");
-
- MessageProducer producer = session1.createProducer(new ActiveMQTopic(topic));
- producer.send(m1);
- producer.send(m2);
- producer.send(m3);
-
- long time = 0L;
-
- while( r.count < 2 && time < timeout) {
- time += 50L;
- Thread.sleep(50L);
- }
- System.out.println(time);
- assertEquals(2,r.count);
- assertEquals("test1",r.test1);
- assertEquals("test2",r.test2);
-
- producer.close();
- session1.close();
- connection1.stop();
- session2.close();;
- connection2.close();
- broker.stop();
- }
-
- public static class Result{
- int count;
- public String test1;
- public String test2;
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.broker.policy;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.policy.*;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.BlockJUnit4ClassRunner;
+
+import jakarta.jms.*;
+import java.net.URI;
+
+import static org.junit.Assert.assertEquals;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+
+@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
+public class ClientIdFilterDispatchPolicyTest {
+
+ @Test
+ public void testClientIdFilter() throws Exception {
+ BrokerService broker = BrokerFactory.createBroker(new URI("broker://()/localhost?persistent=false&useJmx=true"));;
+
+ PolicyEntry policy = new PolicyEntry();
+ policy.setDispatchPolicy(new ClientIdFilterDispatchPolicy());
+ //policy.setSubscriptionRecoveryPolicy(new FixedCountSubscriptionRecoveryPolicy());
+ PolicyMap pMap = new PolicyMap();
+ pMap.setDefaultEntry(policy);
+ broker.setDestinationPolicy(pMap);
+ broker.start();
+
+ // test dispacth
+ String topic = "test"+ClientIdFilterDispatchPolicy.PTP_SUFFIX;
+ long timeout = 5000L;
+ final Result r = new Result();
+
+ ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost");
+ // 1.consumer1
+ Connection connection1 = cf.createConnection();
+ connection1.setClientID("test1");
+ connection1.start();
+ Session session1 = connection1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumer1 = session1.createConsumer(new ActiveMQTopic(topic));
+ consumer1.setMessageListener(
+ new MessageListener() {
+ @Override
+ public void onMessage(Message message) {
+ try {
+ System.out.println(message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID));
+ String clientId = message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID);
+ //assertEquals("test1", clientId);
+ r.test1 = clientId;
+ r.count++;
+ } catch (JMSException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ );
+
+ // 2.consumer2
+ Connection connection2 = cf.createConnection();
+ connection2.setClientID("test2");
+ connection2.start();
+ Session session2 = connection2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer consumer2 = session2.createConsumer(new ActiveMQTopic(topic));
+ consumer2.setMessageListener(
+ new MessageListener() {
+ @Override
+ public void onMessage(Message message) {
+ try {
+ System.out.println(message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID));
+ String clientId = message.getStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID);
+ //assertEquals("test2", clientId);
+ r.test2 = clientId;
+ r.count++;
+ } catch (JMSException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ );
+
+ // 3.producer
+ Message m1 = session1.createTextMessage("test1");
+ m1.setStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID, "test1");
+ Message m2 = session1.createTextMessage("test2");
+ m2.setStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID, "test2");
+ Message m3 = session1.createTextMessage("test3");
+ m3.setStringProperty(ClientIdFilterDispatchPolicy.PTP_CLIENTID, "test3");
+
+ MessageProducer producer = session1.createProducer(new ActiveMQTopic(topic));
+ producer.send(m1);
+ producer.send(m2);
+ producer.send(m3);
+
+ long time = 0L;
+
+ while( r.count < 2 && time < timeout) {
+ time += 50L;
+ Thread.sleep(50L);
+ }
+ System.out.println(time);
+ assertEquals(2,r.count);
+ assertEquals("test1",r.test1);
+ assertEquals("test2",r.test2);
+
+ producer.close();
+ session1.close();
+ connection1.stop();
+ session2.close();;
+ connection2.close();
+ broker.stop();
+ }
+
+ public static class Result{
+ int count;
+ public String test1;
+ public String test2;
+ }
+}
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java
index 69f9929d8c9..80a3f403f7e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterExpiryTest.java
@@ -37,7 +37,10 @@
import org.slf4j.LoggerFactory;
import java.util.concurrent.TimeUnit;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class DeadLetterExpiryTest extends DeadLetterTest {
private static final Logger LOG = LoggerFactory.getLogger(DeadLetterExpiryTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationCursorConfigTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationCursorConfigTest.java
index a5f7984b382..efb79a498b1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationCursorConfigTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationCursorConfigTest.java
@@ -26,10 +26,13 @@
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.xbean.BrokerFactoryBean;
import org.springframework.core.io.ClassPathResource;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class DestinationCursorConfigTest extends TestSupport {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationWildcardTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationWildcardTest.java
index 0f984ac669d..600c38d0ab7 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationWildcardTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DestinationWildcardTest.java
@@ -35,8 +35,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class DestinationWildcardTest {
protected final static String DESTNAME="DomainA.DomainB.TestMeA.TestMeB.Prioritised.Queue";
protected final static int QUEUE_LIMIT = 5000000;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java
index 26b0103c591..9da2688ec0e 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DiscardingDeadLetterPolicyTest.java
@@ -26,10 +26,13 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class DiscardingDeadLetterPolicyTest extends DeadLetterTest {
private static final Logger LOG = LoggerFactory.getLogger(DiscardingDeadLetterPolicyTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java
index e2a9c3ad228..db5048dfd07 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java
@@ -43,7 +43,10 @@
import org.apache.activemq.util.Wait;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class IndividualDeadLetterTest extends DeadLetterTest {
private static final Logger LOG = LoggerFactory.getLogger(IndividualDeadLetterTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java
index a92400a146f..6d3fc8ea817 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java
@@ -24,11 +24,14 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.ClassPathResource;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*
*/
+@Category(ParallelTest.class)
public class IndividualDeadLetterViaXmlTest extends DeadLetterTest {
private static final Logger LOG = LoggerFactory.getLogger(IndividualDeadLetterViaXmlTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageGroupConfigTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageGroupConfigTest.java
index 112cc463db0..7313653bee9 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageGroupConfigTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageGroupConfigTest.java
@@ -26,10 +26,13 @@
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.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class MessageGroupConfigTest extends TestSupport {
protected BrokerService broker;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java
index a528a722fd1..927af71ce04 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java
@@ -30,7 +30,10 @@
import org.apache.activemq.command.ActiveMQQueue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class MessageListenerDeadLetterTest extends DeadLetterTestSupport {
private static final Logger LOG = LoggerFactory
.getLogger(MessageListenerDeadLetterTest.class);
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java
index e168a8c9f33..c9ed1c03f8d 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoConsumerDeadLetterTest.java
@@ -32,10 +32,13 @@
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.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(ParallelTest.class)
public class NoConsumerDeadLetterTest extends DeadLetterTestSupport {
// lets disable the inapplicable tests
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java
index a14df74b7df..0e0a943b128 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java
@@ -18,7 +18,10 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.RedeliveryPolicy;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class NoRetryDeadLetterTest extends DeadLetterTest {
@Override
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PerDurableConsumerDeadLetterTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PerDurableConsumerDeadLetterTest.java
index ce1485818fe..5a60e295340 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PerDurableConsumerDeadLetterTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PerDurableConsumerDeadLetterTest.java
@@ -23,12 +23,15 @@
import org.apache.activemq.broker.region.policy.PolicyEntry;
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
/**
* for durable subs, allow a dlq per subscriber such that poison messages are not duplicates
* on the dlq and such that rejecting consumers can be identified
* https://issues.apache.org/jira/browse/AMQ-3003
*/
+@Category(ParallelTest.class)
public class PerDurableConsumerDeadLetterTest extends DeadLetterTest {
private static final String CLIENT_ID = "george";
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PriorityNetworkDispatchPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PriorityNetworkDispatchPolicyTest.java
index 448f47c349e..e39ad15a53a 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PriorityNetworkDispatchPolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/PriorityNetworkDispatchPolicyTest.java
@@ -35,7 +35,10 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class PriorityNetworkDispatchPolicyTest {
PriorityNetworkDispatchPolicy underTest = new PriorityNetworkDispatchPolicy();
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java
index 91b022d95d7..0647163e2e1 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/RoundRobinDispatchPolicyTest.java
@@ -29,8 +29,11 @@
import jakarta.jms.Destination;
import jakarta.jms.MessageConsumer;
import jakarta.jms.Session;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
@RunWith(BlockJUnit4ClassRunner.class)
+@Category(ParallelTest.class)
public class RoundRobinDispatchPolicyTest extends QueueSubscriptionTest {
protected BrokerService createBroker() throws Exception {
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java
index 2ef59938e4b..f10682944e0 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SecureDLQTest.java
@@ -26,7 +26,10 @@
import jakarta.jms.*;
import static org.apache.activemq.security.SimpleSecurityBrokerSystemTest.*;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class SecureDLQTest extends DeadLetterTestSupport {
Connection dlqConnection;
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SendDuplicateFromStoreToDLQTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SendDuplicateFromStoreToDLQTest.java
index 14b2b22e966..06c2bc2f605 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SendDuplicateFromStoreToDLQTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SendDuplicateFromStoreToDLQTest.java
@@ -20,6 +20,8 @@
import static org.junit.Assert.assertNotNull;
import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -40,6 +42,10 @@
import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.util.IOHelper;
+import org.apache.activemq.util.Wait;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -53,6 +59,7 @@
*/
@RunWith(value = Parameterized.class)
public class SendDuplicateFromStoreToDLQTest {
+ private static final Logger LOG = LoggerFactory.getLogger(SendDuplicateFromStoreToDLQTest.class);
@Parameterized.Parameters(name="sendDupToDLQ={1},cacheEnable={2},auditEnabled={3},optimizedDispatch={4}")
public static Collection