389750: fix for ITDs that use generics made on generic types

8 files changed, 100 insertions, 0 deletions

diff --git a/tests/bugs172/pr389750/Clazz.java b/tests/bugs172/pr389750/Clazz.java
new file mode 100644
index 000000000..7d32d1206
--- /dev/null
+++ b/tests/bugs172/pr389750/Clazz.java
@@ -0,0 +1,5 @@
+public class Clazz {
+  public static void main(String[] argv) {
+    Code.foo();
+  }
+}
diff --git a/tests/bugs172/pr389750/Clazz2.java b/tests/bugs172/pr389750/Clazz2.java
new file mode 100644
index 000000000..1cf6a69c3
--- /dev/null
+++ b/tests/bugs172/pr389750/Clazz2.java
@@ -0,0 +1,9 @@
+public class Clazz2 {
+  public static void main(String[] argv) {
+    Bar bs = new Bar();
+    String s = bs.bar("abc",null);
+  }
+}
+
+class Bar implements Code2.I<String> {
+}
diff --git a/tests/bugs172/pr389750/Clazz3.java b/tests/bugs172/pr389750/Clazz3.java
new file mode 100644
index 000000000..372c64567
--- /dev/null
+++ b/tests/bugs172/pr389750/Clazz3.java
@@ -0,0 +1,9 @@
+public class Clazz3 {
+  public static void main(String[] argv) {
+    Bar<String> bs = new Bar<String>();
+    String s = bs.bar("abc",null);
+  }
+}
+
+class Bar<A extends java.io.Serializable> implements Code3.I<A> {
+}
diff --git a/tests/bugs172/pr389750/Clazz4.java b/tests/bugs172/pr389750/Clazz4.java
new file mode 100644
index 000000000..cc077abdc
--- /dev/null
+++ b/tests/bugs172/pr389750/Clazz4.java
@@ -0,0 +1,9 @@
+public class Clazz4 {
+  public static void main(String[] argv) {
+    Bar<String> bs = new Bar<String>();
+    String s = bs.bar("abc",new Integer(4));
+  }
+}
+
+class Bar<A extends java.io.Serializable> implements Code4.I<A> {
+}
diff --git a/tests/bugs172/pr389750/Code.aj b/tests/bugs172/pr389750/Code.aj
new file mode 100644
index 000000000..353a61af2
--- /dev/null
+++ b/tests/bugs172/pr389750/Code.aj
@@ -0,0 +1,17 @@
+import java.io.*;
+
+interface Persistable<ID extends Serializable> {
+
+}
+
+public aspect Code {
+
+  public interface I<ID extends Serializable> extends Persistable<ID> {
+  }
+
+  public static void foo() {}
+
+  public boolean I.equals(Persistable<?> that) {
+    return false;
+  }
+}
diff --git a/tests/bugs172/pr389750/Code2.aj b/tests/bugs172/pr389750/Code2.aj
new file mode 100644
index 000000000..b9d43519f
--- /dev/null
+++ b/tests/bugs172/pr389750/Code2.aj
@@ -0,0 +1,17 @@
+import java.io.*;
+
+interface Persistable<ID extends Serializable> {
+
+}
+
+public aspect Code2 {
+
+  public interface I<ID extends Serializable> extends Persistable<ID> {
+  }
+
+  public static void foo() {}
+
+  public Z I<Z>.bar(Z foo, Persistable<?> that) {
+    return foo;
+  }
+}
diff --git a/tests/bugs172/pr389750/Code3.aj b/tests/bugs172/pr389750/Code3.aj
new file mode 100644
index 000000000..ba30b7f69
--- /dev/null
+++ b/tests/bugs172/pr389750/Code3.aj
@@ -0,0 +1,17 @@
+import java.io.*;
+
+interface Persistable<ID extends Serializable> {
+
+}
+
+public aspect Code3 {
+
+  public interface I<ID extends Serializable> extends Persistable<ID> {
+  }
+
+  public static void foo() {}
+
+  public Z I<Z>.bar(Z foo, Persistable<?> that) {
+    return foo;
+  }
+}
diff --git a/tests/bugs172/pr389750/Code4.aj b/tests/bugs172/pr389750/Code4.aj
new file mode 100644
index 000000000..cc10d351e
--- /dev/null
+++ b/tests/bugs172/pr389750/Code4.aj
@@ -0,0 +1,17 @@
+import java.io.*;
+
+interface Persistable<ID extends Serializable> {
+
+}
+
+public aspect Code4 {
+
+  public interface I<ID extends Serializable> extends Persistable<ID> {
+  }
+
+  public static void foo() {}
+
+  public <T> Z I<Z>.bar(Z foo, T that) {
+    return foo;
+  }
+}