summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authoraclement <aclement>2006-05-23 10:37:22 +0000
committeraclement <aclement>2006-05-23 10:37:22 +0000
commit7d99a23266ff26d1be0bd46af8ab7b3951cb9230 (patch)
tree1f3a44ca1e7a0b7df65be7b06863a59d56bcd7a6 /tests/src
parent69e24e90d4fee7115ecbc8c7786915b1f741471b (diff)
downloadaspectj-7d99a23266ff26d1be0bd46af8ab7b3951cb9230.tar.gz
aspectj-7d99a23266ff26d1be0bd46af8ab7b3951cb9230.zip
test and fix for first part of 126355
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java7
-rw-r--r--tests/src/org/aspectj/systemtest/ajc152/ajc152.xml10
2 files changed, 17 insertions, 0 deletions
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"/>