1.1 --- a/test/tools/javac/generics/diamond/pos/Pos01.java Mon Mar 07 14:11:48 2011 +0000
1.2 +++ b/test/tools/javac/generics/diamond/pos/Pos01.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 (generic/non-generic constructors)
1.19 * @author mcimadamore
1.20 * @compile Pos01.java
1.21 * @run main Pos01
1.22 @@ -44,20 +44,10 @@
1.23 Pos01<?> p3 = new Pos01<>(1);
1.24 Pos01<? super Integer> p4 = new Pos01<>(1);
1.25
1.26 - Pos01<Integer> p5 = new Pos01<>(1){};
1.27 - Pos01<? extends Integer> p6 = new Pos01<>(1){};
1.28 - Pos01<?> p7 = new Pos01<>(1){};
1.29 - Pos01<? super Integer> p8 = new Pos01<>(1){};
1.30 -
1.31 - Pos01<Integer> p9 = new Pos01<>(1, "");
1.32 - Pos01<? extends Integer> p10 = new Pos01<>(1, "");
1.33 - Pos01<?> p11 = new Pos01<>(1, "");
1.34 - Pos01<? super Integer> p12 = new Pos01<>(1, "");
1.35 -
1.36 - Pos01<Integer> p13 = new Pos01<>(1, ""){};
1.37 - Pos01<? extends Integer> p14= new Pos01<>(1, ""){};
1.38 - Pos01<?> p15 = new Pos01<>(1, ""){};
1.39 - Pos01<? super Integer> p16 = new Pos01<>(1, ""){};
1.40 + Pos01<Integer> p5 = new Pos01<>(1, "");
1.41 + Pos01<? extends Integer> p6 = new Pos01<>(1, "");
1.42 + Pos01<?> p7 = new Pos01<>(1, "");
1.43 + Pos01<? super Integer> p8 = new Pos01<>(1, "");
1.44 }
1.45
1.46 public static void main(String[] args) {
