From 6311f723a282acee125eb467f55c1ba6cb10a04e Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 1 Feb 2019 12:02:06 -0800 Subject: Add module tests back in - but streamlined --- .../aspectj/testing/TestingDriversModuleTests.java | 36 ---------------------- .../org/aspectj/testing/drivers/DriversTests.java | 35 --------------------- .../testing/drivers/TestingDriversModuleTests.java | 29 +++++++++++++++++ 3 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java delete mode 100644 testing-drivers/src/test/java/org/aspectj/testing/drivers/DriversTests.java create mode 100644 testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java (limited to 'testing-drivers/src/test') diff --git a/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java b/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java deleted file mode 100644 index 8cb8ddf30..000000000 --- a/testing-drivers/src/test/java/org/aspectj/testing/TestingDriversModuleTests.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.aspectj.testing; -/* ******************************************************************* - * 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 - * ******************************************************************/ - - -// default package - -import org.aspectj.testing.drivers.DriversTests; - -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; - } - - public TestingDriversModuleTests(String name) { super(name); } - -} 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/drivers/TestingDriversModuleTests.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java new file mode 100644 index 000000000..d690a4b1f --- /dev/null +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/TestingDriversModuleTests.java @@ -0,0 +1,29 @@ +/* ******************************************************************* + * 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.drivers; + +import junit.framework.*; +import junit.framework.Test; + +public class TestingDriversModuleTests extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(TestingDriversModuleTests.class.getName()); + suite.addTestSuite(HarnessSelectionTest.class); + suite.addTest(AjcHarnessTestsUsingJUnit.suite()); + return suite; + } + + public TestingDriversModuleTests(String name) { super(name); } + +} -- cgit v1.2.3