From 593e1c772c28577a414c05ae218574b6df88f3e3 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Fri, 1 Feb 2019 12:26:11 -0800 Subject: [PATCH] Add module tests back in - but streamlined --- .../org/aspectj/ajdt/AjdtCoreModuleTests.java | 61 +++++++++++++++++++ .../org/aspectj/ajdt/EajcModuleTests.java | 43 ------------- .../org/aspectj/tools/ajc/AjcTestCase.java | 5 +- 3 files changed, 62 insertions(+), 47 deletions(-) create mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/AjdtCoreModuleTests.java delete mode 100644 org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/AjdtCoreModuleTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/AjdtCoreModuleTests.java new file mode 100644 index 000000000..70a894c40 --- /dev/null +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/AjdtCoreModuleTests.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: + * PARC initial implementation + * ******************************************************************/ +package org.aspectj.ajdt; + +import org.aspectj.ajdt.ajc.*; +import org.aspectj.ajdt.internal.compiler.batch.*; +import org.aspectj.ajdt.internal.core.builder.*; +import org.aspectj.tools.ajc.*; + +import junit.framework.*; + +public class AjdtCoreModuleTests extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(AjdtCoreModuleTests.class.getName()); + suite.addTestSuite(AjdtCommandTestCase.class); + suite.addTestSuite(BuildArgParserTestCase.class); + suite.addTestSuite(ConsoleMessageHandlerTestCase.class); + + suite.addTestSuite(BasicCommandTestCase.class); + suite.addTestSuite(BinaryFormsTestCase.class); + suite.addTestSuite(CompileAndRunTestCase.class); + suite.addTestSuite(PerformanceTestCase.class); + suite.addTestSuite(ImageTestCase.class); + suite.addTestSuite(MultipleCompileTestCase.class); + suite.addTestSuite(JavadocTest.class); + suite.addTestSuite(PartiallyExposedHierarchyTestCase.class); + suite.addTestSuite(CompilerDumpTestCase.class); + suite.addTestSuite(ProceedOnErrorTestCase.class); + suite.addTestSuite(DeclareParentsTest.class); + suite.addTestSuite(DumpTestCase.class); + suite.addTestSuite(AjBuildManagerTest.class); + suite.addTestSuite(AjBuildConfigTest.class); + suite.addTestSuite(AsmBuilderTest.class); + suite.addTestSuite(AjCompilerOptionsTest.class); + suite.addTestSuite(AjStateTest.class); + suite.addTestSuite(OutjarTest.class); + + suite.addTestSuite(MainTest.class); + suite.addTestSuite(ASTVisitorTest.class); + suite.addTestSuite(ASTitdTest.class); + suite.addTestSuite(AjASTTest.class); + suite.addTestSuite(AjNaiveASTFlattenerTest.class); + suite.addTestSuite(AjcTestCaseTest.class); + suite.addTestSuite(AjAST5Test.class); + return suite; + } + + public AjdtCoreModuleTests(String name) { super(name); } + +} diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java deleted file mode 100644 index 370d1f33f..000000000 --- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/EajcModuleTests.java +++ /dev/null @@ -1,43 +0,0 @@ -//package org.aspectj.ajdt; -///* ******************************************************************* -// * 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: -// * PARC initial implementation -// * ******************************************************************/ -// -// -//// default package -// -// -//import org.aspectj.testing.util.TestUtil; -// -//import junit.framework.*; -// -//public class EajcModuleTests extends TestCase { -// -// public static Test suite() { -// TestSuite suite = new TestSuite(EajcModuleTests.class.getName()); -// suite.addTest(org.aspectj.ajdt.ajc.AjdtAjcTests.suite()); -// suite.addTest(org.aspectj.ajdt.internal.compiler.batch.AjdtBatchTests.suite()); -// suite.addTest(org.aspectj.ajdt.internal.core.builder.AjdtBuilderTests.suite()); -// suite.addTest(org.aspectj.tools.ajc.AjcTests.suite()); -// -// /* FIXME maw move these Java 5 dependent tests to a separate project */ -// if (TestUtil.is15VMOrGreater()) { -// TestUtil.loadTestsReflectively(suite, "Eajc515ModuleTests", true); -// } else { -// suite.addTest(TestUtil.testNamed("Eajc515ModuleTests require 1.5")); -// } -// return suite; -// } -// -// public EajcModuleTests(String name) { super(name); } -// -//} diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java index 9ca39ab9d..e102bd351 100644 --- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java +++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java @@ -54,7 +54,7 @@ import junit.framework.TestCase; * @see org.aspectj.tools.ajc.AjcTestCaseTest * @see org.aspectj.testing.XMLBasedAjcTestCase */ -public class AjcTestCase extends TestCase { +public abstract class AjcTestCase extends TestCase { private RunResult lastRunResult; @@ -573,9 +573,6 @@ public class AjcTestCase extends TestCase { return lastRunResult; } - public void testNothingForAntJUnit() { - } - /** * Run the given class (main method), and return the result in a RunResult. The program runs with a classpath containing the * sandbox directory, runtime, testing-client, bridge, and util projects (all used by the Tester class), and any jars in the -- 2.39.5