diff options
| author | acolyer <acolyer> | 2005-12-19 16:54:36 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2005-12-19 16:54:36 +0000 |
| commit | 1cbece39b31c67aa9c8711319c979992b1976536 (patch) | |
| tree | 16b19fd2a794f4889ac7684fa76a5b99d1f09ca9 /tests/java5 | |
| parent | 4fe2028e62f2fc77798eab5551f341f6b584dbde (diff) | |
| download | aspectj-1cbece39b31c67aa9c8711319c979992b1976536.tar.gz aspectj-1cbece39b31c67aa9c8711319c979992b1976536.zip | |
merge of RB_V1_5_0 changes back into HEAD
Diffstat (limited to 'tests/java5')
| -rw-r--r-- | tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java | 1 | ||||
| -rw-r--r-- | tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java b/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java index 2823251e5..d21fc7b7d 100644 --- a/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java +++ b/tests/java5/ataspectj/ataspectj/DeclareParentsInterfaceTest.java @@ -14,7 +14,6 @@ package ataspectj; import junit.framework.TestCase; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.DeclareImplements; import org.aspectj.lang.annotation.DeclareParents; import java.util.Arrays; diff --git a/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java b/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java index 5d4437eef..0703215f3 100644 --- a/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java +++ b/tests/java5/ataspectj/ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java @@ -15,9 +15,9 @@ import junit.framework.TestCase; import junit.framework.Test; import junit.framework.TestSuite; import ataspectj.TestHelper; +import org.aspectj.lang.annotation.DeclareParents; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.DeclareImplements; import org.aspectj.lang.Aspects; import java.io.Serializable; @@ -36,7 +36,7 @@ public class AspectOfWhenAspectNotInIncludeTest extends TestCase { @Aspect static class TestAspectForAspect { - @DeclareImplements("ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest.TestAspect") + @DeclareParents("ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest.TestAspect") Serializable shouldNotHappenDueToInclude; } |