diff --git a/Jenkinsfile b/Jenkinsfile index 100a3b8c73..9ba319f38a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -130,6 +130,7 @@ pipeline { } when { expression { return params.testsEnabled } } steps { + echo 'Running tests' sh 'java -version' sh 'mvn -version' diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index 4a40d05a33..d3ef536fc4 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -28,6 +28,7 @@ activemq-mqtt jar ActiveMQ :: MQTT Protocol + The ActiveMQ MQTT Protocol Implementation @@ -215,17 +216,54 @@ 1 -javaagent:${org.mockito:mockito-core:jar} alphabetical - - target - - - - **/PahoMQTNioTTest.java - + plain + org.apache.activemq.transport.mqtt.ParallelTest + + true + true + false + ${project.build.directory}/ + + + true + + + true + true + true + true + true + true + + + **/PahoMQTNioTTest.java + + + + parallel + test + + test + + + + + org.apache.activemq.transport.mqtt.ParallelTest + 2C + false + 600 + + ${project.build.directory}/parallel-tests-${surefire.forkNumber}/ + + 20000 + + + + + org.apache.activemq.protobuf activemq-protobuf diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTAuthTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTAuthTest.java index a7c790e7b3..96acd0e6c4 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTAuthTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTAuthTest.java @@ -47,15 +47,16 @@ import org.fusesource.mqtt.client.Tracer; import org.fusesource.mqtt.codec.CONNACK; import org.fusesource.mqtt.codec.MQTTFrame; 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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Tests various use cases that require authentication or authorization over MQTT */ +@Category(ParallelTest.class) @RunWith(Parameterized.class) public class MQTTAuthTest extends MQTTAuthTestSupport { diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java index 994bff4e67..62f367aa7b 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCodecTest.java @@ -41,12 +41,14 @@ import org.fusesource.mqtt.codec.SUBSCRIBE; import org.fusesource.mqtt.codec.UNSUBSCRIBE; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * Tests the functionality of the MQTTCodec class. */ +@Category(ParallelTest.class) public class MQTTCodecTest { private static final Logger LOG = LoggerFactory.getLogger(MQTTCodecTest.class); diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCompositeQueueRetainedTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCompositeQueueRetainedTest.java index 2f7e7d7853..0bb23dd089 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCompositeQueueRetainedTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTCompositeQueueRetainedTest.java @@ -42,9 +42,12 @@ import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.util.ByteSequence; import org.junit.Test; +import org.junit.experimental.categories.Category; + /** * */ +@Category(ParallelTest.class) public class MQTTCompositeQueueRetainedTest extends MQTTTestSupport { // configure composite topic diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java index 59f122dc9c..f3e89af8dd 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTConnectTest.java @@ -35,6 +35,7 @@ import org.fusesource.mqtt.client.MQTT; import org.junit.After; import org.junit.Ignore; 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; @@ -45,6 +46,7 @@ import org.slf4j.LoggerFactory; * Test that connection attempts that don't send a CONNECT frame will * get cleaned up by the inactivity monitor. */ +@Category(ParallelTest.class) @RunWith(Parameterized.class) public class MQTTConnectTest extends MQTTTestSupport { diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTMaxFrameSizeTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTMaxFrameSizeTest.java index e5282b31ad..73b304d986 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTMaxFrameSizeTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTMaxFrameSizeTest.java @@ -31,9 +31,11 @@ import org.junit.runners.Parameterized.Parameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.junit.experimental.categories.Category; /** * Test that the maxFrameSize configuration value is applied across the transports. */ +@Category(ParallelTest.class) @RunWith(Parameterized.class) public class MQTTMaxFrameSizeTest extends MQTTTestSupport { diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOSSLTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOSSLTest.java index b6dd9f9158..e634f0da1a 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOSSLTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOSSLTest.java @@ -16,9 +16,12 @@ */ package org.apache.activemq.transport.mqtt; +import org.junit.experimental.categories.Category; + /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTNIOSSLTest extends MQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOTest.java index abb5d6c4b8..9bb4b0ee9a 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTNIOTest.java @@ -16,9 +16,12 @@ */ package org.apache.activemq.transport.mqtt; +import org.junit.experimental.categories.Category; + /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTNIOTest extends MQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTOverlapedSubscriptionsTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTOverlapedSubscriptionsTest.java index 6d75ab7e06..c550f68392 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTOverlapedSubscriptionsTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTOverlapedSubscriptionsTest.java @@ -29,7 +29,9 @@ import org.fusesource.mqtt.client.Topic; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(ParallelTest.class) public class MQTTOverlapedSubscriptionsTest { private BrokerService brokerService; diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTPingReqTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTPingReqTest.java index 7e8f070c6e..fc27ead4ee 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTPingReqTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTPingReqTest.java @@ -52,10 +52,12 @@ import org.mockito.Mockito; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.junit.experimental.categories.Category; /** * Test to show that a PINGRESP will only be sent for a PINGREQ * packet after a CONNECT packet has been received. */ +@Category(ParallelTest.class) @RunWith(Parameterized.class) public class MQTTPingReqTest extends MQTTTestSupport { diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverterTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverterTest.java index 3a1fd20d8f..0f1c93d336 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverterTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverterTest.java @@ -37,12 +37,14 @@ import org.fusesource.mqtt.codec.CONNECT; import org.fusesource.mqtt.codec.MQTTFrame; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; /** * Tests for various usage scenarios of the protocol converter */ +@Category(ParallelTest.class) public class MQTTProtocolConverterTest { private MQTTTransport transport; diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java index 609c49d225..8b41e0d289 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSSLTest.java @@ -16,9 +16,12 @@ */ package org.apache.activemq.transport.mqtt; +import org.junit.experimental.categories.Category; + /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTSSLTest extends MQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSubscriptionRecoveryTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSubscriptionRecoveryTest.java index 0b7f958179..3696c39969 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSubscriptionRecoveryTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTSubscriptionRecoveryTest.java @@ -34,9 +34,11 @@ import org.junit.runners.Parameterized.Parameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.junit.experimental.categories.Category; /** * Test that all previous QoS 2 subscriptions are recovered on Broker restart. */ +@Category(ParallelTest.class) @RunWith(Parameterized.class) public class MQTTSubscriptionRecoveryTest extends MQTTTestSupport { diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java index b067f4a382..1f95b03e8d 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java @@ -66,9 +66,13 @@ import org.fusesource.mqtt.client.Tracer; import org.fusesource.mqtt.codec.MQTTFrame; import org.fusesource.mqtt.codec.PUBLISH; import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Category(ParallelTest.class) public class MQTTTest extends MQTTTestSupport { private static final Logger LOG = LoggerFactory.getLogger(MQTTTest.class); diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTestSupport.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTestSupport.java index 881ad63424..4c23cee7ee 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTestSupport.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTestSupport.java @@ -39,6 +39,7 @@ import org.apache.activemq.broker.jmx.QueueViewMBean; import org.apache.activemq.broker.jmx.TopicViewMBean; import org.apache.activemq.store.kahadb.KahaDBStore; import org.apache.activemq.transport.mqtt.util.ResourceLoadingSslContext; +import org.apache.activemq.util.IOHelper; import org.fusesource.mqtt.client.MQTT; import org.fusesource.mqtt.client.Tracer; import org.fusesource.mqtt.codec.MQTTFrame; @@ -53,8 +54,6 @@ public class MQTTTestSupport { private static final Logger LOG = LoggerFactory.getLogger(MQTTTestSupport.class); - public static final String KAHADB_DIRECTORY = "target/activemq-data/"; - protected BrokerService brokerService; protected int port; protected String jmsUri = "vm://localhost"; @@ -143,7 +142,7 @@ public class MQTTTestSupport { brokerService.setPersistent(isPersistent()); if (isPersistent()) { KahaDBStore kaha = new KahaDBStore(); - kaha.setDirectory(new File(KAHADB_DIRECTORY + getTestName())); + kaha.setDirectory(new File(IOHelper.getDefaultDataDirectory() + "/" + getTestName())); brokerService.setPersistenceAdapter(kaha); } brokerService.setAdvisorySupport(advisorySupport); diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java index d84ce894c1..c7d601bb10 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java @@ -42,6 +42,7 @@ import org.fusesource.mqtt.client.QoS; import org.fusesource.mqtt.client.Topic; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,6 +56,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTVirtualTopicSubscriptionsTest extends MQTTTest { private static final Logger LOG = LoggerFactory.getLogger(MQTTVirtualTopicSubscriptionsTest.class); diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTWillTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTWillTest.java index 0c81c5a47e..48f955b280 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTWillTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTWillTest.java @@ -18,12 +18,14 @@ package org.apache.activemq.transport.mqtt; import org.fusesource.mqtt.client.*; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.concurrent.TimeUnit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +@Category(ParallelTest.class) public class MQTTWillTest extends MQTTTestSupport { @Test(timeout = 60 * 1000) diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTNIOTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTNIOTest.java index 88c8780df8..b5102bd523 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTNIOTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTNIOTest.java @@ -16,9 +16,12 @@ */ package org.apache.activemq.transport.mqtt; +import org.junit.experimental.categories.Category; + /** * Test the NIO transport with this Test group */ +@Category(ParallelTest.class) public class PahoMQTTNIOTest extends PahoMQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTTest.java index 362ded3dcc..1c010d745d 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTTest.java @@ -47,6 +47,9 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.junit.experimental.categories.Category; + +@Category(ParallelTest.class) public class PahoMQTTTest extends MQTTTestSupport { private static final Logger LOG = LoggerFactory.getLogger(PahoMQTTTest.class); diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoVirtualTopicMQTTTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoVirtualTopicMQTTTest.java index be9e8b3361..1c3b527bc0 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoVirtualTopicMQTTTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoVirtualTopicMQTTTest.java @@ -22,12 +22,14 @@ import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import jakarta.jms.MessageConsumer; import jakarta.jms.Session; import static org.junit.Assert.assertEquals; +@Category(ParallelTest.class) public class PahoVirtualTopicMQTTTest extends PahoMQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/ParallelTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/ParallelTest.java new file mode 100644 index 0000000000..dfeb908126 --- /dev/null +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/ParallelTest.java @@ -0,0 +1,27 @@ +/** + * 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.transport.mqtt; + + +/** + * 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-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java index e777385f1b..2db79bd928 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java @@ -17,10 +17,13 @@ package org.apache.activemq.transport.mqtt.auto; import org.apache.activemq.transport.mqtt.MQTTTest; +import org.apache.activemq.transport.mqtt.ParallelTest; +import org.junit.experimental.categories.Category; /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTAutoNioSslTest extends MQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioTest.java index f7023a3ba0..55fe032f0c 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioTest.java @@ -17,10 +17,13 @@ package org.apache.activemq.transport.mqtt.auto; import org.apache.activemq.transport.mqtt.MQTTTest; +import org.apache.activemq.transport.mqtt.ParallelTest; +import org.junit.experimental.categories.Category; /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTAutoNioTest extends MQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslAuthTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslAuthTest.java index 4fae9c44c6..d2d731fa9a 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslAuthTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslAuthTest.java @@ -36,6 +36,10 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.junit.experimental.categories.Category; +import org.apache.activemq.transport.mqtt.ParallelTest; + +@Category(ParallelTest.class) @RunWith(Parameterized.class) public class MQTTAutoSslAuthTest extends MQTTTestSupport { diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslTest.java index e31f49495b..0d490e1f12 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoSslTest.java @@ -17,10 +17,13 @@ package org.apache.activemq.transport.mqtt.auto; import org.apache.activemq.transport.mqtt.MQTTTest; +import org.apache.activemq.transport.mqtt.ParallelTest; +import org.junit.experimental.categories.Category; /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTAutoSslTest extends MQTTTest { @Override diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoTest.java index 7471f6e38f..dcdf265df4 100644 --- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoTest.java +++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoTest.java @@ -17,10 +17,13 @@ package org.apache.activemq.transport.mqtt.auto; import org.apache.activemq.transport.mqtt.MQTTTest; +import org.apache.activemq.transport.mqtt.ParallelTest; +import org.junit.experimental.categories.Category; /** * Run the basic tests with the NIO Transport. */ +@Category(ParallelTest.class) public class MQTTAutoTest extends MQTTTest { @Override diff --git a/pom.xml b/pom.xml index 58a3aaf78a..aebbf31047 100644 --- a/pom.xml +++ b/pom.xml @@ -137,6 +137,7 @@ 1.45 3.9.12 3.5.3 + 1.5.1 * org.apache.activemq* @@ -974,6 +975,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${maven-surefire-plugin-version} true 1 @@ -992,6 +994,18 @@ **/load/* + + + org.apache.maven.surefire + surefire-junit47 + ${maven-surefire-plugin-version} + + + me.fabriciorby + maven-surefire-junit5-tree-reporter + ${maven-surefire-junit5-tree-reporter-version} + + org.apache.felix