3 files changed, 46 insertions, 37 deletions
diff --git a/loadtime/src/test/java/org/aspectj/loadtime/Loadtime5ModuleTests.java b/loadtime/src/test/java/org/aspectj/loadtime/Loadtime5ModuleTests.java
deleted file mode 100644
index 665aecdc6..000000000
--- a/loadtime/src/test/java/org/aspectj/loadtime/Loadtime5ModuleTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.aspectj.loadtime;
-/*******************************************************************************
- * Copyright (c) 2005 Contributors.
- * All rights reserved.
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution and is available at
- * http://eclipse.org/legal/epl-v10.html
- *
- * Contributors: (See CVS logs)
- * 
- *******************************************************************************/
-
-import org.aspectj.testing.util.TestUtil;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- */
-public class Loadtime5ModuleTests extends TestCase {
-
-    public static Test suite() {
-        TestSuite suite = new TestSuite(Loadtime5ModuleTests.class.getName());
-        if (TestUtil.is15VMOrGreater()) {
-            TestUtil.loadTestsReflectively(suite, "Loadtime515ModuleTests", true);
-        } else {
-            suite.addTest(TestUtil.testNamed("all tests require 1.5"));
-        }
-        return suite;
-    }
-    public static void main(String[] args) {
-        junit.textui.TestRunner.main(new String[] {Loadtime5ModuleTests.class.getName()});
-    }
-
-}
diff --git a/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java b/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java
new file mode 100644
index 000000000..9d365ffab
--- /dev/null
+++ b/loadtime/src/test/java/org/aspectj/loadtime/LoadtimeModuleTests.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2005-2019 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *******************************************************************************/
+package org.aspectj.loadtime;
+
+import org.aspectj.weaver.loadtime.AjTest;
+import org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest;
+import org.aspectj.weaver.loadtime.JRockitAgentTest;
+import org.aspectj.weaver.loadtime.LoadtimeTest;
+import org.aspectj.weaver.loadtime.WeavingContextTest;
+import org.aspectj.weaver.loadtime.WeavingURLClassLoaderTest;
+import org.aspectj.weaver.loadtime.test.DocumentParserTest;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * @author Andy Clement
+ * @author Alexandre Vasseur
+ */
+public class LoadtimeModuleTests extends TestCase {
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(LoadtimeModuleTests.class.getName());
+		suite.addTestSuite(DocumentParserTest.class);
+		suite.addTestSuite(AjTest.class);
+		suite.addTestSuite(ClassLoaderWeavingAdaptorTest.class);
+		suite.addTestSuite(JRockitAgentTest.class);
+		suite.addTestSuite(LoadtimeTest.class);
+		suite.addTestSuite(WeavingContextTest.class);
+		suite.addTestSuite(WeavingURLClassLoaderTest.class);
+		return suite;
+	}
+
+	public static void main(String args[]) throws Throwable {
+		TestRunner.run(suite());
+	}
+
+}
diff --git a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java b/tests/src/test/java/org/aspectj/tests/TstsModuleTests.java
index 672a95299..672a95299 100644
--- a/tests/src/test/java/org/aspectj/tests/TestsModuleTests.java
+++ b/tests/src/test/java/org/aspectj/tests/TstsModuleTests.java