aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2009-10-23 18:59:03 +0000
committeraclement <aclement>2009-10-23 18:59:03 +0000
commit94e49ef3791e21ca5e73e7bd924367fcda07aedb (patch)
tree0378376e5ff26f22559b8be65db3008afa43f0e9
parentbccc3395c43335b671d1f060f370e644053fe268 (diff)
downloadaspectj-94e49ef3791e21ca5e73e7bd924367fcda07aedb.tar.gz
aspectj-94e49ef3791e21ca5e73e7bd924367fcda07aedb.zip
293203: annotations with multiple ellipses'
-rw-r--r--tests/bugs167/pr293203/Foo.java16
-rw-r--r--tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java5
-rw-r--r--tests/src/org/aspectj/systemtest/ajc167/ajc167.xml11
3 files changed, 32 insertions, 0 deletions
diff --git a/tests/bugs167/pr293203/Foo.java b/tests/bugs167/pr293203/Foo.java
new file mode 100644
index 000000000..83e766d63
--- /dev/null
+++ b/tests/bugs167/pr293203/Foo.java
@@ -0,0 +1,16 @@
+public class Foo {
+ public void m(int i,@Anno String s,int j) {}
+
+ public static void main(String []argv) {
+ new Foo().m(1,"A",2);
+ }
+}
+
+@interface Anno {}
+
+aspect X {
+ before(): execution(* *(..,String,..)) {System.out.println("advice");}
+ before(): execution(* *(..,@Anno (String),..)) {System.out.println("advice");}
+ before(): execution(* *(*,@Anno (String),*)) {System.out.println("advice");}
+}
+
diff --git a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
index 54c81d216..d72b058b0 100644
--- a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java
@@ -18,6 +18,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+ public void testAnnoMatching_pr293203() {
+ runTest("anno matching");
+ }
+
public void testScalaOuterClassNames_pr288064() {
runTest("outer class names - scala");
}
@@ -32,6 +36,7 @@ public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
return XMLBasedAjcTestCase.loadSuite(Ajc167Tests.class);
}
+ @Override
protected File getSpecFile() {
return new File("../tests/src/org/aspectj/systemtest/ajc167/ajc167.xml");
}
diff --git a/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
index e4469113d..1140441a1 100644
--- a/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
+++ b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml
@@ -2,6 +2,17 @@
<suite>
+ <ajc-test dir="bugs167/pr293203" title="anno matching">
+ <compile files="Foo.java" options="-1.5"/>
+ <run class="Foo">
+ <stdout>
+ <line text="advice"/>
+ <line text="advice"/>
+ <line text="advice"/>
+ </stdout>
+ </run>
+ </ajc-test>
+
<ajc-test dir="bugs167/pr288064" title="outer class names - scala">
<compile files="Main.java Outer.java Aspect.java" options="-1.5"/>
<run class="test.Main">