Add module tests back in - but streamlined

2 files changed, 4 insertions, 46 deletions

diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java
deleted file mode 100644
index da277f135..000000000
--- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* *******************************************************************
- * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC)
- *               2003 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://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Xerox/PARC     initial implementation 
- *     Wes Isberg     added JUnit harness adapters
- * ******************************************************************/
-
-
-package org.aspectj.testing.drivers;
-
-import junit.framework.*;
-
-public class DriversTests extends TestCase {
-
-    public static Test suite() { 
-        TestSuite suite = new TestSuite(DriversTests.class.getName());
-        // AjcTestsUsingJUnit takes too long to include by default
-        //$JUnit-BEGIN$
-        suite.addTestSuite(HarnessSelectionTest.class); 
-        suite.addTest(AjcHarnessTestsUsingJUnit.suite()); 
-        //$JUnit-END$
-        return suite;
-    }
-
-    public DriversTests(String name) { super(name); }
-
-}  
diff --git a/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java
index 8cb8ddf30..d690a4b1f 100644
--- a/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java
+++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java
@@ -1,4 +1,3 @@
-package org.aspectj.testing;
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
  *               2002 Palo Alto Research Center, Incorporated (PARC).
@@ -11,24 +10,18 @@ package org.aspectj.testing;
  * Contributors: 
  *     Xerox/PARC     initial implementation 
  * ******************************************************************/
-
-
-// default package
-
-import org.aspectj.testing.drivers.DriversTests;
+package org.aspectj.testing.drivers;
 
 import junit.framework.*;
 import junit.framework.Test;
 
-/**
- * TODO weaver dumping ajcore files when using this interface
- */
 public class TestingDriversModuleTests extends TestCase {
 
     public static Test suite() { 
         TestSuite suite = new TestSuite(TestingDriversModuleTests.class.getName());
-        suite.addTest(DriversTests.suite()); 
-        return suite;
+        suite.addTestSuite(HarnessSelectionTest.class); 
+        suite.addTest(AjcHarnessTestsUsingJUnit.suite()); 
+        return suite;  
     }
 
     public TestingDriversModuleTests(String name) { super(name); }