generics and ITD inner class updates

3 files changed, 60 insertions, 0 deletions

diff --git a/tests/features169/itdInnerTypes/Choice2.java b/tests/features169/itdInnerTypes/Choice2.java
new file mode 100644
index 000000000..965a0d184
--- /dev/null
+++ b/tests/features169/itdInnerTypes/Choice2.java
@@ -0,0 +1,32 @@
+import java.util.*;
+
+public class Choice2 {
+  public static void main(String []argv) {
+    System.out.println(Bar.Keys.CHOICE);
+  }
+}
+
+class Bar {
+
+}
+
+aspect X {
+  static List<Bar> choices;
+  public static List forClass() {
+    ArrayList al = new ArrayList();
+    return al;
+  }
+  public static class Bar.Keys {
+    public static final Function<Object, Bar> CHOICE = Get.attrOf(choices,"choice");
+  }
+}
+
+class Get {
+  public static <T> Function<Object,T> attrOf(List<T> t,String s) {
+    return null;
+  }
+}
+
+class Function<A,B> {
+  
+}
diff --git a/tests/features169/itdInnerTypes/ChoiceGenerics1.java b/tests/features169/itdInnerTypes/ChoiceGenerics1.java
new file mode 100644
index 000000000..11b8bea9f
--- /dev/null
+++ b/tests/features169/itdInnerTypes/ChoiceGenerics1.java
@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class ChoiceGenerics1 {
+  public static void main(String []argv) {
+    new Keys<Integer>().choice = 42;
+  }
+}
+
+
+aspect X {
+  public static class ChoiceGenerics1.Keys<N> {
+    public N choice = null;
+  }
+}
diff --git a/tests/features169/itdInnerTypes/ChoiceGenerics2.java b/tests/features169/itdInnerTypes/ChoiceGenerics2.java
new file mode 100644
index 000000000..ba3fb2ec5
--- /dev/null
+++ b/tests/features169/itdInnerTypes/ChoiceGenerics2.java
@@ -0,0 +1,14 @@
+import java.util.*;
+
+public class ChoiceGenerics2 {
+  public static void main(String []argv) {
+    new Keys<Integer>().choice = "abc";
+  }
+}
+
+
+aspect X {
+  public static class ChoiceGenerics2.Keys<N> {
+    public N choice = null;
+  }
+}