Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/tools/javac/generics/diamond/neg/Neg01.java	Mon Mar 07 14:11:48 2011 +0000
     1.2 +++ b/test/tools/javac/generics/diamond/neg/Neg01.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 + *           (basic test with nested class, generic/non-generic constructors)
    1.12   * @author mcimadamore
    1.13   * @compile/fail/ref=Neg01.out Neg01.java -XDrawDiagnostics
    1.14   *
    1.15 @@ -20,19 +21,9 @@
    1.16          Neg01<?> n3 = new Neg01<>("");
    1.17          Neg01<? super String> n4 = new Neg01<>("");
    1.18  
    1.19 -        Neg01<String> n5 = new Neg01<>(""){};
    1.20 -        Neg01<? extends String> n6 = new Neg01<>(""){};
    1.21 -        Neg01<?> n7 = new Neg01<>(""){};
    1.22 -        Neg01<? super String> n8 = new Neg01<>(""){};
    1.23 -
    1.24 -        Neg01<String> n9 = new Neg01<>("", "");
    1.25 -        Neg01<? extends String> n10 = new Neg01<>("", "");
    1.26 -        Neg01<?> n11 = new Neg01<>("", "");
    1.27 -        Foo<? super String> n12 = new Neg01<>("", "");
    1.28 -
    1.29 -        Neg01<String> n13 = new Neg01<>("", ""){};
    1.30 -        Neg01<? extends String> n14 = new Neg01<>("", ""){};
    1.31 -        Neg01<?> n15 = new Neg01<>("", ""){};
    1.32 -        Neg01<? super String> n16 = new Neg01<>("", ""){};
    1.33 +        Neg01<String> n5 = new Neg01<>("", "");
    1.34 +        Neg01<? extends String> n6 = new Neg01<>("", "");
    1.35 +        Neg01<?> n7 = new Neg01<>("", "");
    1.36 +        Foo<? super String> n8 = new Neg01<>("", "");
    1.37      }
    1.38  }