Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions tests/compatibility-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
<goals>
<goal>dependency-scan</goal>
</goals>
<id>263-check</id>
<id>2_6_3-check</id>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq:artemis-jms-server:2.6.3</arg>
Expand All @@ -408,15 +408,15 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-263.cp</file>
<file>${basedir}/target/ARTEMIS-2_6_3.cp</file>
</configuration>
</execution>
<execution>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
</goals>
<id>270-check</id>
<id>2_7_0-check</id>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq:artemis-jms-server:2.7.0</arg>
Expand All @@ -430,7 +430,7 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-270.cp</file>
<file>${basedir}/target/ARTEMIS-2_7_0.cp</file>
</configuration>
</execution>
<execution>
Expand Down Expand Up @@ -579,7 +579,7 @@
<goals>
<goal>dependency-scan</goal>
</goals>
<id>240-check</id>
<id>2_4_0-check</id>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq:artemis-jms-server:2.4.0</arg>
Expand All @@ -594,15 +594,15 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-240.cp</file>
<file>${basedir}/target/ARTEMIS-2_4_0.cp</file>
</configuration>
</execution>
<execution>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
</goals>
<id>210-check</id>
<id>2_1_0-check</id>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq:artemis-jms-server:2.1.0</arg>
Expand All @@ -617,11 +617,11 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-210.cp</file>
<file>${basedir}/target/ARTEMIS-2_1_0.cp</file>
</configuration>
</execution>
<execution>
<id>140-check</id>
<id>1_4_0-check</id>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
Expand All @@ -639,11 +639,11 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-140.cp</file>
<file>${basedir}/target/ARTEMIS-1_4_0.cp</file>
</configuration>
</execution>
<execution>
<id>hornetq-235</id>
<id>hornetq-2_3_5</id>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
Expand All @@ -662,11 +662,11 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/HORNETQ-235.cp</file>
<file>${basedir}/target/HORNETQ-2_3_5.cp</file>
</configuration>
</execution>
<execution>
<id>hornetq-247</id>
<id>hornetq-2_4_7</id>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
Expand All @@ -685,12 +685,12 @@
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/HORNETQ-247.cp</file>
<file>${basedir}/target/HORNETQ-2_4_7.cp</file>
</configuration>
</execution>

<execution>
<id>openwire-5.11</id>
<id>AMQ-5.11</id>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -43,7 +43,7 @@ public class AddressConfigTest extends VersionedBase {
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
List<Object[]> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -40,8 +40,8 @@ public class CLIFunctionTest extends ClasspathBase {
@Parameters(name = "Server={0}, Client={1}")
public static Collection getParameters() {
List<Object[]> 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -42,7 +42,7 @@ public class ConnectionFactoryConfigurationSerializationTest extends VersionedBa
public static Collection getParameters() {
List<Object[]> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<Object[]> 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;
}
Expand Down Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -44,10 +44,10 @@ public static Collection getParameters() {
List<Object[]> 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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -44,7 +44,7 @@ public class HQClientTopologyTest extends VersionedBase {
public static Collection getParameters() {
List<Object[]> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -54,7 +54,7 @@ public class HQFailoverTest extends VersionedBase {
public static Collection getParameters() {
List<Object[]> combinations = new ArrayList<>();

combinations.add(new Object[]{HORNETQ_235, SNAPSHOT, SNAPSHOT});
combinations.add(new Object[]{HORNETQ_2_3_5, SNAPSHOT, SNAPSHOT});
return combinations;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -39,10 +39,10 @@ public class HQLargeMeshTest extends VersionedBase {
public static Collection getParameters() {
List<Object[]> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,8 +38,8 @@ public class HQSelectorTest extends VersionedBase {
@Parameters(name = "server={0}, producer={1}, consumer={2}")
public static Collection getParameters() {
List<Object[]> 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;
}

Expand Down
Loading