aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoraclement <aclement>2009-09-08 20:58:31 +0000
committeraclement <aclement>2009-09-08 20:58:31 +0000
commit21acc37186a54ed6293634acf43072298377b679 (patch)
treef36bede99d1a453ccc2aca0a808cf3732303efe3 /tests
parentb7c2c83e419e9db51130e169acade68a7d0d0599 (diff)
downloadaspectj-21acc37186a54ed6293634acf43072298377b679.tar.gz
aspectj-21acc37186a54ed6293634acf43072298377b679.zip
288049: wrong message for wildcarded dec anno: fix
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs166/pr288049/org/othtests/AddSomeAnnotation.java7
-rw-r--r--tests/bugs166/pr288049/org/othtests/MyClass.java5
-rw-r--r--tests/bugs166/pr288049/org/othtests/MySubClass.java13
-rw-r--r--tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java6
-rw-r--r--tests/src/org/aspectj/systemtest/ajc166/ajc166.xml11
5 files changed, 35 insertions, 7 deletions
diff --git a/tests/bugs166/pr288049/org/othtests/AddSomeAnnotation.java b/tests/bugs166/pr288049/org/othtests/AddSomeAnnotation.java
new file mode 100644
index 000000000..7960a93f0
--- /dev/null
+++ b/tests/bugs166/pr288049/org/othtests/AddSomeAnnotation.java
@@ -0,0 +1,7 @@
+package org.othtests;
+
+public aspect AddSomeAnnotation {
+
+ declare @method : public String MyClass+.do*(..) : @Deprecated;
+
+}
diff --git a/tests/bugs166/pr288049/org/othtests/MyClass.java b/tests/bugs166/pr288049/org/othtests/MyClass.java
new file mode 100644
index 000000000..5b32b2af9
--- /dev/null
+++ b/tests/bugs166/pr288049/org/othtests/MyClass.java
@@ -0,0 +1,5 @@
+package org.othtests;
+
+public class MyClass {
+
+}
diff --git a/tests/bugs166/pr288049/org/othtests/MySubClass.java b/tests/bugs166/pr288049/org/othtests/MySubClass.java
new file mode 100644
index 000000000..e99d99826
--- /dev/null
+++ b/tests/bugs166/pr288049/org/othtests/MySubClass.java
@@ -0,0 +1,13 @@
+package org.othtests;
+
+public class MySubClass extends MyClass {
+
+ public String doOne() {
+ return "one";
+ }
+
+ public String doTwo() {
+ return "two";
+ }
+
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
index b1265f46f..d497e37f6 100644
--- a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
@@ -18,9 +18,9 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
- // public void testITDannos_288049() {
- // runTest("itd decanno");
- // }
+ public void testITDannos_288049() {
+ runTest("itd decanno");
+ }
public void testVerifyErrorAnnoStyle_288712() {
runTest("verifyerror anno style");
diff --git a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
index 27ba2bf23..073933789 100644
--- a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
+++ b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
@@ -2,15 +2,18 @@
<suite>
+ <ajc-test dir="bugs166/pr288049" title="itd decanno">
+ <compile files="org/othtests/MyClass.java org/othtests/MySubClass.java org/othtests/AddSomeAnnotation.java" options="-1.5 -showWeaveInfo">
+ <message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doOne()' (MySubClass.java:5) is annotated with"/>
+ <message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doTwo()' (MySubClass.java:9) is annotated with"/>
+ </compile>
+ </ajc-test>
+
<ajc-test dir="bugs166/pr288712" title="verifyerror anno style">
<compile files="answers/Answer2h.java figures/FigureElement.java figures/Line.java figures/Point.java figures/ShapeFigureElement.java Main.java" options="-1.5"/>
<run class="Main"/>
</ajc-test>
- <ajc-test dir="bugs166/pr288049" title="itd decanno">
- <compile files="org/tests/AClass.java org/tests/ASubClass.java org/tests/DeclareAnns.aj" options="-1.5"/>
- </ajc-test>
-
<ajc-test dir="bugs166/pr288635" title="munger cce">
<compile files="org/tests/atann/AddAnnotations.aj org/tests/atann/AddITDDoMethod.aj org/tests/atann/InterceptTraceds.aj org/tests/atann/TestClass.java org/tests/atann/Traced.java" options="-1.5"/>
<run class="org.tests.atann.TestClass"/>