From 9803f22ec4337779057f4ec2ace35f2d6483d6dd Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 23 Jan 2019 19:29:58 -0800 Subject: [PATCH] mavenized org.aspectj.matcher - finished --- org.aspectj.matcher/pom.xml | 2 +- ...eflectionWorldPointcutExpressionTest.java} | 2 +- .../aspectj/weaver/MatcherModuleTests.java | 40 --------------- ...FactoryTests.java => TypeFactoryTest.java} | 2 +- .../weaver/patterns/PatternsTests.java | 50 ------------------- ...leScopeTests.java => SimpleScopeTest.java} | 2 +- 6 files changed, 4 insertions(+), 94 deletions(-) rename org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/{ReflectionWorldPointcutExpressionTests.java => ReflectionWorldPointcutExpressionTest.java} (78%) delete mode 100644 org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java rename org.aspectj.matcher/src/test/java/org/aspectj/weaver/{TypeFactoryTests.java => TypeFactoryTest.java} (98%) delete mode 100644 org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java rename org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/{SimpleScopeTests.java => SimpleScopeTest.java} (99%) diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml index d2b02f44a..4e67ef7f9 100644 --- a/org.aspectj.matcher/pom.xml +++ b/org.aspectj.matcher/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTest.java similarity index 78% rename from org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTest.java index 1a5f9be43..b057b4ab8 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTest.java @@ -8,7 +8,7 @@ import org.aspectj.weaver.reflect.ReflectionWorld; * * @author Andy Clement */ -public class ReflectionWorldPointcutExpressionTests extends CommonPointcutExpressionTests { +public class ReflectionWorldPointcutExpressionTest extends CommonPointcutExpressionTests { protected World getWorld() { return new ReflectionWorld(true, getClass().getClassLoader()); diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java deleted file mode 100644 index 234e387de..000000000 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java +++ /dev/null @@ -1,40 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 2002-2008 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: - * PARC initial implementation - * ******************************************************************/ - -// default package -package org.aspectj.weaver; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.aspectj.matcher.tools.ReflectionWorldPointcutExpressionTests; -import org.aspectj.weaver.patterns.PatternsTests; -import org.aspectj.weaver.reflect.ReflectionWorldBasicTest; -import org.aspectj.weaver.reflect.ReflectionWorldSpecificTest; - -public class MatcherModuleTests extends TestCase { - - public MatcherModuleTests(String name) { - super(name); - } - - public static Test suite() { - TestSuite suite = new TestSuite(MatcherModuleTests.class.getName()); - suite.addTestSuite(ReflectionWorldSpecificTest.class); - suite.addTestSuite(ReflectionWorldBasicTest.class); - suite.addTestSuite(ReflectionWorldPointcutExpressionTests.class); - suite.addTestSuite(TypeFactoryTests.class); - suite.addTest(PatternsTests.suite()); - return suite; - } -} diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTest.java similarity index 98% rename from org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTest.java index 40fed411a..845272366 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTests.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTest.java @@ -15,7 +15,7 @@ import junit.framework.TestCase; * * @author Andy Clement */ -public class TypeFactoryTests extends TestCase { +public class TypeFactoryTest extends TestCase { public void testParameterizedSig() { UnresolvedType t = null; diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java deleted file mode 100644 index afd75eab3..000000000 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java +++ /dev/null @@ -1,50 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 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.weaver.patterns; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class PatternsTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(PatternsTests.class.getName()); - // $JUnit-BEGIN$ - suite.addTestSuite(AndOrNotTestCase.class); - suite.addTestSuite(BindingTestCase.class); - suite.addTestSuite(DeclareErrorOrWarningTestCase.class); - suite.addTestSuite(ModifiersPatternTestCase.class); - suite.addTestSuite(NamePatternParserTestCase.class); - suite.addTestSuite(NamePatternTestCase.class); - suite.addTestSuite(ParserTestCase.class); - suite.addTestSuite(SignaturePatternTestCase.class); - suite.addTestSuite(ThisOrTargetTestCase.class); - suite.addTestSuite(TypePatternListTestCase.class); - suite.addTestSuite(TypePatternTestCase.class); - suite.addTestSuite(SimpleScopeTests.class); - suite.addTestSuite(WithinTestCase.class); - suite.addTestSuite(ArgsTestCase.class); - // suite.addTestSuite(AnnotationPatternTestCase.class); - // suite.addTestSuite(AnnotationPatternMatchingTestCase.class); - suite.addTestSuite(PointcutRewriterTest.class); - suite.addTestSuite(VisitorTestCase.class); - // $JUnit-END$ - return suite; - } - - public PatternsTests(String name) { - super(name); - } - -} diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTest.java similarity index 99% rename from org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTests.java rename to org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTest.java index 8df97e2f3..f4ae843dc 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTests.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTest.java @@ -16,7 +16,7 @@ import org.aspectj.weaver.UnresolvedType; import org.aspectj.weaver.World; import org.aspectj.weaver.reflect.ReflectionWorld; -public class SimpleScopeTests extends PatternsTestCase { +public class SimpleScopeTest extends PatternsTestCase { public World getWorld() { return new ReflectionWorld(true, this.getClass().getClassLoader()); -- 2.39.5