Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-5214 Replacing 1.5.5 artemis and 2.0.0 libraries since they are not compatible with the current JDK 

Also fixing a possible leak
This commit is contained in:
Clebert Suconic 2024-12-18 16:36:47 -05:00
parent 7bf596ce01
commit 8685b816f5
21 changed files with 86 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tests/compatibility-tests/pom.xml
View File

@ -620,29 +620,6 @@
<file>${basedir}/target/ARTEMIS-210.cp</file>
</configuration>
</execution>
<execution>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
</goals>
<id>200-check</id>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq:artemis-jms-server:2.0.0</arg>
<arg>org.apache.activemq:artemis-jms-client:2.0.0</arg>
<arg>org.apache.activemq:artemis-cli:2.0.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.0.0</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:2.0.0</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:2.0.0</arg>
<arg>org.apache.qpid:qpid-jms-client:0.20.0</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-200.cp</file>
</configuration>
</execution>
<execution>
<id>140-check</id>
<phase>compile</phase>
@ -665,29 +642,6 @@
<file>${basedir}/target/ARTEMIS-140.cp</file>
</configuration>
</execution>
<execution>
<id>155-check</id>
<phase>compile</phase>
<goals>
<goal>dependency-scan</goal>
</goals>
<configuration>
<libListWithDeps>
<arg>org.apache.activemq:artemis-jms-server:1.5.5</arg>
<arg>org.apache.activemq:artemis-jms-client:1.5.5</arg>
<arg>org.apache.activemq:artemis-cli:1.5.5</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
<arg>org.apache.activemq:artemis-amqp-protocol:1.5.5</arg>
<arg>org.apache.activemq:artemis-hornetq-protocol:1.5.5</arg>
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
<arg>org.jboss.marshalling:jboss-marshalling-river:2.0.9.Final</arg>
</libListWithDeps>
<libList>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-155.cp</file>
</configuration>
</execution>
<execution>
<id>hornetq-235</id>
<phase>compile</phase>

49
tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/tests/compatibility/GroovyRun.java
View File

