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

This closes #1731

This commit is contained in:
Clebert Suconic 2017-12-19 12:21:50 -05:00
parent a3d297ff9a 2197d377c9
commit fb34214a1a
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/VersionedBaseTest.java
View File

@ -18,13 +18,16 @@ import java.lang.reflect.Method;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map;
import org.apache.activemq.artemis.utils.FileUtil; import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.RunnableEx; import org.apache.activemq.artemis.utils.RunnableEx;
import org.junit.After; import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assume; import org.junit.Assume;
import org.junit.Before; import org.junit.Before;
import org.junit.ClassRule; import org.junit.ClassRule;
@ -42,6 +45,8 @@ public abstract class VersionedBaseTest {
protected ClassLoader senderClassloader; protected ClassLoader senderClassloader;
protected ClassLoader receiverClassloader; protected ClassLoader receiverClassloader;
protected static Map<String, ClassLoader> loaderMap = new HashMap<>();
public VersionedBaseTest(String server, String sender, String receiver) throws Exception { public VersionedBaseTest(String server, String sender, String receiver) throws Exception {
this.server = server; this.server = server;
this.sender = sender; this.sender = sender;
@ -95,6 +100,11 @@ public abstract class VersionedBaseTest {
receiverClassloader = null; receiverClassloader = null;
} }
@AfterClass
public static void cleanup() {
loaderMap.clear();
}
protected static void callMain(ClassLoader loader, protected static void callMain(ClassLoader loader,
String className, String className,
String script, String script,
@ -125,6 +135,7 @@ public abstract class VersionedBaseTest {
} }
} }
protected static ClassLoader defineClassLoader(String classPath) throws MalformedURLException { protected static ClassLoader defineClassLoader(String classPath) throws MalformedURLException {
String[] classPathArray = classPath.split(File.pathSeparator); String[] classPathArray = classPath.split(File.pathSeparator);
URL[] elements = new URL[classPathArray.length]; URL[] elements = new URL[classPathArray.length];
@ -140,6 +151,12 @@ public abstract class VersionedBaseTest {
if (name.equals(SNAPSHOT)) { if (name.equals(SNAPSHOT)) {
return VersionedBaseTest.class.getClassLoader(); return VersionedBaseTest.class.getClassLoader();
} }
ClassLoader loader = loaderMap.get(name);
if (loader != null) {
return loader;
}
String value = System.getProperty(name); String value = System.getProperty(name);
if (!printed.contains(name)) { if (!printed.contains(name)) {
@ -159,7 +176,11 @@ public abstract class VersionedBaseTest {
Assume.assumeTrue("Cannot run these tests, no classpath found", ok); Assume.assumeTrue("Cannot run these tests, no classpath found", ok);
} }
return defineClassLoader(value);
loader = defineClassLoader(value);
loaderMap.put(name, loader);
return loader;
} }
protected static List<Object[]> combinatory(Object[] rootSide, Object[] sideLeft, Object[] sideRight) { protected static List<Object[]> combinatory(Object[] rootSide, Object[] sideLeft, Object[] sideRight) {