1.1 --- a/test/tools/javac/generics/diamond/neg/Neg04.java Mon Mar 07 14:11:48 2011 +0000 1.2 +++ b/test/tools/javac/generics/diamond/neg/Neg04.java Mon Mar 07 14:31:50 2011 +0000 1.3 @@ -1,8 +1,9 @@ 1.4 /* 1.5 * @test /nodynamiccopyright/ 1.6 - * @bug 6939620 1.7 + * @bug 6939620 7020044 1.8 * 1.9 - * @summary Switch to 'complex' diamond inference scheme 1.10 + * @summary Check that diamond fails when inference violates declared bounds 1.11 + * (test with local class, qualified/simple type expressions) 1.12 * @author mcimadamore 1.13 * @compile/fail/ref=Neg04.out Neg04.java -XDrawDiagnostics 1.14 * 1.15 @@ -20,19 +21,9 @@ 1.16 Foo<?> n3 = new Foo<>(""); 1.17 Foo<? super String> n4 = new Foo<>(""); 1.18 1.19 - Foo<String> n5 = new Foo<>(""){}; 1.20 - Foo<? extends String> n6 = new Foo<>(""){}; 1.21 - Foo<?> n7 = new Foo<>(""){}; 1.22 - Foo<? super String> n8 = new Foo<>(""){}; 1.23 - 1.24 - Foo<String> n9 = new Foo<>("", ""); 1.25 - Foo<? extends String> n10 = new Foo<>("", ""); 1.26 - Foo<?> n11 = new Foo<>("", ""); 1.27 - Foo<? super String> n12 = new Foo<>("", ""); 1.28 - 1.29 - Foo<String> n13 = new Foo<>("", ""){}; 1.30 - Foo<? extends String> n14 = new Foo<>("", ""){}; 1.31 - Foo<?> n15 = new Foo<>("", ""){}; 1.32 - Foo<? super String> n16 = new Foo<>("", ""){}; 1.33 + Foo<String> n5 = new Foo<>("", ""); 1.34 + Foo<? extends String> n6 = new Foo<>("", ""); 1.35 + Foo<?> n7 = new Foo<>("", ""); 1.36 + Foo<? super String> n8 = new Foo<>("", ""); 1.37 } 1.38 }