diff options
Diffstat (limited to 'aspectj5rt')
| -rw-r--r-- | aspectj5rt/.classpath | 37 | ||||
| -rw-r--r-- | aspectj5rt/java5-src/org/aspectj/internal/lang/reflect/AdviceImpl.java | 1 | ||||
| -rw-r--r-- | aspectj5rt/java5-testsrc/Aspectj5rt15ModuleTests.java | 32 | ||||
| -rw-r--r-- | aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java (renamed from aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java) | 0 | ||||
| -rw-r--r-- | aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java (renamed from aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java) | 0 | ||||
| -rw-r--r-- | aspectj5rt/testsrc/Aspectj5rtModuleTests.java | 12 |
6 files changed, 68 insertions, 14 deletions
diff --git a/aspectj5rt/.classpath b/aspectj5rt/.classpath index 81b85bea2..ad9ea7abc 100644 --- a/aspectj5rt/.classpath +++ b/aspectj5rt/.classpath @@ -1,9 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="java5-src"/> - <classpathentry sourcepath="/JRE15_SRC" kind="var" path="JRE15_LIB"/> - <classpathentry kind="src" path="/runtime"/> - <classpathentry kind="src" path="testsrc"/> - <classpathentry sourcepath="/lib/junit/junit-src.jar" kind="lib" path="/lib/junit/junit.jar"/> + <classpathentry kind="src" path="java5-src"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="testsrc"> + <attributes> + </attributes> + </classpathentry> + <classpathentry sourcepath="/JRE15_SRC" kind="var" path="JRE15_LIB"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="/runtime"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="java5-testsrc"> + <attributes> + </attributes> + </classpathentry> + <classpathentry sourcepath="/lib/junit/junit-src.jar" kind="lib" path="/lib/junit/junit.jar"> + <attributes> + </attributes> + </classpathentry> + <classpathentry kind="src" path="src"> + <attributes> + </attributes> + </classpathentry> + <classpathentry combineaccessrules="false" kind="src" path="/testing-util"> + <attributes> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/aspectj5rt/java5-src/org/aspectj/internal/lang/reflect/AdviceImpl.java b/aspectj5rt/java5-src/org/aspectj/internal/lang/reflect/AdviceImpl.java index f29d93599..895e4b4a4 100644 --- a/aspectj5rt/java5-src/org/aspectj/internal/lang/reflect/AdviceImpl.java +++ b/aspectj5rt/java5-src/org/aspectj/internal/lang/reflect/AdviceImpl.java @@ -14,7 +14,6 @@ package org.aspectj.internal.lang.reflect; import java.lang.reflect.Method; import org.aspectj.lang.annotation.AdviceName; -import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.Advice; import org.aspectj.lang.reflect.AdviceType; diff --git a/aspectj5rt/java5-testsrc/Aspectj5rt15ModuleTests.java b/aspectj5rt/java5-testsrc/Aspectj5rt15ModuleTests.java new file mode 100644 index 000000000..b0ab7d1fe --- /dev/null +++ b/aspectj5rt/java5-testsrc/Aspectj5rt15ModuleTests.java @@ -0,0 +1,32 @@ +/* ******************************************************************* + * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Wes Isberg initial implementation + * ******************************************************************/ + +// default package + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.aspectj.internal.lang.reflect.AjTypeTests; +import org.aspectj.internal.lang.reflect.AjTypeTestsWithAspects; + +public class Aspectj5rt15ModuleTests extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite("Aspectj5rt module tests"); + suite.addTestSuite(AjTypeTests.class); + suite.addTestSuite(AjTypeTestsWithAspects.class); + return suite; + } + + +} diff --git a/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java index dde2f4fba..dde2f4fba 100644 --- a/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java +++ b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTests.java diff --git a/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java index 1ecd34516..1ecd34516 100644 --- a/aspectj5rt/testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java +++ b/aspectj5rt/java5-testsrc/org/aspectj/internal/lang/reflect/AjTypeTestsWithAspects.java diff --git a/aspectj5rt/testsrc/Aspectj5rtModuleTests.java b/aspectj5rt/testsrc/Aspectj5rtModuleTests.java index ff1e30a2f..f0f6a3064 100644 --- a/aspectj5rt/testsrc/Aspectj5rtModuleTests.java +++ b/aspectj5rt/testsrc/Aspectj5rtModuleTests.java @@ -11,22 +11,18 @@ * ******************************************************************/ // default package +import org.aspectj.testing.util.TestUtil; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.aspectj.internal.lang.reflect.AjTypeTests; -import org.aspectj.internal.lang.reflect.AjTypeTestsWithAspects; - public class Aspectj5rtModuleTests extends TestCase { - public static Test suite() { + public static Test suite() { TestSuite suite = new TestSuite("Aspectj5rt module tests"); - suite.addTestSuite(AjTypeTests.class); - suite.addTestSuite(AjTypeTestsWithAspects.class); + TestUtil.loadTestsReflectively(suite, "Aspectj5rt15ModuleTests", true); return suite; } - -} +} |