generics: fixes for decp testcases involving generic types targeted by parameterized decps. Type variables now persist in the system for longer... also LazyClassGen generates correct generic signatures for modified types.

2 files changed, 7 insertions, 3 deletions

diff --git a/tests/java5/generics/decp/Basic4.aj b/tests/java5/generics/decp/Basic4.aj
index 10ccc56a7..6d88ffc76 100644
--- a/tests/java5/generics/decp/Basic4.aj
+++ b/tests/java5/generics/decp/Basic4.aj
@@ -2,6 +2,11 @@
 interface I<T extends Number> { }
 
 public class Basic4 {
+  public static void main(String[] argv) {
+    Basic4 b4 = new Basic4();
+    if (!(b4 instanceof I)) 
+      throw new RuntimeException("Should be instanceof I!");
+  }
 }
 
 aspect X {
diff --git a/tests/java5/generics/decp/Basic5.aj b/tests/java5/generics/decp/Basic5.aj
index 991eda6c2..6fb3d80ec 100644
--- a/tests/java5/generics/decp/Basic5.aj
+++ b/tests/java5/generics/decp/Basic5.aj
@@ -1,9 +1,8 @@
-// fails, Number is not a subclass of double!
-interface I<T super Number> { }
+interface I<T extends Number> { }
 
 public class Basic5 {
 }
 
 aspect X {
-    declare parents: Basic5 implements I<Double>;
+    declare parents: Basic5 implements I<String>;
 }