This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new f25bc526dc AMQ-8525: Execute tests in parallel when possible (#1540)
f25bc526dc is described below
commit f25bc526dc947f24f9ef30e43e9d1d2446a2a9b0
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Tue Dec 16 23:48:18 2025 +0100
AMQ-8525: Execute tests in parallel when possible (#1540)
---
activemq-stomp/pom.xml | 66 ++++++++++++++++++++--
.../activemq/transport/stomp/ConnectTest.java | 2 +
.../transport/stomp/LegacyFrameTranslatorTest.java | 2 +
.../{StompFrameTest.java => ParallelTest.java} | 26 +++------
.../activemq/transport/stomp/Stomp11Test.java | 3 +
.../activemq/transport/stomp/Stomp12Test.java | 3 +
.../transport/stomp/StompAdvisoryTest.java | 3 +
.../stomp/StompCompositeDestinationTest.java | 3 +
.../transport/stomp/StompConnectTimeoutTest.java | 3 +
.../transport/stomp/StompEmptyDestinationTest.java | 4 +-
.../activemq/transport/stomp/StompFrameTest.java | 2 +
.../stomp/StompInactivityMonitorTest.java | 3 +
.../transport/stomp/StompMaxDataSizeTest.java | 3 +
.../transport/stomp/StompMaxFrameSizeTest.java | 6 +-
.../transport/stomp/StompMissingMessageTest.java | 3 +
.../stomp/StompNIOSSLLargeMessageTest.java | 3 +
.../transport/stomp/StompPrefetchTest.java | 3 +
.../stomp/StompSubscriptionRemoveTest.java | 3 +
.../activemq/transport/stomp/StompTelnetTest.java | 3 +
.../apache/activemq/transport/stomp/StompTest.java | 3 +
.../stomp/StompTimeStampingBrokerPluginTest.java | 3 +
.../transport/stomp/StompVirtualTopicTest.java | 3 +
.../stomp/auto/AutoStompConnectTimeoutTest.java | 3 +
.../transport/stomp/auto/StompAutoSslAuthTest.java | 4 ++
24 files changed, 133 insertions(+), 27 deletions(-)
diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml
index 0cf49143af..2f3fdd935b 100644
--- a/activemq-stomp/pom.xml
+++ b/activemq-stomp/pom.xml
@@ -28,6 +28,11 @@
<artifactId>activemq-stomp</artifactId>
<packaging>jar</packaging>
<name>ActiveMQ :: STOMP Protocol</name>
+
+ <properties>
+ <surefire.version>3.5.3</surefire.version>
+ </properties>
+
<description>The ActiveMQ STOMP Protocol Implementation</description>
<dependencies>
@@ -125,23 +130,72 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
<configuration>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
<argLine>${surefire.argLine}</argLine>
<runOrder>alphabetical</runOrder>
+ <reportFormat>plain</reportFormat>
<failIfNoTests>false</failIfNoTests>
- <systemPropertyVariables>
-
<org.apache.activemq.default.directory.prefix>target</org.apache.activemq.default.directory.prefix>
- </systemPropertyVariables>
+
<excludedGroups>org.apache.activemq.transport.stomp.ParallelTest</excludedGroups>
+ <systemPropertyVariables>
+
<org.apache.activemq.default.directory.prefix>${project.build.directory}/</org.apache.activemq.default.directory.prefix>
+ </systemPropertyVariables>
+ <consoleOutputReporter>
+ <disable>true</disable>
+ </consoleOutputReporter>
+ <statelessTestsetInfoReporter
+
implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoTreeReporter">
+ <printStacktraceOnError>true</printStacktraceOnError>
+ <printStacktraceOnFailure>true</printStacktraceOnFailure>
+ <printStdoutOnError>true</printStdoutOnError>
+ <printStdoutOnFailure>true</printStdoutOnFailure>
+ <printStderrOnError>true</printStderrOnError>
+ <printStderrOnFailure>true</printStderrOnFailure>
+ </statelessTestsetInfoReporter>
<includes>
<include>**/*Test.*</include>
</includes>
<excludes>
- <exclude>**/StompNIOSSLLoadTest.java</exclude>
+ <exclude>**/*LoadTest.java</exclude>
</excludes>
</configuration>
+ <executions>
+ <execution>
+ <id>parallel</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <!-- drop the default excludedGroups -->
+ <excludedGroups combine.self="override"/>
+ <groups>org.apache.activemq.transport.stomp.ParallelTest</groups>
+ <forkCount>2C</forkCount>
+ <reuseForks>false</reuseForks>
+
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ <failIfNoTests>false</failIfNoTests>
+ <systemPropertyVariables>
+
<org.apache.activemq.default.directory.prefix>${project.build.directory}/parallel-tests-${surefire.forkNumber}/</org.apache.activemq.default.directory.prefix>
+ <!-- when running tests in parallel in the CI (quite slow) we
need to bump the wireformat negotiation timeout (5s by default) -->
+
<org.apache.activemq.transport.wireFormatNegotiationTimeout>30000</org.apache.activemq.transport.wireFormatNegotiationTimeout>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>me.fabriciorby</groupId>
+ <artifactId>maven-surefire-junit5-tree-reporter</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
index ea65b60b13..1e5441b54d 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ConnectTest.java
@@ -34,10 +34,12 @@ 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;
// https://issues.apache.org/jira/browse/AMQ-3393
+@Category(ParallelTest.class)
public class ConnectTest {
private static final Logger LOG =
LoggerFactory.getLogger(ConnectTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/LegacyFrameTranslatorTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/LegacyFrameTranslatorTest.java
index bdcfceb7fb..b3db398a48 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/LegacyFrameTranslatorTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/LegacyFrameTranslatorTest.java
@@ -26,6 +26,7 @@ import java.util.UUID;
import org.apache.activemq.command.ActiveMQDestination;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -33,6 +34,7 @@ import org.mockito.stubbing.Answer;
/**
* Tests for conversion capabilities of LegacyFrameTranslator
*/
+@Category(ParallelTest.class)
public class LegacyFrameTranslatorTest {
private ProtocolConverter converter;
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompFrameTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ParallelTest.java
similarity index 56%
copy from
activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompFrameTest.java
copy to
activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ParallelTest.java
index 5bade72ba9..9be27a6df1 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompFrameTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/ParallelTest.java
@@ -16,24 +16,12 @@
*/
package org.apache.activemq.transport.stomp;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import java.util.HashMap;
-
-import org.junit.Test;
-
-public class StompFrameTest {
- StompFrame underTest = new StompFrame();
-
- @Test
- public void testNoPasscodeInToString() throws Exception {
- HashMap<String, String> headers = new HashMap<String, String>();
- headers.put("userName", "bob");
- headers.put("passcode", "please");
- underTest.setHeaders(headers);
-
- assertEquals("no password present", -1,
underTest.toString().indexOf("please"));
- assertTrue("*** present", underTest.toString().indexOf("***") > 0);
- }
+/**
+ * Marker interface used with {@code @Category(ParallelTest.class)} to opt a
+ * test class or method into the {@code all-parallel} Maven profile. Only tests
+ * explicitly tagged with this category execute when the profile is enabled,
+ * which allows a gradual migration toward full parallelism.
+ */
+public interface ParallelTest {
}
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java
index 25ee20e109..a9e75f3e12 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp11Test.java
@@ -40,6 +40,9 @@ import org.slf4j.LoggerFactory;
import static org.junit.Assert.*;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class Stomp11Test extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(Stomp11Test.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp12Test.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp12Test.java
index b797472497..504a20ff97 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp12Test.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/Stomp12Test.java
@@ -34,6 +34,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class Stomp12Test extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(Stomp12Test.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompAdvisoryTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompAdvisoryTest.java
index 434744a93f..ad89847e62 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompAdvisoryTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompAdvisoryTest.java
@@ -45,6 +45,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompAdvisoryTest extends StompTestSupport {
static final String STATS_DESTINATION_PREFIX =
"ActiveMQ.Statistics.Destination";
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompCompositeDestinationTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompCompositeDestinationTest.java
index 9848f3c316..d3fced4f9a 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompCompositeDestinationTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompCompositeDestinationTest.java
@@ -39,9 +39,12 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
/**
* Tests for support of composite destination support over STOMP
*/
+@Category(ParallelTest.class)
public class StompCompositeDestinationTest extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(StompCompositeDestinationTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java
index 69fd4deb38..d88bbafe22 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompConnectTimeoutTest.java
@@ -34,10 +34,13 @@ import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
/**
* Test that connection attempts that don't send the connect performative
* get cleaned up by the inactivity monitor.
*/
+@Category(ParallelTest.class)
@RunWith(Parameterized.class)
public class StompConnectTimeoutTest extends StompTestSupport {
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java
index 5797135ad1..8b1de7299c 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompEmptyDestinationTest.java
@@ -16,12 +16,14 @@
*/
package org.apache.activemq.transport.stomp;
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.assertTrue;
-public class StompEmptyDestinationTest extends StompTestSupport{
+@Category(ParallelTest.class)
+public class StompEmptyDestinationTest extends StompTestSupport{
private static final Logger LOG =
LoggerFactory.getLogger(StompEmptyDestinationTest.class);
@Test(timeout = 60000)
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompFrameTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompFrameTest.java
index 5bade72ba9..44bb27ebec 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompFrameTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompFrameTest.java
@@ -22,7 +22,9 @@ import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(ParallelTest.class)
public class StompFrameTest {
StompFrame underTest = new StompFrame();
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompInactivityMonitorTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompInactivityMonitorTest.java
index 20f4ed9c00..66a4aad83b 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompInactivityMonitorTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompInactivityMonitorTest.java
@@ -33,9 +33,12 @@ import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
/**
* Test that the inactivity monitor works as expected.
*/
+@Category(ParallelTest.class)
@RunWith(Parameterized.class)
public class StompInactivityMonitorTest extends StompTestSupport {
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxDataSizeTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxDataSizeTest.java
index ee13da4461..83a4edf6f6 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxDataSizeTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxDataSizeTest.java
@@ -29,6 +29,9 @@ import javax.net.ssl.SSLSocketFactory;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompMaxDataSizeTest extends StompTestSupport {
private static final int TEST_MAX_DATA_SIZE = 64 * 1024;
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxFrameSizeTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxFrameSizeTest.java
index 9d4f2e7e93..34e7382949 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxFrameSizeTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMaxFrameSizeTest.java
@@ -34,6 +34,10 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+
+
+@Category(ParallelTest.class)
@RunWith(Parameterized.class)
public class StompMaxFrameSizeTest extends StompTestSupport {
@@ -273,7 +277,7 @@ public class StompMaxFrameSizeTest extends StompTestSupport
{
stompConnection.sendFrame(frame);
- StompFrame received = stompConnection.receive(5000);
+ StompFrame received = stompConnection.receive(10000);
assertNotNull(received);
assertEquals("ERROR", received.getAction());
assertTrue(received.getBody().contains("maximum frame size"));
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMissingMessageTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMissingMessageTest.java
index 2e82eea8f9..4deac42bf8 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMissingMessageTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompMissingMessageTest.java
@@ -26,6 +26,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompMissingMessageTest extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(StompMissingMessageTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompNIOSSLLargeMessageTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompNIOSSLLargeMessageTest.java
index 21e181a4f0..117420cafc 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompNIOSSLLargeMessageTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompNIOSSLLargeMessageTest.java
@@ -35,12 +35,15 @@ import javax.net.ssl.SSLSocketFactory;
import org.apache.activemq.util.DefaultTestAppender;
+import org.junit.experimental.categories.Category;
+
/**
* Testcase for AMQ-6526.
* Checks if the \<Unknown\> in the Stomp ProtocolException is replaced
* with the proper Stomp operation.
*
*/
+@Category(ParallelTest.class)
public class StompNIOSSLLargeMessageTest extends StompTestSupport {
protected static final Logger LOG =
LoggerFactory.getLogger(StompNIOSSLLargeMessageTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompPrefetchTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompPrefetchTest.java
index eefc1063e4..1a224eaee0 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompPrefetchTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompPrefetchTest.java
@@ -35,6 +35,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompPrefetchTest extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(StompPrefetchTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
index 1f69921a72..7c875681c4 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompSubscriptionRemoveTest.java
@@ -34,6 +34,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompSubscriptionRemoveTest extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(StompSubscriptionRemoveTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTelnetTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTelnetTest.java
index 487882ad19..ad3e192277 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTelnetTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTelnetTest.java
@@ -27,6 +27,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompTelnetTest extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(StompTelnetTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
index 9c82261e32..50349ec6ca 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTest.java
@@ -72,6 +72,9 @@ import
com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
import com.thoughtworks.xstream.io.xml.XppReader;
import com.thoughtworks.xstream.io.xml.xppdom.XppFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompTest extends StompTestSupport {
private static final Logger LOG = LoggerFactory.getLogger(StompTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTimeStampingBrokerPluginTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTimeStampingBrokerPluginTest.java
index 819fc453f8..b786b40b84 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTimeStampingBrokerPluginTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompTimeStampingBrokerPluginTest.java
@@ -39,6 +39,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompTimeStampingBrokerPluginTest extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(StompTimeStampingBrokerPluginTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompVirtualTopicTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompVirtualTopicTest.java
index 19a9f975ec..4daaaea050 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompVirtualTopicTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/StompVirtualTopicTest.java
@@ -38,6 +38,9 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
public class StompVirtualTopicTest extends StompTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(StompVirtualTopicTest.class);
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/AutoStompConnectTimeoutTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/AutoStompConnectTimeoutTest.java
index e7b372bc75..43914ee73e 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/AutoStompConnectTimeoutTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/AutoStompConnectTimeoutTest.java
@@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit;
import javax.net.ssl.SSLSocketFactory;
import org.apache.activemq.transport.auto.AutoTcpTransportServer;
+import org.apache.activemq.transport.stomp.ParallelTest;
import org.apache.activemq.transport.stomp.StompTestSupport;
import org.apache.activemq.util.Wait;
import org.junit.Test;
@@ -36,10 +37,12 @@ import org.junit.runners.Parameterized.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.junit.experimental.categories.Category;
/**
* Test that connection attempts that don't send the connect get cleaned by
* by the protocolDetectionTimeOut property
*/
+@Category(ParallelTest.class)
@RunWith(Parameterized.class)
public class AutoStompConnectTimeoutTest extends StompTestSupport {
diff --git
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/StompAutoSslAuthTest.java
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/StompAutoSslAuthTest.java
index 7b65596fd3..82d089667d 100644
---
a/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/StompAutoSslAuthTest.java
+++
b/activemq-stomp/src/test/java/org/apache/activemq/transport/stomp/auto/StompAutoSslAuthTest.java
@@ -34,6 +34,7 @@ import org.apache.activemq.broker.BrokerFilter;
import org.apache.activemq.broker.BrokerPlugin;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.transport.stomp.ParallelTest;
import org.apache.activemq.transport.stomp.Stomp;
import org.apache.activemq.transport.stomp.StompTestSupport;
import org.junit.Test;
@@ -41,6 +42,9 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import org.junit.experimental.categories.Category;
+
+@Category(ParallelTest.class)
@RunWith(Parameterized.class)
public class StompAutoSslAuthTest extends StompTestSupport {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