@ -31,9 +31,7 @@ public class GroovyRun {
public static final String SNAPSHOT = "ARTEMIS-SNAPSHOT";
public static final String JAKARTAEE = "ARTEMIS-JAKARTAEE";
public static final String ONE_FIVE = "ARTEMIS-155";
public static final String ONE_FOUR = "ARTEMIS-140";
public static final String TWO_ZERO = "ARTEMIS-200";
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";
@ -48,13 +46,42 @@ public class GroovyRun {
public static final String HORNETQ_247 = "HORNETQ-247";
public static final String AMQ_5_11 = "AMQ_5_11";
public static Binding binding = new Binding();
public static GroovyShell shell = new GroovyShell(binding);
private static Binding theBinding;
private static GroovyShell theShell;
public static void clear() {
List<String> variablesToRemove = new ArrayList<>();
variablesToRemove.addAll(binding.getVariables().keySet());
variablesToRemove.forEach(v -> binding.removeVariable(v));
try {
if (theBinding != null) {
List<String> variablesToRemove = new ArrayList<>(theBinding.getVariables().keySet());
variablesToRemove.forEach(theBinding::removeVariable);
theBinding.setMetaClass(null);
}
} finally {
theBinding = null;
theShell = null;
}
}
private static GroovyShell getShell() {
initShell();
return theShell;
}
private static Binding getBinding() {
initShell();
return theBinding;
}
private static void initShell() {
if (theShell == null || theBinding == null) {
theBinding = new Binding();
theShell = new GroovyShell(theBinding);
}
}
/**
@ -83,21 +110,21 @@ public class GroovyRun {
setVariable(argVariableName, arg);
return shell.evaluate(scriptURI);
return getShell().evaluate(scriptURI);
}
public static void setVariable(String name, Object arg) {
binding.setVariable(name, arg);
getBinding().setVariable(name, arg);
}
public static Object getVariable(String name) {
return binding.getVariable(name);
return getBinding().getVariable(name);
}
// Called with reflection
public static Object execute(String script) throws Throwable {
return shell.evaluate(script);
return getShell().evaluate(script);
}
public static void assertNotNull(Object value) {

12
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ActiveMQJMSClientCompatibilityTest.java
View File

@ -18,7 +18,6 @@
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.ONE_FIVE;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@ -54,6 +53,8 @@ public class ActiveMQJMSClientCompatibilityTest extends ClasspathBase {
System.clearProperty(ActiveMQJMSClient.class.getName() + ".enable1xPrefixes");
}
clearClassLoader(loader);
}
@Test
@ -83,13 +84,4 @@ public class ActiveMQJMSClientCompatibilityTest extends ClasspathBase {
}
@Test
// The purpose here is just to validate the test itself. Nothing to be fixed here
public void testActiveMQJMSCompatibility_1XPrefix_ONE_FIVE() throws Exception {
ClassLoader loader = getClasspath(ONE_FIVE, false);
evaluate(loader, "ActiveMQJMSClientCompatibilityTest/validateClient.groovy");
}
}

4
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/AddressConfigTest.java
View File

@ -17,7 +17,7 @@
package org.apache.activemq.artemis.tests.compatibility;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.junit.jupiter.api.Assertions.assertTrue;
@ -55,7 +55,7 @@ public class AddressConfigTest extends VersionedBase {
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
return combinations;
}

4
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ConnectionFactoryConfigurationSerializationTest.java
View File

@ -17,7 +17,7 @@
package org.apache.activemq.artemis.tests.compatibility;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
@ -53,7 +53,7 @@ public class ConnectionFactoryConfigurationSerializationTest extends VersionedBa
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.addAll(combinatory(new Object[]{null}, new Object[]{ONE_FIVE, SNAPSHOT, TWO_FOUR}, new Object[]{ONE_FIVE, SNAPSHOT, TWO_FOUR}));
combinations.addAll(combinatory(new Object[]{null}, new Object[]{ONE_FOUR, SNAPSHOT, TWO_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT, TWO_FOUR}));
return combinations;
}

4
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ExportImportTest.java
View File

@ -17,7 +17,7 @@
package org.apache.activemq.artemis.tests.compatibility;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
@ -54,7 +54,7 @@ public class ExportImportTest extends VersionedBase {
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.add(new Object[]{null, ONE_FIVE, SNAPSHOT});
combinations.add(new Object[]{null, ONE_FOUR, SNAPSHOT});
combinations.add(new Object[]{null, SNAPSHOT, SNAPSHOT});
return combinations;
}

3
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/FQQNConsumerTest.java
View File

@ -22,7 +22,6 @@ 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.TWO_ZERO;
import java.util.ArrayList;
import java.util.Collection;
@ -45,7 +44,7 @@ public class FQQNConsumerTest extends ServerBase {
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(new Object[]{SNAPSHOT}, new Object[]{SNAPSHOT, TWO_ZERO, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_ZERO, TWO_FOUR, TWO_ONE, TWO_SIX_THREE, TWO_SEVEN_ZERO});
List testsList = combinatory(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});
addCombinations(testsList, null, new Object[] {TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_SEVEN_ZERO}, new Object[]{SNAPSHOT, TWO_SEVEN_ZERO});
return testsList;
}

2
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HQClientTopologyTest.java
View File

@ -18,7 +18,6 @@
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_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import org.apache.activemq.artemis.tests.compatibility.base.VersionedBase;
@ -46,7 +45,6 @@ public class HQClientTopologyTest extends VersionedBase {
List<Object[]> combinations = new ArrayList<>();
combinations.add(new Object[]{SNAPSHOT, HORNETQ_235, HORNETQ_235});
combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
return combinations;
}

4
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/HornetQSoakTest.java
View File

@ -18,7 +18,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.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ -43,7 +43,7 @@ public class HornetQSoakTest extends ClasspathBase {
public void setUp() throws Throwable {
this.artemisClassLoader = getClasspath(SNAPSHOT);
this.artemis1XClassLoader = getClasspath(ONE_FIVE);
this.artemis1XClassLoader = getClasspath(ONE_FOUR);
this.hornetqClassLoader = getClasspath(HORNETQ_235);
FileUtil.deleteDirectory(serverFolder);

10
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToQueueTest.java
View File

@ -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_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
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<Object[]> combinations = new ArrayList<>();
combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FIVE});
combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR});
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_FIVE});
combinations.add(new Object[]{JAKARTAEE, ONE_FIVE, JAKARTAEE});
combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR});
combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE});
return combinations;
}

10
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempQueueTest.java
View File

@ -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_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
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<Object[]> combinations = new ArrayList<>();
combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FIVE});
combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR});
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_FIVE});
combinations.add(new Object[]{JAKARTAEE, ONE_FIVE, JAKARTAEE});
combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR});
combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE});
return combinations;
}

10
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTempTopicTest.java
View File

@ -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_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
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<Object[]> combinations = new ArrayList<>();
combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FIVE});
combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR});
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_FIVE});
combinations.add(new Object[]{JAKARTAEE, ONE_FIVE, JAKARTAEE});
combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR});
combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE});
return combinations;
}

10
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JmsReplyToTopicTest.java
View File

@ -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_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
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<Object[]> combinations = new ArrayList<>();
combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FIVE});
combinations.add(new Object[]{SNAPSHOT, ONE_FOUR, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, SNAPSHOT, ONE_FOUR});
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_FIVE});
combinations.add(new Object[]{JAKARTAEE, ONE_FIVE, JAKARTAEE});
combinations.add(new Object[]{JAKARTAEE, JAKARTAEE, ONE_FOUR});
combinations.add(new Object[]{JAKARTAEE, ONE_FOUR, JAKARTAEE});
return combinations;
}

2
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/JournalCompatibilityTest.java
View File

@ -20,7 +20,6 @@ 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_ZERO;
import java.util.ArrayList;
import java.util.Collection;
@ -53,7 +52,6 @@ public class JournalCompatibilityTest extends VersionedBase {
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.add(new Object[]{null, TWO_ZERO, SNAPSHOT});
combinations.add(new Object[]{null, TWO_ONE, SNAPSHOT});
combinations.add(new Object[]{null, TWO_FOUR, SNAPSHOT});
// the purpose on this one is just to validate the test itself.

7
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/MeshTest.java
View File

@ -19,7 +19,6 @@ 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_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
@ -58,9 +57,9 @@ public class MeshTest extends ServerBase {
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.addAll(combinatory(SNAPSHOT, new Object[]{SNAPSHOT}, new Object[]{ONE_FIVE, TWO_FOUR, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FIVE, TWO_FOUR, SNAPSHOT, HORNETQ_235}));
combinations.addAll(combinatory(SNAPSHOT, new Object[]{ONE_FIVE}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
combinations.addAll(combinatory(SNAPSHOT, new Object[]{HORNETQ_235}, new Object[]{ONE_FIVE, SNAPSHOT, HORNETQ_235}, new Object[]{ONE_FIVE, SNAPSHOT, HORNETQ_235}));
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});

4
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/OldAddressSpaceTest.java
View File

@ -16,8 +16,8 @@
*/
package org.apache.activemq.artemis.tests.compatibility;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
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<Object[]> combinations = new ArrayList<>();
combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{TWO_FOUR, SNAPSHOT}, new Object[]{TWO_FOUR, SNAPSHOT}));
return combinations;
}

