aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoraclement <aclement>2010-04-13 20:19:48 +0000
committeraclement <aclement>2010-04-13 20:19:48 +0000
commit71e9eb0193883c01669eaa9c874330381899b54b (patch)
treeec33204984aeb0bf320b6f4bcad8f1330d14491d /tests
parent49da1e2edb3fa396405620a9930f33b14d7045a1 (diff)
downloadaspectj-71e9eb0193883c01669eaa9c874330381899b54b.tar.gz
aspectj-71e9eb0193883c01669eaa9c874330381899b54b.zip
308773
Diffstat (limited to 'tests')
-rw-r--r--tests/bugs169/pr308773/Aspy.aj4
-rw-r--r--tests/bugs169/pr308773/Middle.java3
-rw-r--r--tests/bugs169/pr308773/Top.java5
-rw-r--r--tests/bugs169/pr308773/Zzz.java6
-rw-r--r--tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc169/ajc169.xml4
6 files changed, 26 insertions, 0 deletions
diff --git a/tests/bugs169/pr308773/Aspy.aj b/tests/bugs169/pr308773/Aspy.aj
new file mode 100644
index 000000000..f9fa3ec3d
--- /dev/null
+++ b/tests/bugs169/pr308773/Aspy.aj
@@ -0,0 +1,4 @@
+
+public aspect Aspy {
+ before(): call(* *(..)) { }
+}
diff --git a/tests/bugs169/pr308773/Middle.java b/tests/bugs169/pr308773/Middle.java
new file mode 100644
index 000000000..08a894d0a
--- /dev/null
+++ b/tests/bugs169/pr308773/Middle.java
@@ -0,0 +1,3 @@
+public abstract class Middle<E> extends Top<E> {
+ class IteratorImpl extends TopInner { }
+}
diff --git a/tests/bugs169/pr308773/Top.java b/tests/bugs169/pr308773/Top.java
new file mode 100644
index 000000000..ef94dfc69
--- /dev/null
+++ b/tests/bugs169/pr308773/Top.java
@@ -0,0 +1,5 @@
+public class Top<K> {
+ class TopInner {
+ public void hhh() { }
+ }
+}
diff --git a/tests/bugs169/pr308773/Zzz.java b/tests/bugs169/pr308773/Zzz.java
new file mode 100644
index 000000000..752e3aeda
--- /dev/null
+++ b/tests/bugs169/pr308773/Zzz.java
@@ -0,0 +1,6 @@
+public abstract class Zzz<E> extends Middle<E> {
+ void removeAll() {
+ IteratorImpl it = new IteratorImpl();
+ it.hhh();
+ }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java b/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
index a48736be5..2a51db99a 100644
--- a/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc169/Ajc169Tests.java
@@ -29,6 +29,10 @@ public class Ajc169Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
// public void testAdvisingPrivilegedAccessMethod_307147() {
// runTest("advising privileged access method");
// }
+
+ public void testSubtleGenericsIssue_308773() {
+ runTest("subtle generics problem");
+ }
public void testAdvisingPrivilegedAccessMember_307120() {
runTest("advising privileged access member");
diff --git a/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml b/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
index fd5250e71..8a83d5bc4 100644
--- a/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
+++ b/tests/src/org/aspectj/systemtest/ajc169/ajc169.xml
@@ -2,6 +2,10 @@
<suite>
+ <ajc-test dir="bugs169/pr308773" title="subtle generics problem">
+ <compile files="Aspy.aj Zzz.java Top.java Middle.java" options="-1.5"/>
+ </ajc-test>
+
<ajc-test dir="bugs169/pr307147" title="advising privileged access method">
<compile files="B.java Test2.java" options="-showWeaveInfo">
<message kind="weave" text="Type 'B' (B.java) has intertyped method from 'Test'"/>