254207: tests and fix

8 files changed, 47 insertions, 1 deletions

diff --git a/tests/bugs163/pr254207/Abstract.java b/tests/bugs163/pr254207/Abstract.java
new file mode 100644
index 000000000..27653b6cc
--- /dev/null
+++ b/tests/bugs163/pr254207/Abstract.java
@@ -0,0 +1,3 @@
+public abstract aspect Abstract<T extends Integer> {
+  public abstract T getT();
+}
\ No newline at end of file
diff --git a/tests/bugs163/pr254207/Concrete.java b/tests/bugs163/pr254207/Concrete.java
new file mode 100644
index 000000000..08fe39d2b
--- /dev/null
+++ b/tests/bugs163/pr254207/Concrete.java
@@ -0,0 +1,5 @@
+public aspect Concrete extends Abstract<Number> {
+  public Number getT() {
+    return 5;
+  }
+}
diff --git a/tests/bugs163/pr254207/case2/Abstract.java b/tests/bugs163/pr254207/case2/Abstract.java
new file mode 100644
index 000000000..7df4e5f66
--- /dev/null
+++ b/tests/bugs163/pr254207/case2/Abstract.java
@@ -0,0 +1 @@
+public abstract aspect Abstract<T extends Interface> {}
diff --git a/tests/bugs163/pr254207/case2/Clazz.java b/tests/bugs163/pr254207/case2/Clazz.java
new file mode 100644
index 000000000..afa206cf5
--- /dev/null
+++ b/tests/bugs163/pr254207/case2/Clazz.java
@@ -0,0 +1 @@
+public class Clazz {}
diff --git a/tests/bugs163/pr254207/case2/Concrete.java b/tests/bugs163/pr254207/case2/Concrete.java
new file mode 100644
index 000000000..29b326ec5
--- /dev/null
+++ b/tests/bugs163/pr254207/case2/Concrete.java
@@ -0,0 +1 @@
+public aspect Concrete extends Abstract<Clazz> {}
diff --git a/tests/bugs163/pr254207/case2/Interface.java b/tests/bugs163/pr254207/case2/Interface.java
new file mode 100644
index 000000000..d99005812
--- /dev/null
+++ b/tests/bugs163/pr254207/case2/Interface.java
@@ -0,0 +1 @@
+public interface Interface {}
diff --git a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
index 8818ef5d9..7a38f7265 100644
--- a/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc163/Ajc163Tests.java
@@ -23,6 +23,18 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+	public void testOrderingIssue_1() {
+		runTest("ordering issue");
+	}
+
+	public void testOrderingIssue_2() {
+		runTest("ordering issue - 2");
+	}
+
+//	public void testGenericPointcuts_5() {
+//		runTest("generic pointcuts - 5");
+//	}
+
 	public void testGenericPointcuts_1() {
 		runTest("generic pointcuts - 1");
 	}
@@ -39,6 +51,7 @@ public class Ajc163Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 		runTest("generic pointcuts - 4");
 	}
 
+
 	// public void testBrokenLVT_pr194314_1() throws Exception {
 	// runTest("broken lvt - 1");
 	// JavaClass jc = Utils.getClassFrom(ajc.getSandboxDirectory().getAbsolutePath(), "Service");
diff --git a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
index af8154154..f3e82e8ed 100644
--- a/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
+++ b/tests/src/org/aspectj/systemtest/ajc163/ajc163.xml
@@ -2,6 +2,20 @@
 
 <suite>
 
+    <ajc-test dir="bugs163/pr254207" title="ordering issue">
+      <compile files="Abstract.java Concrete.java" options="-1.5 -proceedOnError -Xset:pipelineCompilation=false">
+        <message kind="error" line="1" text="Bound mismatch"/>
+      </compile>      
+      <compile files="Concrete.java Abstract.java" options="-1.5 -proceedOnError -Xset:pipelineCompilation=false">
+        <message kind="error" line="1" text="Bound mismatch"/>
+      </compile>
+    </ajc-test>
+    
+    <ajc-test dir="bugs163/pr254207/case2" title="ordering issue - 2">
+      <compile files="Interface.java Clazz.java Abstract.java Concrete.java" options="-1.5 -proceedOnError -Xset:pipelineCompilation=false">
+        <message kind="error" line="1" text="Bound mismatch"/>
+      </compile>      
+    </ajc-test>
 
     <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 1">
       <compile files="CodeOne.java" options="-1.5">
@@ -14,7 +28,7 @@
     </ajc-test>
     
     <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 3">
-      <compile files="CodeThree.java" options="-1.5 -showWeaveInfo">      
+      <compile files="CodeThree.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:4)"/>
         <message kind="weave" text="advised by before advice from 'CodeThree' (CodeThree.java:5) [with runtime test]"/>
         <message kind="warning" line="6" text="has not been applied"/>
@@ -31,6 +45,13 @@
         <message kind="warning" text="has not been applied"/>
       </compile>
     </ajc-test>
+    
+    <ajc-test dir="bugs163/pr253109" title="generic pointcuts - 5">
+      <compile files="CodeFive.java" options="-1.5 -showWeaveInfo">
+        <message kind="weave" text="advised by around advice"/>
+      </compile>
+    </ajc-test>
+    
 
     <ajc-test dir="bugs163/pr194314" title="broken lvt - 1">
       <compile files="Service.java IService.java Main.java ServiceInterceptor.java" options="-1.5"/>