4
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/PrefixSendAckTest.java
View File

@ -18,7 +18,7 @@
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_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
@ -38,7 +38,7 @@ public class PrefixSendAckTest extends ServerBase {
public static Collection getParameters() {
List<Object[]> combinations = new ArrayList<>();
combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FIVE, HORNETQ_247, TWO_FOUR, SNAPSHOT}, new Object[]{ONE_FIVE, HORNETQ_247, TWO_FOUR, SNAPSHOT}));
combinations.addAll(combinatory(new Object[]{SNAPSHOT}, new Object[]{ONE_FOUR, HORNETQ_247, TWO_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, HORNETQ_247, TWO_FOUR, SNAPSHOT}));
return combinations;
}

10
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/ReplyToTest.java
View File

@ -17,8 +17,8 @@
package org.apache.activemq.artemis.tests.compatibility;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
@ -107,11 +107,11 @@ public class ReplyToTest extends ServerBase {
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
combinations.add(new Object[]{ONE_FIVE, SNAPSHOT, SNAPSHOT});
combinations.add(new Object[]{SNAPSHOT, TWO_FOUR, TWO_FOUR});
combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT});
combinations.add(new Object[]{ONE_FIVE, SNAPSHOT, ONE_FIVE});
combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, SNAPSHOT});
combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, TWO_FOUR});
combinations.add(new Object[]{TWO_FOUR, TWO_FOUR, SNAPSHOT});
return combinations;
}

