diff options
| author | acolyer <acolyer> | 2005-03-09 15:03:50 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-03-09 15:03:50 +0000 |
| commit | 4ca8479d63c935c1942a41b31d7f6a0a26781dd3 (patch) | |
| tree | 0ed0a50a8767bd512fc273e0b03ba34c1b86fa8c /tests/src | |
| parent | f90186cb8eac1b4abae4c9b8fd74828b98f534ab (diff) | |
| download | aspectj-4ca8479d63c935c1942a41b31d7f6a0a26781dd3.tar.gz aspectj-4ca8479d63c935c1942a41b31d7f6a0a26781dd3.zip | |
remove accidental 1.5 dependency in tests module
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/Annotations.java | 18 | ||||
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 3 |
2 files changed, 2 insertions, 19 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java b/tests/src/org/aspectj/systemtest/ajc150/Annotations.java index 4e0a16d45..4cf7d0a7b 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/Annotations.java +++ b/tests/src/org/aspectj/systemtest/ajc150/Annotations.java @@ -11,9 +11,6 @@ package org.aspectj.systemtest.ajc150; import java.io.File; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.net.URLClassLoader; import junit.framework.Test; @@ -88,21 +85,6 @@ public class Annotations extends XMLBasedAjcTestCase { public void testAnnotatedAdvice() { runTest("annotated advice"); - try { - File classFile = new File(ajc.getSandboxDirectory(),"a/AnnotatedAspect05.class"); - ClassLoader cl = new URLClassLoader(new URL[] {ajc.getSandboxDirectory().toURI().toURL()}); - Class c = cl.loadClass("a.AnnotatedAspect05"); - Class ann = cl.loadClass("a.AnyAnnotation"); - java.lang.reflect.Method[] methods = c.getDeclaredMethods(); - for (int i = 0; i < methods.length; i++) { - if (methods[i].getName().startsWith("ajc$afterThrowing")) { - Annotation annotation = methods[i].getAnnotation(ann); - assertNotNull("Should have @AnyAnnotation",annotation); - } - } - } catch (Exception ex) { - fail(ex.getMessage()); - } } public void testAnnotatedAdviceWithWrongAnnotationType() { diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index 258145e5c..094ddf858 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -994,8 +994,9 @@ <ajc-test dir="java5/annotations/aspectMembers" title="annotated advice"> <compile files="a/Annotations.java,a/AnnotatedAspect05.aj" options="-1.5"> - <message kind="warning" line="16"/> + <message kind="warning" line="17"/> </compile> + <run class="a.AnnotatedAspect05"/> </ajc-test> <ajc-test dir="java5/annotations/aspectMembers" title="annotated advice with bad target"> |