test and fix for first part of 126355

4 files changed, 29 insertions, 0 deletions

diff --git a/tests/bugs152/pr126355/Pair.java b/tests/bugs152/pr126355/Pair.java
new file mode 100644
index 000000000..385b403d7
--- /dev/null
+++ b/tests/bugs152/pr126355/Pair.java
@@ -0,0 +1,7 @@
+public class Pair<F, S> {
+    public Pair(F first, S second) { }
+}
+
+aspect IdempotentCache pertarget(cached()) {
+    pointcut cached(): execution(public * *(..)) && within(Pair);
+}
diff --git a/tests/bugs152/pr126355/Test.java b/tests/bugs152/pr126355/Test.java
new file mode 100644
index 000000000..a87128f1e
--- /dev/null
+++ b/tests/bugs152/pr126355/Test.java
@@ -0,0 +1,5 @@
+public class Test {
+	public static void main (String args[]) {
+		Pair<String,String> pair = new Pair<String,String>("one","two");
+	}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index 1105d8235..230564f07 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -17,6 +17,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+  public void testFunkyGenericErrorWithITDs_pr126355() { runTest("bizarre generic error with itds");}
   public void testConcretizingAbstractMethods_pr142466() { runTest("aop.xml aspect inheriting but not concretizing abstract method");}
   public void testConcretizingAbstractMethods_pr142466_2() { runTest("aop.xml aspect inheriting but not concretizing abstract method - 2");}
   public void testComplexGenericDecl_pr137568() { runTest("complicated generics declaration");}
@@ -69,6 +70,12 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testJarChecking_pr137235_2() { runTest("directory with .jar extension"); }
   public void testMakePreMethodNPE_pr136393() { runTest("NPE in makePreMethod");}
 
+//  public void testFunkyGenericErrorWithITDs_pr126355_2() { 
+//	  runTest("bizarre generic error with itds - 2");
+//	  // public class Pair<F,S> affected by pertarget aspect
+//	  GenericsTests.verifyClassSignature(ajc,"Pair","<F:Ljava/lang/Object;S:Ljava/lang/Object;>Ljava/lang/Object;LIdempotentCache$ajcMightHaveAspect;;");
+//  }
+
   // tests that can't be included for some reason
 
   // Not valid whilst the ajc compiler forces debug on (ignores -g:none) - it will be green but is invalid, trust me
diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
index 64857100d..18111ec69 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
@@ -15,6 +15,16 @@
       </run>
     </ajc-test>
 
+	<ajc-test dir="bugs152/pr126355" title="bizarre generic error with itds">
+     <compile files="Pair.java" options="-1.5"/>
+     <compile files="Test.java" options="-1.5"/>
+    </ajc-test>
+    
+	<ajc-test dir="bugs152/pr126355" title="bizarre generic error with itds - 2">
+     <compile files="Pair.java" options="-1.5"/>
+     <compile files="Test.java" options="-1.5"/>
+    </ajc-test>
+
     <ajc-test dir="bugs152/pr132349" title="ITD on inner type of generic type">
      <compile files="TopLevelType.java" options="-1.5"/>
      <run class="TopLevelType"/>