From f58b25005ee9b3f4e5c284c2026434a5320f7c14 Mon Sep 17 00:00:00 2001 From: Jean-Louis Monteiro Date: Tue, 18 Nov 2025 22:26:13 +0100 Subject: [PATCH 1/7] AMQ-8525: improve mqtt module performances --- activemq-mqtt/pom.xml | 98 +++++++++++++++---- .../activemq/transport/mqtt/MQTTAuthTest.java | 3 +- .../transport/mqtt/MQTTCodecTest.java | 2 + .../mqtt/MQTTCompositeQueueRetainedTest.java | 3 + .../transport/mqtt/MQTTConnectTest.java | 2 + .../transport/mqtt/MQTTMaxFrameSizeTest.java | 2 + .../transport/mqtt/MQTTNIOSSLTest.java | 2 + .../activemq/transport/mqtt/MQTTNIOTest.java | 3 + .../mqtt/MQTTOverlapedSubscriptionsTest.java | 2 + .../transport/mqtt/MQTTPingReqTest.java | 2 + .../mqtt/MQTTProtocolConverterTest.java | 2 + .../activemq/transport/mqtt/MQTTSSLTest.java | 3 + .../mqtt/MQTTSubscriptionRecoveryTest.java | 2 + .../transport/mqtt/MQTTTestSupport.java | 5 +- .../MQTTVirtualTopicSubscriptionsTest.java | 2 + .../transport/mqtt/PahoMQTTNIOTest.java | 3 + .../activemq/transport/mqtt/PahoMQTTTest.java | 3 + .../mqtt/PahoVirtualTopicMQTTTest.java | 2 + .../activemq/transport/mqtt/ParallelTest.java | 27 +++++ .../mqtt/auto/MQTTAutoNioSslTest.java | 3 + .../transport/mqtt/auto/MQTTAutoNioTest.java | 3 + .../mqtt/auto/MQTTAutoSslAuthTest.java | 4 + .../transport/mqtt/auto/MQTTAutoSslTest.java | 3 + .../transport/mqtt/auto/MQTTAutoTest.java | 3 + 24 files changed, 162 insertions(+), 22 deletions(-) create mode 100644 activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/ParallelTest.java diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index b9618bd6252..d699bab9ac8 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -28,6 +28,11 @@ activemq-mqtt jar ActiveMQ :: MQTT Protocol + + + 3.5.3 + + The ActiveMQ MQTT Protocol Implementation @@ -198,24 +203,6 @@ - - maven-surefire-plugin - - 1 - false - ${surefire.argLine} - alphabetical - - target - - - - **/PahoMQTNioTTest.java - - - org.apache.activemq.protobuf activemq-protobuf @@ -293,6 +280,81 @@ + + all-parallel + + true + + activemq.tests + parallel + + + + 2C + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + true + + + + parallel + test + + test + + + false + ${parallel.tests.fork.count} + false + 600 + balanced + false + org.apache.activemq.transport.mqtt.ParallelTest + + true + ${project.build.directory}/parallel-tests-${surefire.forkNumber}/ + true + false + + + + + serial + test + + test + + + false + balanced + false + org.apache.activemq.transport.mqtt.ParallelTest + + true + ${project.build.directory}/ + true + false + + + + + + + org.apache.maven.surefire + surefire-junit47 + ${surefire.version} + + + + + + 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 a7c790e7b3b..96acd0e6c43 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.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 49722d8eecf..c68a0bcc6b0 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 @@ -39,12 +39,14 @@ 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 2f7e7d7853a..0bb23dd0891 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.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 59f122dc9ca..91bf14367d2 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 @@ -41,10 +41,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.junit.experimental.categories.Category; /** * 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 e5282b31ad5..73b304d9862 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.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 b6dd9f91581..16ffe9077ed 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,6 +16,8 @@ */ package org.apache.activemq.transport.mqtt; +import org.junit.experimental.categories.Category; + /** * Run the basic tests with the NIO Transport. */ 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 abb5d6c4b82..9bb4b0ee9ac 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 6d75ab7e067..c550f683923 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.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 7e8f070c6ea..fc27ead4ee1 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.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 c445f924ac8..b21577aa73d 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.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 609c49d225b..8b41e0d2894 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 0b7f9581797..3696c399697 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.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/MQTTTestSupport.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTestSupport.java index 881ad634243..4c23cee7eee 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.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 @@ protected BrokerService createBroker(boolean deleteAllMessages) throws Exception 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 d84ce894c1f..c7d601bb10b 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.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 @@ /** * 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/PahoMQTTNIOTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/PahoMQTTNIOTest.java index 88c8780df87..b5102bd5236 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 362ded3dcc1..1c010d745d2 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.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 be9e8b3361d..1c3b527bc09 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.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 00000000000..dfeb9081264 --- /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 e777385f1b8..2db79bd928e 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 f7023a3ba04..55fe032f0c1 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 4fae9c44c68..d2d731fa9a0 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.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 e31f49495b5..0d490e1f122 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 7471f6e38f6..dcdf265df4a 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 From 03f1174e58bac327d6339a5d2f83ca42cc8dc82c Mon Sep 17 00:00:00 2001 From: Jean-Louis Monteiro Date: Wed, 19 Nov 2025 10:53:55 +0100 Subject: [PATCH 2/7] AMQ-8525: fix parallel execution of MQTT tests --- activemq-mqtt/pom.xml | 2 ++ .../org/apache/activemq/transport/mqtt/MQTTConnectTest.java | 2 -- .../activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index d699bab9ac8..cc483c179d0 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -321,6 +321,8 @@ ${project.build.directory}/parallel-tests-${surefire.forkNumber}/ true false + + 20000 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 91bf14367d2..59f122dc9ca 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 @@ -41,12 +41,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.junit.experimental.categories.Category; /** * 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/auto/MQTTAutoNioSslTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java index 2db79bd928e..e777385f1b8 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,13 +17,10 @@ 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 From 5cb10dd5fd623faf2ae7c02f12769153beb746c9 Mon Sep 17 00:00:00 2001 From: Jean-Louis Monteiro Date: Fri, 21 Nov 2025 19:03:52 +0100 Subject: [PATCH 3/7] AMQ-8525: Now that it worked, remove the skipTests flag so command line arguments are used --- activemq-mqtt/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index cc483c179d0..49b169e418b 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -309,7 +309,6 @@ test - false ${parallel.tests.fork.count} false 600 @@ -333,7 +332,6 @@ test - false balanced false org.apache.activemq.transport.mqtt.ParallelTest From e6e4f41e40ebec207a7ea47ea352a0e0480629a9 Mon Sep 17 00:00:00 2001 From: Jean-Louis Monteiro Date: Mon, 24 Nov 2025 13:57:12 +0100 Subject: [PATCH 4/7] AMQ-8525: Final review of eligible tests for parallel execution. --- .../org/apache/activemq/transport/mqtt/MQTTNIOSSLTest.java | 1 + .../java/org/apache/activemq/transport/mqtt/MQTTWillTest.java | 2 ++ .../activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java | 3 +++ 3 files changed, 6 insertions(+) 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 16ffe9077ed..e634f0da1af 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 @@ -21,6 +21,7 @@ /** * 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/MQTTWillTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTWillTest.java index 0c81c5a47ef..48f955b2808 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 @@ 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/auto/MQTTAutoNioSslTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/auto/MQTTAutoNioSslTest.java index e777385f1b8..2db79bd928e 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 From dca934e7127abbb6332f7ab920bb59ae149f872b Mon Sep 17 00:00:00 2001 From: Jean-Louis Monteiro Date: Mon, 24 Nov 2025 13:57:30 +0100 Subject: [PATCH 5/7] AMQ-8525: Add better reporting for parallel execution --- activemq-mqtt/pom.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index 49b169e418b..b045c6d1b66 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -323,6 +323,19 @@ 20000 + plain + + true + + + true + true + true + true + true + true + @@ -341,6 +354,19 @@ true false + plain + + true + + + true + true + true + true + true + true + @@ -350,6 +376,11 @@ surefire-junit47 ${surefire.version} + + me.fabriciorby + maven-surefire-junit5-tree-reporter + 1.5.1 + From 187db01577273ea9b858d8f862b1cb91c0b0d838 Mon Sep 17 00:00:00 2001 From: Jean-Louis Monteiro Date: Tue, 25 Nov 2025 15:33:44 +0100 Subject: [PATCH 6/7] AMQ-8525: All stable and green, merging back into default configuration without profile need --- activemq-mqtt/pom.xml | 184 ++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 106 deletions(-) diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index b045c6d1b66..334b2f6ac5d 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -203,6 +203,84 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + ${surefire.argLine} + alphabetical + plain + + true + true + false + + + true + + + true + true + true + true + true + true + + + **/PahoMQTNioTTest.java + + + + + parallel + test + + test + + + ${parallel.tests.fork.count} + false + 600 + false + org.apache.activemq.transport.mqtt.ParallelTest + + ${project.build.directory}/parallel-tests-${surefire.forkNumber}/ + + 20000 + + + + + serial + test + + test + + + false + org.apache.activemq.transport.mqtt.ParallelTest + + ${project.build.directory}/ + + + + + + + org.apache.maven.surefire + surefire-junit47 + ${surefire.version} + + + me.fabriciorby + maven-surefire-junit5-tree-reporter + 1.5.1 + + + + org.apache.activemq.protobuf activemq-protobuf @@ -280,112 +358,6 @@ - - all-parallel - - true - - activemq.tests - parallel - - - - 2C - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - true - - - - parallel - test - - test - - - ${parallel.tests.fork.count} - false - 600 - balanced - false - org.apache.activemq.transport.mqtt.ParallelTest - - true - ${project.build.directory}/parallel-tests-${surefire.forkNumber}/ - true - false - - 20000 - - plain - - true - - - true - true - true - true - true - true - - - - - serial - test - - test - - - balanced - false - org.apache.activemq.transport.mqtt.ParallelTest - - true - ${project.build.directory}/ - true - false - - plain - - true - - - true - true - true - true - true - true - - - - - - - org.apache.maven.surefire - surefire-junit47 - ${surefire.version} - - - me.fabriciorby - maven-surefire-junit5-tree-reporter - 1.5.1 - - - - - - From 88d1d585657ea8403448eb618121724da0289516 Mon Sep 17 00:00:00 2001 From: Jean-Louis Monteiro Date: Tue, 25 Nov 2025 17:07:45 +0100 Subject: [PATCH 7/7] AMQ-8525: Clean up configuration and move remaining tests to parallel execution --- activemq-mqtt/pom.xml | 25 ++++++------------- .../transport/mqtt/MQTTConnectTest.java | 2 ++ .../activemq/transport/mqtt/MQTTTest.java | 4 +++ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index 334b2f6ac5d..5542b038e8b 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -211,10 +211,13 @@ ${surefire.argLine} alphabetical plain + false + org.apache.activemq.transport.mqtt.ParallelTest true true false + ${project.build.directory}/ true @@ -239,12 +242,14 @@ test - - ${parallel.tests.fork.count} + + + + org.apache.activemq.transport.mqtt.ParallelTest + 2C false 600 false - org.apache.activemq.transport.mqtt.ParallelTest ${project.build.directory}/parallel-tests-${surefire.forkNumber}/ @@ -252,20 +257,6 @@ - - serial - test - - test - - - false - org.apache.activemq.transport.mqtt.ParallelTest - - ${project.build.directory}/ - - - 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 59f122dc9ca..f3e89af8ddd 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.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 @@ * 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/MQTTTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTTest.java index 7cf1523beef..b75b0499b9d 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 @@ -65,9 +65,13 @@ 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);