testcode for problem found whilst looking into 153380

diff --git a/tests/bugs153/pr153380/case1/Ann.java b/tests/bugs153/pr153380/case1/Ann.java
new file mode 100644 (file)
index 0000000..6184025
--- /dev/null
+++ b/tests/bugs153/pr153380/case1/Ann.java
@@ -0,0 +1,4 @@
+import java.lang.retention.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface Ann {}

diff --git a/tests/bugs153/pr153380/case1/Base.java b/tests/bugs153/pr153380/case1/Base.java
new file mode 100644 (file)
index 0000000..57ac85b
--- /dev/null
+++ b/tests/bugs153/pr153380/case1/Base.java
@@ -0,0 +1,2 @@
+@Ann
+public interface Base {}

diff --git a/tests/bugs153/pr153380/case1/BaseImpl.java b/tests/bugs153/pr153380/case1/BaseImpl.java
new file mode 100644 (file)
index 0000000..8622a1e
--- /dev/null
+++ b/tests/bugs153/pr153380/case1/BaseImpl.java
@@ -0,0 +1,2 @@
+@Ann
+public class BaseImpl implements Base {}

diff --git a/tests/bugs153/pr153380/case1/I1.java b/tests/bugs153/pr153380/case1/I1.java
new file mode 100644 (file)
index 0000000..518950d
--- /dev/null
+++ b/tests/bugs153/pr153380/case1/I1.java
@@ -0,0 +1 @@
+interface I1 {}

diff --git a/tests/bugs153/pr153380/case1/Mixin.java b/tests/bugs153/pr153380/case1/Mixin.java
new file mode 100644 (file)
index 0000000..7ce9c10
--- /dev/null
+++ b/tests/bugs153/pr153380/case1/Mixin.java
@@ -0,0 +1,2 @@
+interface Mixin {public void m();}
+

diff --git a/tests/bugs153/pr153380/case1/Runner.java b/tests/bugs153/pr153380/case1/Runner.java
new file mode 100644 (file)
index 0000000..5ca3335
--- /dev/null
+++ b/tests/bugs153/pr153380/case1/Runner.java
@@ -0,0 +1,9 @@
+public class Runner {
+  public static void main(String []argv) {
+    new BaseImpl().m();
+  }
+
+  static aspect A{
+    before(): call(* *(..)) {}
+  }
+}

diff --git a/tests/bugs153/pr153380/case1/X.aj b/tests/bugs153/pr153380/case1/X.aj
new file mode 100644 (file)
index 0000000..5fdffda
--- /dev/null
+++ b/tests/bugs153/pr153380/case1/X.aj
@@ -0,0 +1,5 @@
+public aspect X {
+  declare parents: @Ann * extends I1,Mixin;
+  int Mixin.i;
+  public void Mixin.m() {}
+}

diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
index a39c20242e64392c1d8a6b01278253d5838accd0..afae345b96ee50be77455d4920889af5dcdd8299 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
@@ -27,6 +27,7 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   // public void testArgnamesAndJavac_pr148381() { runTest("argNames and javac");}
   // public void testCFlowXMLAspectLTW_pr149096() { runTest("cflow xml concrete aspect"); }
   // public void testAmbiguousBinding_pr121805() { runTest("ambiguous binding");}
+  public void testPipeliningProblemWithAnnotationsDecp_pr153380_1() { runTest("pipelining decps");}
   public void testUnwantedPointcutWarning_pr148219() { runTest("unwanted warning for pointcut");}
   public void testDecpAndCflowadderMungerClash_pr152631() { runTest("decp and cflowadder munger clash");}
   public void testGenericInheritanceDecp_pr150095() { runTest("generics, inheritance and decp");}

diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
index 961c4010d715908911e84215f9e21ba500cdfd01..59bacc5b40cf9794c6aed2c7d276f88fb383c775 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
+++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
@@ -16,6 +16,13 @@
       </run>
     </ajc-test>
     
+    <ajc-test dir="bugs153/pr153380/case1" title="pipelining decps">
+      <compile files="Ann.java,Base.java,BaseImpl.java,I1.java,Mixin.java,Runner.java,X.aj" options="-1.5">
+        <message kind="error" line="1" text="The import java.lang.retention cannot be resolved"/>
+        <message kind="error" line="3" text="Retention cannot be resolved to a type"/>
+      </compile>
+    </ajc-test>
+    
     <ajc-test dir="bugs153/pr148381" title="argNames and javac">
       <!--compile files="C.java" options="-1.5"/>
       <compile files="A.java" options="-1.5"/-->