226567: test and fix - generic return types and overridden methods

4 files changed, 41 insertions, 0 deletions

diff --git a/tests/bugs161/pr226567/Bar.java b/tests/bugs161/pr226567/Bar.java
new file mode 100644
index 000000000..c4a0316e1
--- /dev/null
+++ b/tests/bugs161/pr226567/Bar.java
@@ -0,0 +1,9 @@
+package b;
+
+import java.util.Collection;
+
+
+public interface Bar {
+
+   public Collection<Foo> getFoos();  
+}
\ No newline at end of file
diff --git a/tests/bugs161/pr226567/BarAspect.aj b/tests/bugs161/pr226567/BarAspect.aj
new file mode 100644
index 000000000..1c62a4867
--- /dev/null
+++ b/tests/bugs161/pr226567/BarAspect.aj
@@ -0,0 +1,9 @@
+package a;
+
+import b.Bar;
+import b.Foo;
+
+public aspect BarAspect {
+   
+   declare parents : Foo implements Bar;
+}
\ No newline at end of file
diff --git a/tests/bugs161/pr226567/Foo.java b/tests/bugs161/pr226567/Foo.java
new file mode 100644
index 000000000..db8076aab
--- /dev/null
+++ b/tests/bugs161/pr226567/Foo.java
@@ -0,0 +1,11 @@
+package b;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class Foo {
+
+   public Collection<Foo> getFoos() {
+      return new ArrayList<Foo>() {{ add(new Foo()); }};
+   }
+}
\ No newline at end of file
diff --git a/tests/bugs161/pr226567/Main.java b/tests/bugs161/pr226567/Main.java
new file mode 100644
index 000000000..51eab3381
--- /dev/null
+++ b/tests/bugs161/pr226567/Main.java
@@ -0,0 +1,12 @@
+package c;
+
+import b.Bar;
+import b.Foo;
+
+public class Main {
+
+   public static void main(String [] args) {
+      Foo foo = new Foo();
+      System.out.println(foo instanceof Bar);      
+   }
+}
\ No newline at end of file