Updates for generic ITDs - see pr112105 for a description of all changes.

2 files changed, 18 insertions, 2 deletions

diff --git a/tests/java5/generics/itds/design/DesignC.java b/tests/java5/generics/itds/design/DesignC.java
index 8e25e9f56..51d410843 100644
--- a/tests/java5/generics/itds/design/DesignC.java
+++ b/tests/java5/generics/itds/design/DesignC.java
@@ -1,10 +1,13 @@
+import java.util.*;
+
 class C {}
 
 interface I {}
 
 aspect X {
 
-  <T extends Number,Q extends I> void C.m0(T t,Q q) {}   // L7
+  <T extends Number,Q extends I> void C.m0(T t,Q q) { }   // L9
+
+  <A,B,C>  List<A> C.m1(B b,Collection<C> cs) { return null; } // L11
 
-  <A,B,C>  List<A> C.m1(B b,Collection<C> cs) {} // L9
 }
diff --git a/tests/java5/generics/itds/design/DesignD.java b/tests/java5/generics/itds/design/DesignD.java
new file mode 100644
index 000000000..33487fe53
--- /dev/null
+++ b/tests/java5/generics/itds/design/DesignD.java
@@ -0,0 +1,13 @@
+import java.util.*;
+
+class C<N extends Number> {}
+
+interface I {}
+
+aspect X {
+
+  void C<R>.m0(R n) { }   // L9
+
+  List<Q> C<Q>.m0(Q q,int i,List<List<Q>> qs) {return null;} // L11
+
+}