Add module tests back in - but streamlined

2 files changed, 43 insertions, 2 deletions

diff --git a/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTests.java b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTests.java
new file mode 100644
index 000000000..bffd5c5ee
--- /dev/null
+++ b/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTests.java
@@ -0,0 +1,41 @@
+package org.aspectj.runtime;
+/* *******************************************************************
+ * Copyright (c) 1999-2001 Xerox Corporation, 
+ *               2002 Palo Alto Research Center, Incorporated (PARC).
+ * 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://www.eclipse.org/legal/epl-v10.html 
+ *  
+ * Contributors: 
+ *     Xerox/PARC     initial implementation 
+ * ******************************************************************/
+
+import org.aspectj.internal.lang.reflect.AjTypeTest;
+import org.aspectj.internal.lang.reflect.AjTypeWithAspectsTest;
+import org.aspectj.internal.lang.reflect.InterTypeTest;
+import org.aspectj.runtime.reflect.JoinPointImplTest;
+import org.aspectj.runtime.reflect.RuntimePerformanceTest;
+import org.aspectj.runtime.reflect.SignatureTest;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class RuntimeModuleTests extends TestCase {
+
+    public static TestSuite suite() { 
+        TestSuite suite = new TestSuite(RuntimeModuleTests.class.getName());
+        suite.addTestSuite(RuntimeTest.class);
+        suite.addTestSuite(SignatureTest.class);
+		suite.addTestSuite(JoinPointImplTest.class);
+		suite.addTestSuite(RuntimePerformanceTest.class);
+		suite.addTestSuite(AjTypeTest.class);
+		suite.addTestSuite(AjTypeWithAspectsTest.class);
+		suite.addTestSuite(InterTypeTest.class);
+        return suite;
+    }
+
+    public RuntimeModuleTests(String name) { super(name); }
+
+}  
diff --git a/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java b/runtime/src/test/java/org/aspectj/runtime/RuntimeTest.java
index 97e1750d8..a908a8ae0 100644
--- a/runtime/src/test/java/org/aspectj/runtime/RuntimeModuleTest.java
+++ b/runtime/src/test/java/org/aspectj/runtime/RuntimeTest.java
@@ -21,9 +21,9 @@ import org.aspectj.runtime.reflect.SignatureTest;
 
 import junit.framework.*;
 
-public class RuntimeModuleTest extends TestCase {
+public class RuntimeTest extends TestCase {
 
-    public RuntimeModuleTest(String name) { super(name); }
+    public RuntimeTest(String name) { super(name); }
     
     public void testNoAspectBoundException() {
         RuntimeException fun = new RuntimeException("fun");