314840: test and fix

4 files changed, 53 insertions, 0 deletions

diff --git a/tests/bugs169/pr314840/Arguments.aj b/tests/bugs169/pr314840/Arguments.aj
new file mode 100644
index 000000000..846a2008f
--- /dev/null
+++ b/tests/bugs169/pr314840/Arguments.aj
@@ -0,0 +1,21 @@
+package com.test;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.Pointcut;
+
+public aspect Arguments {
+
+//    @Pointcut("execution(@Test * *(..)) && @annotation(test) && @within( test1) && this(test2)")
+ //   public void unit(Test2 test2, Test1 test1, Test test) {
+  //  }
+
+    @Around("execution(@Test * *(..)) && @annotation(test) && @within( test1 ) && this(test2)")
+    public void test( ProceedingJoinPoint pjp,
+              Test test2,
+                      Test1 test1,
+                      Test test){
+
+    }
+}
+
diff --git a/tests/bugs169/pr314840/Test.java b/tests/bugs169/pr314840/Test.java
new file mode 100644
index 000000000..a97c943e9
--- /dev/null
+++ b/tests/bugs169/pr314840/Test.java
@@ -0,0 +1,12 @@
+package com.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention( RetentionPolicy.RUNTIME )
+@Target({ ElementType.METHOD })
+public @interface Test {
+
+}
diff --git a/tests/bugs169/pr314840/Test1.java b/tests/bugs169/pr314840/Test1.java
new file mode 100644
index 000000000..a4839e95f
--- /dev/null
+++ b/tests/bugs169/pr314840/Test1.java
@@ -0,0 +1,12 @@
+package com.test;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention( RetentionPolicy.RUNTIME )
+//@Target({ ElementType.METHOD })
+public @interface Test1 {
+
+}
diff --git a/tests/bugs169/pr314840/Test2.java b/tests/bugs169/pr314840/Test2.java
new file mode 100644
index 000000000..b6aec2817
--- /dev/null
+++ b/tests/bugs169/pr314840/Test2.java
@@ -0,0 +1,8 @@
+package com.test;
+
+@Test1
+public class Test2 {
+
+  @Test
+  public void m() { }
+}