4
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SendAckTest.java
View File

@ -20,7 +20,7 @@ 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.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_FOUR;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FOUR;
import java.util.ArrayList;
import java.util.Collection;
@ -50,7 +50,7 @@ public class SendAckTest extends ServerBase {
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.addAll(combinatory(new Object[]{SNAPSHOT, ONE_FIVE}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
combinations.addAll(combinatory(new Object[]{SNAPSHOT, ONE_FOUR}, new Object[]{ONE_FOUR, SNAPSHOT}, new Object[]{ONE_FOUR, SNAPSHOT}));
// not every combination on two four would make sense.. as there's a compatibility issue between 2.4 and 1.4 when crossing consumers and producers
combinations.add(new Object[]{TWO_FOUR, SNAPSHOT, SNAPSHOT});

2
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/SerializationTest.java
View File

@ -17,7 +17,6 @@
package org.apache.activemq.artemis.tests.compatibility;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.ONE_FIVE;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.TWO_TEN_ZERO;
@ -53,7 +52,6 @@ public class SerializationTest extends VersionedBase {
// combinations.add(new Object[]{SNAPSHOT, ONE_FIVE, ONE_FIVE});
// combinations.add(new Object[]{ONE_FIVE, ONE_FIVE, ONE_FIVE});
combinations.addAll(combinatory(new Object[]{null}, new Object[]{ONE_FIVE, SNAPSHOT}, new Object[]{ONE_FIVE, SNAPSHOT}));
combinations.add(new Object[] {null, TWO_TEN_ZERO, SNAPSHOT});
combinations.add(new Object[] {null, SNAPSHOT, TWO_TEN_ZERO});
return combinations;

10
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
View File

@ -19,7 +19,6 @@ package org.apache.activemq.artemis.tests.compatibility.base;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.lang.reflect.Method;
@ -45,9 +44,10 @@ public class ClasspathBase {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@AfterAll
public static void cleanup() {
loaderMap.values().forEach((cl -> clearClassLoader(cl)));
public static void cleanup() throws Exception {
loaderMap.values().forEach((ClasspathBase::clearClassLoader));
clearClassLoader(VersionedBase.class.getClassLoader());
loaderMap.clear();
}
public static void clearClassLoader(ClassLoader loader) {
@ -133,10 +133,6 @@ public class ClasspathBase {
protected ClassLoader getClasspath(String name, boolean forceNew) throws Exception {
if (name.equals(GroovyRun.ONE_FIVE) || name.equals(GroovyRun.TWO_ZERO)) {
assumeTrue(getJavaVersion() < 16, "This version of artemis cannot be ran against JDK16+");
}
if (!forceNew) {
if (name.equals(SNAPSHOT)) {
GroovyRun.clear();