Add module tests back in - but streamlined

2 files changed, 64 insertions, 3 deletions

diff --git a/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java
new file mode 100644
index 000000000..81ff4e1b4
--- /dev/null
+++ b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java
@@ -0,0 +1,61 @@
+/* *******************************************************************
+ * 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 
+ * ******************************************************************/
+package org.aspectj.testing;
+
+import org.aspectj.testing.harness.bridge.*;
+import org.aspectj.testing.taskdefs.*;
+import org.aspectj.testing.util.*;
+import org.aspectj.testing.util.options.*;
+import org.aspectj.testing.xml.*;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+public class TestingModuleTests extends TestCase {
+
+    public static Test suite() { 
+        TestSuite suite = new TestSuite(TestingModuleTests.class.getName());
+
+        suite.addTestSuite(ValuesTest.class);
+        suite.addTestSuite(OptionsTest.class);
+        suite.addTestSuite(StructureModelUtilTest.class);
+        suite.addTestSuite(FileUtilTest.class);
+        suite.addTestSuite(BridgeUtilTest.class);
+        suite.addTestSuite(IteratorWrapperTest.class);
+        suite.addTestSuite(StreamGrabberTest.class);
+        suite.addTestSuite(TestDiffsTest.class);
+        suite.addTestSuite(LangUtilTest.class);
+        suite.addTestSuite(MessageUtilTest.class);
+        suite.addTestSuite(XMLWriterTest.class);
+        suite.addTestSuite(AjcSpecXmlReaderTest.class);
+        suite.addTestSuite(MessageListXmlReaderTest.class);
+        suite.addTestSuite(CompilerRunTest.class);
+        suite.addTestSuite(CompilerRunSpecTest.class);
+        suite.addTestSuite(AjcSpecTest.class);
+        suite.addTestSuite(DirChangesTest.class);
+        suite.addTestSuite(ParseTestCase.class);
+        suite.addTestSuite(AbstractRunSpecTest.class);
+        suite.addTestSuite(AjcTaskCompileCommandTest.class);
+
+//        suite.addTest(org.aspectj.testing.harness.bridge.TestingBridgeTests.suite()); 
+//        suite.addTest(org.aspectj.testing.taskdefs.TaskdefTests.suite()); 
+//        suite.addTest(org.aspectj.testing.util.UtilTests.suite()); 
+//        suite.addTest(org.aspectj.testing.util.options.OptionsTests.suite()); 
+//        suite.addTest(org.aspectj.testing.xml.TestingXmlTests.suite()); 
+        return suite;
+    }
+
+    public TestingModuleTests(String name) { super(name); }
+
+}  
diff --git a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
index bff18c024..81842dc30 100644
--- a/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
+++ b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java
@@ -87,9 +87,9 @@ public class AjcSpecXmlReaderTest extends TestCase {
 		}
         
     }
-    public void testAjcTests() throws IOException { 
-        checkXmlRoundTrip("../tests/ajcTests");
-    }
+//    public void testAjcTests() throws IOException { 
+//        checkXmlRoundTrip("../tests/ajcTests");
+//    }
 
     public void testAjcTests10() throws IOException { 
         checkXmlRoundTrip("../tests/ajcTests10");