summaryrefslogtreecommitdiffstats
path: root/tests/src/org
diff options
context:
space:
mode:
authoraclement <aclement>2005-06-16 08:30:14 +0000
committeraclement <aclement>2005-06-16 08:30:14 +0000
commit7d5002ad52c86eefdf58535310fb41f042206d11 (patch)
treea9efaf7dc22a967c3a6cf5e33f47b255911db471 /tests/src/org
parentb01b97912b612fa87e887c11dbe1fac583d0c7aa (diff)
downloadaspectj-7d5002ad52c86eefdf58535310fb41f042206d11.tar.gz
aspectj-7d5002ad52c86eefdf58535310fb41f042206d11.zip
Fix and tests for bug 100227: [generics][itds] inner class with generic enclosing class
Diffstat (limited to 'tests/src/org')
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java7
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ajc150.xml12
2 files changed, 16 insertions, 3 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index f3bf1c418..1292a7475 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -180,9 +180,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
public void testGenerics_pr99089() {runTest("ArrayIndexOutOfBoundsException - Generics in privileged aspects");}
- public void testItdGenerics_pr99228() {runTest("ITD of a field into a generic class");}
- public void testItdGenerics_pr98320() {runTest("intertype with nested generic type");}
-
+ public void testItdGenerics_pr99228() {runTest("ITD of a field into a generic class");}
+ public void testItdGenerics_pr98320() {runTest("intertype with nested generic type");}
+ public void testItdGenerics_pr100227() {runTest("inner class with generic enclosing class");}
+
// helper methods.....
public SyntheticRepository createRepos(File cpentry) {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 00ab89eb9..48cadc36e 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2275,6 +2275,18 @@
<compile files="PR95992.java" options="-1.5"/>
</ajc-test>
+ <ajc-test dir="bugs150" pr="100227" title="inner class with generic enclosing class">
+ <compile files="pr100227.aj" options="-1.5"/>
+ <run class="pr100227">
+ <stderr>
+ <line text="Outer.Inner.inner=2"/>
+ <line text="Outer.Inner.p() executing"/>
+ <line text="Generic_Outer.Inner.inner=4"/>
+ <line text="Generic_Outer.Inner.p() executing"/>
+ </stderr>
+ </run>
+ </ajc-test>
+
// end of generic bugs
// generic aspects