diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml index 74c1308c619..fa52a653b2d 100644 --- a/tests/compatibility-tests/pom.xml +++ b/tests/compatibility-tests/pom.xml @@ -394,7 +394,7 @@ dependency-scan - 263-check + 2_6_3-check org.apache.activemq:artemis-jms-server:2.6.3 @@ -408,7 +408,7 @@ org.apache.activemq.tests:compatibility-tests:${project.version} - ${basedir}/target/ARTEMIS-263.cp + ${basedir}/target/ARTEMIS-2_6_3.cp @@ -416,7 +416,7 @@ dependency-scan - 270-check + 2_7_0-check org.apache.activemq:artemis-jms-server:2.7.0 @@ -430,7 +430,7 @@ org.apache.activemq.tests:compatibility-tests:${project.version} - ${basedir}/target/ARTEMIS-270.cp + ${basedir}/target/ARTEMIS-2_7_0.cp @@ -579,7 +579,7 @@ dependency-scan - 240-check + 2_4_0-check org.apache.activemq:artemis-jms-server:2.4.0 @@ -594,7 +594,7 @@ org.apache.activemq.tests:compatibility-tests:${project.version} - ${basedir}/target/ARTEMIS-240.cp + ${basedir}/target/ARTEMIS-2_4_0.cp @@ -602,7 +602,7 @@ dependency-scan - 210-check + 2_1_0-check org.apache.activemq:artemis-jms-server:2.1.0 @@ -617,11 +617,11 @@ org.apache.activemq.tests:compatibility-tests:${project.version} - ${basedir}/target/ARTEMIS-210.cp + ${basedir}/target/ARTEMIS-2_1_0.cp - 140-check + 1_4_0-check compile dependency-scan @@ -639,11 +639,11 @@ org.apache.activemq.tests:compatibility-tests:${project.version} - ${basedir}/target/ARTEMIS-140.cp + ${basedir}/target/ARTEMIS-1_4_0.cp - hornetq-235 + hornetq-2_3_5 compile dependency-scan @@ -662,11 +662,11 @@ org.apache.activemq.tests:compatibility-tests:${project.version} - ${basedir}/target/HORNETQ-235.cp + ${basedir}/target/HORNETQ-2_3_5.cp - hornetq-247 + hornetq-2_4_7 compile dependency-scan @@ -685,12 +685,12 @@ org.apache.activemq.tests:compatibility-tests:${project.version} - ${basedir}/target/HORNETQ-247.cp + ${basedir}/target/HORNETQ-2_4_7.cp - openwire-5.11 + AMQ-5.11 compile dependency-scan diff --git a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java index 65e9b7dc13f..7fb8751bac5 100644 --- a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java +++ b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java @@ -31,19 +31,19 @@ public class GroovyRun { public static final String SNAPSHOT = "ARTEMIS-SNAPSHOT"; public static final String JAKARTAEE = "ARTEMIS-JAKARTAEE"; - public static final String ONE_FOUR = "ARTEMIS-140"; - public static final String TWO_ONE = "ARTEMIS-210"; - public static final String TWO_FOUR = "ARTEMIS-240"; - public static final String TWO_SIX_THREE = "ARTEMIS-263"; - public static final String TWO_SEVEN_ZERO = "ARTEMIS-270"; - public static final String TWO_TEN_ZERO = "ARTEMIS-2_10_0"; - public static final String TWO_SEVENTEEN_ZERO = "ARTEMIS-2_17_0"; - public static final String TWO_FOURTY_FOUR_ZERO = "ARTEMIS-2_44_0"; - public static final String TWO_TWENTYTWO_ZERO = "ARTEMIS-2_22_0"; - public static final String TWO_TWENTYEIGHT_ZERO = "ARTEMIS-2_28_0"; - public static final String TWO_THIRTYTHREE_ZERO = "ARTEMIS-2_33_0"; - public static final String HORNETQ_235 = "HORNETQ-235"; - public static final String HORNETQ_247 = "HORNETQ-247"; + public static final String ARTEMIS_1_4_0 = "ARTEMIS-1_4_0"; + public static final String ARTEMIS_2_1_0 = "ARTEMIS-2_1_0"; + public static final String ARTEMIS_2_4_0 = "ARTEMIS-2_4_0"; + public static final String ARTEMIS_2_6_3 = "ARTEMIS-2_6_3"; + public static final String ARTEMIS_2_7_0 = "ARTEMIS-2_7_0"; + public static final String ARTEMIS_2_10_0 = "ARTEMIS-2_10_0"; + public static final String ARTEMIS_2_17_0 = "ARTEMIS-2_17_0"; + public static final String ARTEMIS_2_44_0 = "ARTEMIS-2_44_0"; + public static final String ARTEMIS_2_22_0 = "ARTEMIS-2_22_0"; + public static final String ARTEMIS_2_28_0 = "ARTEMIS-2_28_0"; + public static final String ARTEMIS_2_33_0 = "ARTEMIS-2_33_0"; + public static final String HORNETQ_2_3_5 = "HORNETQ-2_3_5"; + public static final String HORNETQ_2_4_7 = "HORNETQ-2_4_7"; public static final String AMQ_5_11 = "AMQ_5_11"; private static Binding theBinding; diff --git a/tests/compatibility-tests/src/main/resources/prefixSendAckTest/sendAckMessages.groovy b/tests/compatibility-tests/src/main/resources/prefixSendAckTest/sendAckMessages.groovy index 03d98b939cd..c1e867784a5 100644 --- a/tests/compatibility-tests/src/main/resources/prefixSendAckTest/sendAckMessages.groovy +++ b/tests/compatibility-tests/src/main/resources/prefixSendAckTest/sendAckMessages.groovy @@ -30,7 +30,7 @@ String operation = arg[2]; String queueName -if (clientType.equals(GroovyRun.SNAPSHOT) || clientType.equals(GroovyRun.TWO_FOUR)) { +if (clientType.equals(GroovyRun.SNAPSHOT) || clientType.equals(GroovyRun.ARTEMIS_2_4_0)) { queueName = "jms.queue.queue"; } else { queueName = "queue"; diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java index 40d91104918..97ec18bda83 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,7 +43,7 @@ public class AddressConfigTest extends VersionedBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT})); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT})); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java index a66455deb14..8933bc4419a 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressPauseJournalCompatibilityTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TEN_ZERO; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_10_0; import java.util.ArrayList; import java.util.Collection; @@ -46,7 +46,7 @@ public static Collection getParameters() { if (getJavaVersion() <= 22) { // 2.10.0 server fails on JDK23+ without workarounds. - combinations.add(new Object[]{TWO_TEN_ZERO, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_2_10_0, SNAPSHOT}); } // the purpose on this one is just to validate the test itself. /// if it can't run against itself it won't work at all diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/CLIFunctionTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/CLIFunctionTest.java index fd789161607..d3570c6a7a0 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/CLIFunctionTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/CLIFunctionTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TWENTYEIGHT_ZERO; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_28_0; import java.util.ArrayList; import java.util.Collection; @@ -40,8 +40,8 @@ public class CLIFunctionTest extends ClasspathBase { @Parameters(name = "Server={0}, Client={1}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{TWO_TWENTYEIGHT_ZERO, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, TWO_TWENTYEIGHT_ZERO}); + combinations.add(new Object[]{ARTEMIS_2_28_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_28_0}); // this is to validate the test combinations.add(new Object[]{SNAPSHOT, SNAPSHOT}); return combinations; diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java index ff5b1324613..f91d5c5c670 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java @@ -17,9 +17,9 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; import java.io.File; import java.util.ArrayList; @@ -42,7 +42,7 @@ public class ConnectionFactoryConfigurationSerializationTest extends VersionedBa public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.addAll(combinatory2(SNAPSHOT, new Object[]{ONE_FOUR, SNAPSHOT, TWO_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT, TWO_FOUR})); + combinations.addAll(combinatory2(SNAPSHOT, new Object[]{ARTEMIS_1_4_0, SNAPSHOT, ARTEMIS_2_4_0}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT, ARTEMIS_2_4_0})); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java index c8c98c4fe27..d8b11f2d098 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java @@ -17,9 +17,9 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_44_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.util.ArrayList; import java.util.Collection; @@ -47,7 +47,8 @@ public static Collection getParameters() { // if we keep testing current one against 2.4 and 1.4.. we are sure the wire and API won't change over time List combinations = new ArrayList<>(); - combinations.add(new Object[]{ONE_FOUR, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_1_4_0, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_2_44_0, SNAPSHOT}); combinations.add(new Object[]{SNAPSHOT, SNAPSHOT}); return combinations; } @@ -91,13 +92,12 @@ public void testSendReceivelegacy() throws Throwable { // makes no sense on snapshot boolean isSenderSnapshot = SNAPSHOT.equals(sender); skipTearDownCleanup = isSenderSnapshot; - assumeFalse(isSenderSnapshot, "This test only applies to old version senders"); - internalSendReceive(true); } public void internalSendReceive(boolean legacyPrefixes) throws Throwable { - setVariable(senderClassloader, "legacy", false); + // if using 2.44.0 both producer and consumer needs to use legacyPrefixes in this case. + setVariable(senderClassloader, "legacy", !sender.equals(ARTEMIS_1_4_0) && legacyPrefixes); setVariable(senderClassloader, "persistent", true); if (legacyPrefixes) { serverScriptToUse = "exportimport/artemisServer.groovy"; diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java index ab1113e5f15..72897d55f2c 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java @@ -18,10 +18,10 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_ONE; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_SEVEN_ZERO; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_SIX_THREE; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_1_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_7_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_6_3; import java.util.ArrayList; import java.util.Collection; @@ -44,10 +44,10 @@ public static Collection getParameters() { List combinations = new ArrayList<>(); // FQQN was added into 2.7.0, hence we only test the server as SNAPSHOT or TWO_SEVEN_ZERO - List testsList = combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{SNAPSHOT, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO}); + List testsList = combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{SNAPSHOT, ARTEMIS_2_4_0, ARTEMIS_2_1_0, ARTEMIS_2_6_3, ARTEMIS_2_7_0}, new Object[]{SNAPSHOT, ARTEMIS_2_4_0, ARTEMIS_2_1_0, ARTEMIS_2_6_3, ARTEMIS_2_7_0}); if (getJavaVersion() <= 22) { // 2.7.0 server fails on JDK23+ without workarounds. - addCombinations(testsList, SNAPSHOT, new Object[] {TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_SEVEN_ZERO}); + addCombinations(testsList, SNAPSHOT, new Object[] {ARTEMIS_2_7_0}, new Object[]{SNAPSHOT, ARTEMIS_2_7_0}, new Object[]{SNAPSHOT, ARTEMIS_2_7_0}); } return testsList; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQClientTopologyTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQClientTopologyTest.java index 62dd8871c23..2136068a6f1 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQClientTopologyTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQClientTopologyTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_235; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_3_5; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import org.apache.activemq.artemis.tests.compatibility.base.VersionedBase; @@ -44,7 +44,7 @@ public class HQClientTopologyTest extends VersionedBase { public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, HORNETQ_235, HORNETQ_235}); + combinations.add(new Object[]{SNAPSHOT, HORNETQ_2_3_5, HORNETQ_2_3_5}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQFailoverTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQFailoverTest.java index 9f7f331b2c2..b61735a6f0f 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQFailoverTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQFailoverTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_235; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_3_5; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -54,7 +54,7 @@ public class HQFailoverTest extends VersionedBase { public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{HORNETQ_235, SNAPSHOT, SNAPSHOT}); + combinations.add(new Object[]{HORNETQ_2_3_5, SNAPSHOT, SNAPSHOT}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java index f8802471bd3..08d225f867c 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQLargeMeshTest.java @@ -17,8 +17,8 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_235; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_3_5; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_4_7; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import java.util.ArrayList; @@ -39,10 +39,10 @@ public class HQLargeMeshTest extends VersionedBase { public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, HORNETQ_247, HORNETQ_247}); - combinations.add(new Object[]{SNAPSHOT, HORNETQ_235, HORNETQ_247}); - combinations.add(new Object[]{SNAPSHOT, HORNETQ_247, HORNETQ_235}); - combinations.add(new Object[]{SNAPSHOT, HORNETQ_235, HORNETQ_235}); + combinations.add(new Object[]{SNAPSHOT, HORNETQ_2_4_7, HORNETQ_2_4_7}); + combinations.add(new Object[]{SNAPSHOT, HORNETQ_2_3_5, HORNETQ_2_4_7}); + combinations.add(new Object[]{SNAPSHOT, HORNETQ_2_4_7, HORNETQ_2_3_5}); + combinations.add(new Object[]{SNAPSHOT, HORNETQ_2_3_5, HORNETQ_2_3_5}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java index 6a862bf704c..e199991fc23 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQSelectorTest.java @@ -17,8 +17,8 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_235; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_3_5; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_4_7; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import java.util.ArrayList; @@ -38,8 +38,8 @@ public class HQSelectorTest extends VersionedBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, HORNETQ_247, HORNETQ_247}); - combinations.add(new Object[]{SNAPSHOT, HORNETQ_235, HORNETQ_235}); + combinations.add(new Object[]{SNAPSHOT, HORNETQ_2_4_7, HORNETQ_2_4_7}); + combinations.add(new Object[]{SNAPSHOT, HORNETQ_2_3_5, HORNETQ_2_3_5}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java index a0b3fb8e9b0..c56afb55c89 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java @@ -17,8 +17,8 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_235; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_3_5; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -43,8 +43,8 @@ public class HornetQSoakTest extends ClasspathBase { public void setUp() throws Throwable { this.artemisClassLoader = getClasspath(SNAPSHOT); - this.artemis1XClassLoader = getClasspath(ONE_FOUR); - this.hornetqClassLoader = getClasspath(HORNETQ_235); + this.artemis1XClassLoader = getClasspath(ARTEMIS_1_4_0); + this.hornetqClassLoader = getClasspath(HORNETQ_2_3_5); FileUtil.deleteDirectory(serverFolder); setVariable(artemisClassLoader, "persistent", Boolean.FALSE); diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java index 1da5e431ecc..4379a6148d9 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.JAKARTAEE; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,15 +43,15 @@ public class JmsReplyToQueueTest extends VersionedBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_1_4_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ARTEMIS_1_4_0}); combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, JAKARTAEE}); combinations.add(new Object[]{JAKARTAEE, SNAPSHOT, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, SNAPSHOT, JAKARTAEE}); - combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR}); - combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE}); + combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ARTEMIS_1_4_0}); + combinations.add(new Object[]{JAKARTAEE, ARTEMIS_1_4_0, JAKARTAEE}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempQueueTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempQueueTest.java index e3f26ea1da6..3fc532faf52 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempQueueTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempQueueTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.JAKARTAEE; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,14 +43,14 @@ public class JmsReplyToTempQueueTest extends VersionedBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_1_4_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ARTEMIS_1_4_0}); combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, JAKARTAEE}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, SNAPSHOT, JAKARTAEE}); - combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR}); - combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE}); + combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ARTEMIS_1_4_0}); + combinations.add(new Object[]{JAKARTAEE, ARTEMIS_1_4_0, JAKARTAEE}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempTopicTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempTopicTest.java index bdc0d1cfaa6..3e64fa562c1 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempTopicTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempTopicTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.JAKARTAEE; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,14 +43,14 @@ public class JmsReplyToTempTopicTest extends VersionedBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_1_4_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ARTEMIS_1_4_0}); combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, JAKARTAEE}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, SNAPSHOT, JAKARTAEE}); - combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR}); - combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE}); + combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ARTEMIS_1_4_0}); + combinations.add(new Object[]{JAKARTAEE, ARTEMIS_1_4_0, JAKARTAEE}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTopicTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTopicTest.java index ebf1d1f2d63..a555035535b 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTopicTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTopicTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.JAKARTAEE; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,14 +43,14 @@ public class JmsReplyToTopicTest extends VersionedBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_1_4_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ARTEMIS_1_4_0}); combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, JAKARTAEE}); combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, SNAPSHOT}); combinations.add(new Object[]{JAKARTAEE, SNAPSHOT, JAKARTAEE}); - combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR}); - combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE}); + combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ARTEMIS_1_4_0}); + combinations.add(new Object[]{JAKARTAEE, ARTEMIS_1_4_0, JAKARTAEE}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java index a1c7c58610e..9008aacecd3 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java @@ -18,8 +18,8 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_ONE; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_1_0; import java.util.ArrayList; import java.util.Collection; @@ -45,8 +45,8 @@ public static Collection getParameters() { // if we keep testing current one against 2.4 and 1.4.. we are sure the wire and API won't change over time List combinations = new ArrayList<>(); - combinations.add(new Object[]{TWO_ONE, SNAPSHOT}); - combinations.add(new Object[]{TWO_FOUR, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_2_1_0, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_2_4_0, SNAPSHOT}); // the purpose on this one is just to validate the test itself. /// if it can't run against itself it won't work at all combinations.add(new Object[]{SNAPSHOT, SNAPSHOT}); diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/Mesh2Test.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/Mesh2Test.java index d1416f004c4..2c6a1e7c6ba 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/Mesh2Test.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/Mesh2Test.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -46,8 +46,8 @@ public static Collection getParameters() { // if we keep testing current one against 2.4 and 1.4.. we are sure the wire and API won't change over time List combinations = new ArrayList<>(); combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR}); - combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_4_0, ARTEMIS_2_4_0}); + combinations.add(new Object[]{ARTEMIS_2_4_0, SNAPSHOT, SNAPSHOT}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java index 24f4c1eb193..8dd608345cd 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java @@ -17,12 +17,12 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_235; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_3_5; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_4_7; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TWENTYEIGHT_ZERO; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_28_0; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -45,13 +45,13 @@ public class MeshTest extends ServerBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ONE_FOUR, TWO_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FOUR, TWO_FOUR, SNAPSHOT, HORNETQ_235})); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{ONE_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT})); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_235}, new Object[]{ONE_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FOUR, SNAPSHOT, HORNETQ_235})); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_247}, new Object[]{SNAPSHOT, HORNETQ_247}, new Object[]{SNAPSHOT, HORNETQ_247})); - combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, ONE_FOUR}); - combinations.add(new Object[]{SNAPSHOT, TWO_TWENTYEIGHT_ZERO, TWO_TWENTYEIGHT_ZERO}); - combinations.add(new Object[]{TWO_TWENTYEIGHT_ZERO, SNAPSHOT, SNAPSHOT}); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ARTEMIS_1_4_0, ARTEMIS_2_4_0, SNAPSHOT, HORNETQ_2_3_5}, new Object[]{ARTEMIS_1_4_0, ARTEMIS_2_4_0, SNAPSHOT, HORNETQ_2_3_5})); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{ARTEMIS_1_4_0}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT})); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_2_3_5}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT, HORNETQ_2_3_5}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT, HORNETQ_2_3_5})); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_2_4_7}, new Object[]{SNAPSHOT, HORNETQ_2_4_7}, new Object[]{SNAPSHOT, HORNETQ_2_4_7})); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_1_4_0, ARTEMIS_1_4_0}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_28_0, ARTEMIS_2_28_0}); + combinations.add(new Object[]{ARTEMIS_2_28_0, SNAPSHOT, SNAPSHOT}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java index ab21f2c53e7..9d07a00bcc9 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MirroredVersionTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_THIRTYTHREE_ZERO; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_33_0; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -64,8 +64,8 @@ public class MirroredVersionTest extends ClasspathBase { @Parameters(name = "BrokerA={0}, BrokerB={1}, dualMirror={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{TWO_THIRTYTHREE_ZERO, SNAPSHOT, true}); - combinations.add(new Object[]{SNAPSHOT, TWO_THIRTYTHREE_ZERO, true}); + combinations.add(new Object[]{ARTEMIS_2_33_0, SNAPSHOT, true}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_33_0, true}); combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, true}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MultiVersionReplicaTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MultiVersionReplicaTest.java index 284882e0cd4..490c3352616 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MultiVersionReplicaTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MultiVersionReplicaTest.java @@ -18,9 +18,9 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOURTY_FOUR_ZERO; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_SEVENTEEN_ZERO; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TWENTYTWO_ZERO; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_44_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_17_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_22_0; import static org.junit.jupiter.api.Assertions.assertNotNull; import javax.jms.Connection; @@ -62,14 +62,14 @@ public static Collection getParameters() { if (getJavaVersion() <= 22) { // Old 2.x servers fail on JDK23+ without workarounds. - combinations.add(new Object[]{TWO_TWENTYTWO_ZERO, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, TWO_TWENTYTWO_ZERO}); - combinations.add(new Object[]{TWO_SEVENTEEN_ZERO, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, TWO_SEVENTEEN_ZERO}); + combinations.add(new Object[]{ARTEMIS_2_22_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_22_0}); + combinations.add(new Object[]{ARTEMIS_2_17_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_17_0}); } - combinations.add(new Object[]{TWO_FOURTY_FOUR_ZERO, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, TWO_FOURTY_FOUR_ZERO}); + combinations.add(new Object[]{ARTEMIS_2_44_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_44_0}); // The SNAPSHOT/SNAPSHOT is here as a test validation only, like in other cases where SNAPSHOT/SNAPSHOT is used. combinations.add(new Object[]{SNAPSHOT, SNAPSHOT}); diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java index 5fda3f8f30e..dcfa7144e39 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java @@ -17,7 +17,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; @@ -42,7 +42,7 @@ public class OldAddressSpaceTest extends VersionedBase { @Parameters(name = "server={0}, producer={1}, consumer={2}") public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{TWO_FOUR, SNAPSHOT}, new Object[]{TWO_FOUR, SNAPSHOT})); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ARTEMIS_2_4_0, SNAPSHOT}, new Object[]{ARTEMIS_2_4_0, SNAPSHOT})); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java index 45c6b3fd72a..1e25e3a4c62 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PagingCounterTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TWENTYTWO_ZERO; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_22_0; import java.util.ArrayList; import java.util.Collection; @@ -46,8 +46,8 @@ public static Collection getParameters() { if (getJavaVersion() <= 22) { // 2.22.0 servers fail on JDK23+ without workarounds. - combinations.add(new Object[]{TWO_TWENTYTWO_ZERO, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, TWO_TWENTYTWO_ZERO}); + combinations.add(new Object[]{ARTEMIS_2_22_0, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_22_0}); } // the purpose on this one is just to validate the test itself. diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java index 12d4d63a8b7..e37754d0784 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java @@ -17,10 +17,10 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_4_7; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; import java.util.ArrayList; import java.util.Collection; @@ -38,7 +38,7 @@ public class PrefixSendAckTest extends ServerBase { public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ONE_FOUR, HORNETQ_247, TWO_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, HORNETQ_247, TWO_FOUR, SNAPSHOT})); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ARTEMIS_1_4_0, HORNETQ_2_4_7, ARTEMIS_2_4_0, SNAPSHOT}, new Object[]{ARTEMIS_1_4_0, HORNETQ_2_4_7, ARTEMIS_2_4_0, SNAPSHOT})); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java index 174c6a5b7dc..c1bde82c01a 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/QueuePauseJournalCompatibilityTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_SIX_THREE; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_6_3; import java.util.ArrayList; import java.util.Collection; @@ -44,7 +44,7 @@ public static Collection getParameters() { // if we keep testing current one against 2.4 and 1.4.. we are sure the wire and API won't change over time List combinations = new ArrayList<>(); - combinations.add(new Object[]{TWO_SIX_THREE, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_2_6_3, SNAPSHOT}); // the purpose on this one is just to validate the test itself. /// if it can't run against itself it won't work at all combinations.add(new Object[]{SNAPSHOT, SNAPSHOT}); diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java index c5fc69b7f8f..ce6759c13fc 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; import static org.junit.jupiter.api.Assumptions.assumeTrue; import java.io.File; @@ -96,11 +96,11 @@ public ClassLoader getClasspath(String name) throws Exception { public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR}); - combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_4_0, ARTEMIS_2_4_0}); + combinations.add(new Object[]{ARTEMIS_2_4_0, SNAPSHOT, SNAPSHOT}); - combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, TWO_FOUR}); - combinations.add(new Object[]{TWO_FOUR, TWO_FOUR, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_2_4_0, SNAPSHOT, ARTEMIS_2_4_0}); + combinations.add(new Object[]{ARTEMIS_2_4_0, ARTEMIS_2_4_0, SNAPSHOT}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java index 2041844476f..253d3f5ef5c 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java @@ -17,10 +17,10 @@ package org.apache.activemq.artemis.tests.compatibility; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_247; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.HORNETQ_2_4_7; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_4_0; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_1_4_0; import java.util.ArrayList; import java.util.Collection; @@ -39,11 +39,11 @@ public class SendAckTest extends ServerBase { public static Collection getParameters() { List combinations = new ArrayList<>(); - combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT, ONE_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT})); + combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT, ARTEMIS_1_4_0}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT}, new Object[]{ARTEMIS_1_4_0, SNAPSHOT})); - combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT}); - combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR}); - combinations.add(new Object[]{HORNETQ_247, SNAPSHOT, SNAPSHOT}); + combinations.add(new Object[]{ARTEMIS_2_4_0, SNAPSHOT, SNAPSHOT}); + combinations.add(new Object[]{SNAPSHOT, ARTEMIS_2_4_0, ARTEMIS_2_4_0}); + combinations.add(new Object[]{HORNETQ_2_4_7, SNAPSHOT, SNAPSHOT}); return combinations; } diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java index 203c686b040..134fdb8ae23 100644 --- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java +++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.tests.compatibility; import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT; -import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TEN_ZERO; +import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ARTEMIS_2_10_0; import java.io.File; import java.util.ArrayList; @@ -49,8 +49,8 @@ public static Collection getParameters() { // if we keep testing current one against 2.4 and 1.4.. we are sure the wire and API won't change over time List combinations = new ArrayList<>(); - combinations.add(new Object[] {TWO_TEN_ZERO, SNAPSHOT}); - combinations.add(new Object[] {SNAPSHOT, TWO_TEN_ZERO}); + combinations.add(new Object[] {ARTEMIS_2_10_0, SNAPSHOT}); + combinations.add(new Object[] {SNAPSHOT, ARTEMIS_2_10_0}); return combinations; }