384398: some fixes for generics/itds/inner classes

6 files changed, 76 insertions, 0 deletions

diff --git a/tests/bugs171/pr384398/A.java b/tests/bugs171/pr384398/A.java
new file mode 100755
index 000000000..bc79f0699
--- /dev/null
+++ b/tests/bugs171/pr384398/A.java
@@ -0,0 +1,9 @@
+package de.example;

+

+public class A<T> {

+	public static class InnerA{

+		

+	}

+	

+

+}

diff --git a/tests/bugs171/pr384398/B.java b/tests/bugs171/pr384398/B.java
new file mode 100755
index 000000000..4673547a0
--- /dev/null
+++ b/tests/bugs171/pr384398/B.java
@@ -0,0 +1,13 @@
+package de.example;

+

+public class B extends A<String> {

+/*
+	InnerA someMethod(){
+		return new InnerA();
+	}
+
+	InnerA someOtherMethod(){
+		return someMethod();
+	}
+*/
+}

diff --git a/tests/bugs171/pr384398/BAspect.aj b/tests/bugs171/pr384398/BAspect.aj
new file mode 100755
index 000000000..2a580f238
--- /dev/null
+++ b/tests/bugs171/pr384398/BAspect.aj
@@ -0,0 +1,15 @@
+package de.example;

+

+import de.example.A.InnerA;

+

+public aspect BAspect {

+

+	InnerA B.someMethod(){

+		return new InnerA();

+	}

+

+	InnerA B.someOtherMethod(){

+		return someMethod();

+	}

+

+}

diff --git a/tests/bugs171/pr384398_2/A.java b/tests/bugs171/pr384398_2/A.java
new file mode 100755
index 000000000..9b7049050
--- /dev/null
+++ b/tests/bugs171/pr384398_2/A.java
@@ -0,0 +1,9 @@
+package de.example;

+

+public class A<T> {

+	public class InnerA {

+      T aaa;
+	}

+	

+

+}

diff --git a/tests/bugs171/pr384398_2/B.java b/tests/bugs171/pr384398_2/B.java
new file mode 100755
index 000000000..3e3868445
--- /dev/null
+++ b/tests/bugs171/pr384398_2/B.java
@@ -0,0 +1,14 @@
+package de.example;

+

+public class B extends A<String> {
+/*
+    InnerA someMethod(){
+        A<String> as = new A<String>();
+        return as.new InnerA();
+    }
+
+    InnerA someOtherMethod() {
+        return someMethod();
+    }
+*/
+}
diff --git a/tests/bugs171/pr384398_2/BAspect.aj b/tests/bugs171/pr384398_2/BAspect.aj
new file mode 100755
index 000000000..fcba89b39
--- /dev/null
+++ b/tests/bugs171/pr384398_2/BAspect.aj
@@ -0,0 +1,16 @@
+package de.example;

+

+import de.example.A.InnerA;

+

+public aspect BAspect {

+

+	InnerA B.someMethod(){

+		A<String> as = new A<String>();
+		return as.new InnerA();

+	}

+

+	InnerA B.someOtherMethod(){

+		return someMethod();

+	}

+

+}