1.1 --- a/test/tools/javac/generics/diamond/pos/Pos03.java Mon Mar 07 14:11:48 2011 +0000
1.2 +++ b/test/tools/javac/generics/diamond/pos/Pos03.java Mon Mar 07 14:31:50 2011 +0000
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -23,9 +23,9 @@
1.11
1.12 /*
1.13 * @test
1.14 - * @bug 6939620
1.15 + * @bug 6939620 7020044
1.16 *
1.17 - * @summary Switch to 'complex' diamond inference scheme
1.18 + * @summary basic test for diamond (simple/qualified type-expressions, member inner)
1.19 * @author mcimadamore
1.20 * @compile Pos03.java
1.21 * @run main Pos03
1.22 @@ -45,20 +45,10 @@
1.23 Foo<?> f3 = new Foo<>(1);
1.24 Foo<? super Integer> f4 = new Foo<>(1);
1.25
1.26 - Foo<Integer> f5 = new Foo<>(1){};
1.27 - Foo<? extends Integer> f6 = new Foo<>(1){};
1.28 - Foo<?> f7 = new Foo<>(1){};
1.29 - Foo<? super Integer> f8 = new Foo<>(1){};
1.30 -
1.31 - Foo<Integer> f9 = new Foo<>(1, "");
1.32 - Foo<? extends Integer> f10 = new Foo<>(1, "");
1.33 - Foo<?> f11 = new Foo<>(1, "");
1.34 - Foo<? super Integer> f12 = new Foo<>(1, "");
1.35 -
1.36 - Foo<Integer> f13 = new Foo<>(1, ""){};
1.37 - Foo<? extends Integer> f14 = new Foo<>(1, ""){};
1.38 - Foo<?> f15 = new Foo<>(1, ""){};
1.39 - Foo<? super Integer> f16 = new Foo<>(1, ""){};
1.40 + Foo<Integer> f5 = new Foo<>(1, "");
1.41 + Foo<? extends Integer> f6 = new Foo<>(1, "");
1.42 + Foo<?> f7 = new Foo<>(1, "");
1.43 + Foo<? super Integer> f8 = new Foo<>(1, "");
1.44 }
1.45
1.46 void testQualified_1() {
1.47 @@ -67,20 +57,10 @@
1.48 Foo<?> f3 = new Pos03<U>.Foo<>(1);
1.49 Foo<? super Integer> f4 = new Pos03<U>.Foo<>(1);
1.50
1.51 - Foo<Integer> f5 = new Pos03<U>.Foo<>(1){};
1.52 - Foo<? extends Integer> f6 = new Pos03<U>.Foo<>(1){};
1.53 - Foo<?> f7 = new Pos03<U>.Foo<>(1){};
1.54 - Foo<? super Integer> f8 = new Pos03<U>.Foo<>(1){};
1.55 -
1.56 - Foo<Integer> f9 = new Pos03<U>.Foo<>(1, "");
1.57 - Foo<? extends Integer> f10 = new Pos03<U>.Foo<>(1, "");
1.58 - Foo<?> f11 = new Pos03<U>.Foo<>(1, "");
1.59 - Foo<? super Integer> f12 = new Pos03<U>.Foo<>(1, "");
1.60 -
1.61 - Foo<Integer> f13 = new Pos03<U>.Foo<>(1, ""){};
1.62 - Foo<? extends Integer> f14 = new Pos03<U>.Foo<>(1, ""){};
1.63 - Foo<?> f15 = new Pos03<U>.Foo<>(1, ""){};
1.64 - Foo<? super Integer> f16 = new Pos03<U>.Foo<>(1, ""){};
1.65 + Foo<Integer> f5 = new Pos03<U>.Foo<>(1, "");
1.66 + Foo<? extends Integer> f6 = new Pos03<U>.Foo<>(1, "");
1.67 + Foo<?> f7 = new Pos03<U>.Foo<>(1, "");
1.68 + Foo<? super Integer> f8 = new Pos03<U>.Foo<>(1, "");
1.69 }
1.70
1.71 void testQualified_2(Pos03<U> p) {
1.72 @@ -89,20 +69,10 @@
1.73 Foo<?> f3 = p.new Foo<>(1);
1.74 Foo<? super Integer> f4 = p.new Foo<>(1);
1.75
1.76 - Foo<Integer> f5 = p.new Foo<>(1){};
1.77 - Foo<? extends Integer> f6 = p.new Foo<>(1){};
1.78 - Foo<?> f7 = p.new Foo<>(1){};
1.79 - Foo<? super Integer> f8 = p.new Foo<>(1){};
1.80 -
1.81 - Foo<Integer> f9 = p.new Foo<>(1, "");
1.82 - Foo<? extends Integer> f10 = p.new Foo<>(1, "");
1.83 - Foo<?> f11 = p.new Foo<>(1, "");
1.84 - Foo<? super Integer> f12 = p.new Foo<>(1, "");
1.85 -
1.86 - Foo<Integer> f13 = p.new Foo<>(1, ""){};
1.87 - Foo<? extends Integer> f14 = p.new Foo<>(1, ""){};
1.88 - Foo<?> f15 = p.new Foo<>(1, ""){};
1.89 - Foo<? super Integer> f16 = p.new Foo<>(1, ""){};
1.90 + Foo<Integer> f5 = p.new Foo<>(1, "");
1.91 + Foo<? extends Integer> f6 = p.new Foo<>(1, "");
1.92 + Foo<?> f7 = p.new Foo<>(1, "");
1.93 + Foo<? super Integer> f8 = p.new Foo<>(1, "");
1.94 }
1.95
1.96 public static void main(String[] args) {
