From e8436048b1667bc2d1d7c9a48070fb73a281daf9 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Tue, 29 Jan 2019 16:59:46 -0800 Subject: [PATCH] mavenizing ajde - done --- ajde/pom.xml | 7 +++ ...mpilerTests.java => AjdeCompilerTest.java} | 2 +- .../org/aspectj/ajde/AjdeModuleTests.java | 27 ------------ .../java/org/aspectj/ajde/AjdeTestCase.java | 5 ++- .../test/java/org/aspectj/ajde/AjdeTests.java | 44 ------------------- ...ExtensionTests.java => ExtensionTest.java} | 2 +- .../ui/utils/TestCompilerConfiguration.java | 4 +- 7 files changed, 14 insertions(+), 77 deletions(-) rename ajde/src/test/java/org/aspectj/ajde/{AjdeCompilerTests.java => AjdeCompilerTest.java} (98%) delete mode 100644 ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java delete mode 100644 ajde/src/test/java/org/aspectj/ajde/AjdeTests.java rename ajde/src/test/java/org/aspectj/ajde/{ExtensionTests.java => ExtensionTest.java} (99%) diff --git a/ajde/pom.xml b/ajde/pom.xml index aecd6318f..8f34c729d 100644 --- a/ajde/pom.xml +++ b/ajde/pom.xml @@ -35,6 +35,13 @@ org.aspectj.ajdt.core ${project.version} + + org.aspectj + org.aspectj.ajdt.core + ${project.version} + test-jar + test + org.aspectj org.eclipse.jdt.core diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java similarity index 98% rename from ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTests.java rename to ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java index 0d9d6d68d..1e3605db2 100644 --- a/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTests.java +++ b/ajde/src/test/java/org/aspectj/ajde/AjdeCompilerTest.java @@ -17,7 +17,7 @@ import org.aspectj.ajde.core.AjCompiler; * there to be a different one for each .lst file and for ajde * to only remember the compiler for the last .lst file. */ -public class AjdeCompilerTests extends AjdeTestCase { +public class AjdeCompilerTest extends AjdeTestCase { protected void setUp() throws Exception { super.setUp(); diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java deleted file mode 100644 index b6a1daa55..000000000 --- a/ajde/src/test/java/org/aspectj/ajde/AjdeModuleTests.java +++ /dev/null @@ -1,27 +0,0 @@ -/* ******************************************************************* - * 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.ajde; - -import junit.framework.*; - -public class AjdeModuleTests extends TestCase { - - public static TestSuite suite() { - TestSuite suite = new TestSuite(AjdeModuleTests.class.getName()); - suite.addTest(org.aspectj.ajde.AjdeTests.suite()); - return suite; - } - - public AjdeModuleTests(String name) { super(name); } - -} diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java index 5f2b2f2f7..3ff7712eb 100644 --- a/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java +++ b/ajde/src/test/java/org/aspectj/ajde/AjdeTestCase.java @@ -27,9 +27,10 @@ import org.aspectj.ajde.ui.utils.TestEditorAdapter; import org.aspectj.ajde.ui.utils.TestIdeUIAdapter; import org.aspectj.ajde.ui.utils.TestMessageHandler; import org.aspectj.ajde.ui.utils.TestRuntimeProperties; +import org.aspectj.testing.util.TestUtil; import org.aspectj.tools.ajc.Ajc; -public class AjdeTestCase extends TestCase { +public abstract class AjdeTestCase extends TestCase { public final static String testdataSrcDir = "../ajde/testdata"; protected static File sandboxDir; @@ -39,7 +40,7 @@ public class AjdeTestCase extends TestCase { protected void setUp() throws Exception { super.setUp(); // Create a sandbox in which to work - sandboxDir = Ajc.createEmptySandbox(); + sandboxDir = TestUtil.createEmptySandbox(); // AMC - added this next line as a temporary workaround for // listener leakage in AsmManager induced by the Ajde test suite. // Ajde.getDefault().getModel().removeAllListeners(); diff --git a/ajde/src/test/java/org/aspectj/ajde/AjdeTests.java b/ajde/src/test/java/org/aspectj/ajde/AjdeTests.java deleted file mode 100644 index c48b9d2fe..000000000 --- a/ajde/src/test/java/org/aspectj/ajde/AjdeTests.java +++ /dev/null @@ -1,44 +0,0 @@ -/* ******************************************************************* - * 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 - * Helen Hawkins updated for bug 148190 - * ******************************************************************/ -package org.aspectj.ajde; - -import org.aspectj.ajde.internal.AspectJBuildManagerTest; -import org.aspectj.ajde.internal.LstBuildConfigManagerTest; -import org.aspectj.ajde.ui.StructureSearchManagerTest; -import org.aspectj.ajde.ui.StructureViewManagerTest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class AjdeTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(AjdeTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(SymbolFileGenerationTest.class); - suite.addTestSuite(ExtensionTests.class); - suite.addTestSuite(AspectJBuildManagerTest.class); - suite.addTestSuite(LstBuildConfigManagerTest.class); - suite.addTestSuite(StructureSearchManagerTest.class); - suite.addTestSuite(StructureViewManagerTest.class); - suite.addTestSuite(AjdeCompilerTests.class); - - //$JUnit-END$ - return suite; - } - - public AjdeTests(String name) { super(name); } - -} diff --git a/ajde/src/test/java/org/aspectj/ajde/ExtensionTests.java b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java similarity index 99% rename from ajde/src/test/java/org/aspectj/ajde/ExtensionTests.java rename to ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java index 0a445ba8b..43d75f8d4 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ExtensionTests.java +++ b/ajde/src/test/java/org/aspectj/ajde/ExtensionTest.java @@ -25,7 +25,7 @@ import org.aspectj.tools.ajc.CompilationResult; * Tests the 'extensions' to AJDE: 1) ID is now available on messages to allow you to see what 'kind' of message it is - this * activates quick fixes/etc in Eclipse. */ -public class ExtensionTests extends AjcTestCase { +public class ExtensionTest extends AjcTestCase { public static final String PROJECT_DIR = "extensions"; private static final boolean debugTests = false; diff --git a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java index 69e5ea9d9..04a73d2f4 100644 --- a/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java +++ b/ajde/src/test/java/org/aspectj/ajde/ui/utils/TestCompilerConfiguration.java @@ -23,7 +23,7 @@ import java.util.Set; import org.aspectj.ajde.core.ICompilerConfiguration; import org.aspectj.ajde.core.IOutputLocationManager; import org.aspectj.ajde.core.JavaOptions; -import org.aspectj.tools.ajc.AjcTests; +import org.aspectj.testing.util.TestUtil; import org.aspectj.util.FileUtil; import org.aspectj.util.LangUtil; @@ -66,7 +66,7 @@ public class TestCompilerConfiguration implements ICompilerConfiguration { public String getClasspath() { String cp = projectPath + File.pathSeparator + System.getProperty("sun.boot.class.path") + File.pathSeparator - + AjcTests.aspectjrtClasspath(); + + TestUtil.aspectjrtClasspath(); if (LangUtil.is19VMOrGreater()) { cp = LangUtil.getJrtFsFilePath()+File.pathSeparator+cp; } -- 2.39.5