ARTEMIS-5035 Change some tests to use a random choice for protocol

apache · Sep 5, 2024 · daba842 · daba842
1 parent 8b265f4
commit daba842
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 51 deletions.
diff --git a/...s-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/...s-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -229,13 +229,12 @@ protected void clearServers() {
    public ActiveMQTestBase() {
 
    }
-
    protected static String randomProtocol() {
       String[] protocols = {"AMQP", "OPENWIRE", "CORE"};
-
-      return protocols[org.apache.activemq.artemis.tests.util.RandomUtil.randomPositiveInt() % 3];
+      String protocol = protocols[org.apache.activemq.artemis.tests.util.RandomUtil.randomPositiveInt() % 3];
+      logger.info("Selecting {} protocol", protocol);
+      return protocol;
    }
-
    protected <T> T serialClone(Object object) throws Exception {
       logger.debug("object::{}", object);
       ByteArrayOutputStream bout = new ByteArrayOutputStream();
@@ -247,7 +246,6 @@ protected <T> T serialClone(Object object) throws Exception {
       return (T) obinp.readObject();
 
    }
-
    @AfterEach
    public void tearDown() throws Exception {
       try {

diff --git a/...ava/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java b/...ava/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java
@@ -155,13 +155,8 @@ private void transactSend(Session session, MessageProducer producer, int initial
 
 
    @Test
-   public void testAMQP() throws Exception {
-      testACKs("AMQP");
-   }
-
-   @Test
-   public void testCORE() throws Exception {
-      testACKs("CORE");
+   public void testRandomProtocol() throws Exception {
+      testACKs(randomProtocol());
    }
 
    private void testACKs(final String protocol) throws Exception {

diff --git a/...ache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java b/...ache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java
@@ -145,15 +145,10 @@ public void cleanupServers() {
 
    @Test
    @Timeout(240)
-   public void testAMQP() throws Exception {
-      testInterrupt("AMQP");
+   public void testRandomProtocol() throws Exception {
+      testInterrupt(randomProtocol());
    }
 
-   @Test
-   @Timeout(240)
-   public void testCORE() throws Exception {
-      testInterrupt("CORE");
-   }
 
    private void preCreateInternalQueues(String serverLocation) throws Exception {
       Configuration configuration = createDefaultConfig(0, false);

diff --git a/...java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java b/...java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java
@@ -123,19 +123,8 @@ public void cleanupServers() {
 
    @Test
    @Timeout(240)
-   public void testAMQP() throws Exception {
-      testAccumulateAndSend("AMQP");
-   }
-
-   @Test
-   @Timeout(240)
-   public void testCORE() throws Exception {
-      testAccumulateAndSend("CORE");
-   }
-
-   @Test
-   public void testOpenWire() throws Exception {
-      testAccumulateAndSend("OPENWIRE");
+   public void testRandomProtocol() throws Exception {
+      testAccumulateAndSend(randomProtocol());
    }
 
    private void testAccumulateAndSend(final String protocol) throws Exception {

diff --git a/...sts/src/test/java/org/apache/activemq/artemis/tests/soak/client/LargeMessageSoakTest.java b/...sts/src/test/java/org/apache/activemq/artemis/tests/soak/client/LargeMessageSoakTest.java
@@ -58,18 +58,8 @@ public void setUp() throws Exception {
    }
 
    @Test
-   public void testAMQP() throws Exception {
-      testSendReceive("AMQP");
-   }
-
-   @Test
-   public void testCORE() throws Exception {
-      testSendReceive("CORE");
-   }
-
-   @Test
-   public void testOpenWire() throws Exception {
-      testSendReceive("OPENWIRE");
+   public void testRandomProtocol() throws Exception {
+      testSendReceive(randomProtocol());
    }
 
    public void testSendReceive(String protocol) throws Exception {

diff --git a/...ests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java b/...ests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
@@ -124,13 +124,8 @@ public void before() throws Exception {
 
 
    @Test
-   public void testM_and_M_AMQP() throws Exception {
-      test_M_and_M_Sorting( "AMQP", 2000, 2, 2, 500);
-   }
-
-   @Test
-   public void testM_and_M_CORE() throws Exception {
-      test_M_and_M_Sorting( "CORE", 2000, 2, 2, 500);
+   public void testM_and_M_RandomProtocol() throws Exception {
+      test_M_and_M_Sorting(randomProtocol(), 2000, 2, 2, 500);
    }
 
    public void test_M_and_M_Sorting(String protocol, int batchSize, int restarts, int clientRuns, int killClientEveryX) throws Exception {