tests for pr11280, update to reflection api to get classloading right for test suite etc.

3 files changed, 52 insertions, 1 deletions

diff --git a/tests/bugs150/Pr112880.aj b/tests/bugs150/Pr112880.aj
new file mode 100644
index 000000000..14a3d9d87
--- /dev/null
+++ b/tests/bugs150/Pr112880.aj
@@ -0,0 +1,37 @@
+
+abstract class AbstractAttributeGuiFactory<A,B> {
+	
+	public A getThis() {
+		return null;
+	}
+	
+	public B getThat() {
+		return null;
+	}
+	
+}
+
+class ColorAttributeGuiFactory extends AbstractAttributeGuiFactory<C1,C2> {}
+
+class C1 {}
+
+class C2 {}
+
+aspect ForceParameterization {
+	
+	
+	before() : call(C1 *(..)) || call(C2 *(..)) {
+		System.out.println("method returning C1 or C2");
+	}
+	
+}
+
+public class Pr112880 {
+	
+	public static void main(String[] args) {
+		ColorAttributeGuiFactory f = new ColorAttributeGuiFactory();
+		f.getThis();
+		f.getThat();
+	}
+	
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index c0ae27441..282e04c8b 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -747,6 +747,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	  runTest("parameterized pointcut and advice");
   }
   
+  public void testDoublyParameterizedAbstractType() {
+	  runTest("double parameter generic abstract type");
+  }
+  
   /*
    * Load-time weaving bugs
    */
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 311903ca1..bc6d6d009 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -37,8 +37,18 @@
     				<line text="AA.going()"/>
     			</stdout>
     		</run>
-    </ajc-test>acj
+    </ajc-test>
     
+    <ajc-test dir="bugs150" pr="112880" title="double parameter generic abstract type">
+    	  <compile files="Pr112880.aj" options="-1.5">
+    	  </compile>
+    	  <run class="Pr112880">
+    	  	<stdout>
+    	  		<line text="method returning C1 or C2"/>
+    	  		<line text="method returning C1 or C2"/>
+    	  	</stdout>
+    	  </run>
+    </ajc-test>
     
     <ajc-test dir="bugs150/pr114005" title="Annotated ITDFs - 2">
       <compile files="Declaration2.java" options="-1.5"/>