Mercurial > hg > jdk9-shenandoah > langtools
changeset 2921:651ec712b913
8074502: Group 13c: golden files for tests in tools/javac/generics dir
Reviewed-by: jjg, mcimadamore
line wrap: on
line diff
--- a/test/tools/javac/generics/CastCrash.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/CastCrash.java Fri May 15 09:30:55 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5025346 * @summary Crash on cast * @author gafter * - * @compile/fail CastCrash.java + * @compile/fail/ref=CastCrash.out -XDrawDiagnostics CastCrash.java */ package cast.crash;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/CastCrash.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +CastCrash.java:19:22: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: cast.crash.LI, cast.crash.SN) +1 error
--- a/test/tools/javac/generics/inference/5044646/T5044646.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/inference/5044646/T5044646.java Fri May 15 09:30:55 2015 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,5 +26,5 @@ * @bug 5044646 * @summary package-private indirect noninherited generic overriders * @compile p1/A1.java p2/A2.java p1/B.java - * @compile/fail p1/C.java + * @compile/fail/ref=T5044646.out -XDrawDiagnostics p1/C.java */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/inference/5044646/T5044646.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +C.java:5:8: compiler.err.does.not.override.abstract: p1.C, f(java.lang.String), p1.B +1 error
--- a/test/tools/javac/generics/inference/5044646/p1/C.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/inference/5044646/p1/C.java Fri May 15 09:30:55 2015 -0700 @@ -1,25 +1,4 @@ -/* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ +/* /nodynamiccopyright/ */ package p1;
--- a/test/tools/javac/generics/inference/5073060/Neg.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/inference/5073060/Neg.java Fri May 15 09:30:55 2015 -0700 @@ -1,32 +1,9 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5073060 * @summary Package private members not found for intersection types * @author Peter von der Ah\u00e9 - * @compile/fail NegHelper.java Neg.java + * @compile/fail/ref=Neg.out -XDrawDiagnostics NegHelper.java Neg.java */ public class Neg<T extends test.NegHelper & Cloneable> {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/inference/5073060/Neg.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +Neg.java:10:23: compiler.err.not.def.public.cant.access: foo(), test.NegHelper +1 error
--- a/test/tools/javac/generics/inference/6278587/T6278587Neg.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/inference/6278587/T6278587Neg.java Fri May 15 09:30:55 2015 -0700 @@ -1,32 +1,9 @@ /* - * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 6278587 8007464 * @summary Inference broken for subtypes of subtypes of F-bounded types * @author Peter von der Ah\u00e9 - * @compile/fail -source 7 T6278587Neg.java + * @compile/fail/ref=T6278587Neg.out -XDrawDiagnostics -source 7 T6278587Neg.java * @compile T6278587Neg.java */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/inference/6278587/T6278587Neg.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,4 @@ +- compiler.warn.source.no.bootclasspath: 1.7 +T6278587Neg.java:18:10: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.lower.bounds: T, T6278587Neg.C) +1 error +1 warning
--- a/test/tools/javac/generics/inference/7177306/T7177306e.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/inference/7177306/T7177306e.java Fri May 15 09:30:55 2015 -0700 @@ -1,9 +1,9 @@ -/** +/* * @test /nodynamiccopyright/ * @bug 7177306 8007464 * @summary Regression: unchecked method call does not erase return type - * @compile/fail/ref=T7177306e.out -source 7 -Xlint:-options -XDrawDiagnostics T7177306e.java - * @compile/fail T7177306e.java + * @compile/fail/ref=T7177306e_7.out -XDrawDiagnostics -source 7 -Xlint:-options -XDrawDiagnostics T7177306e.java + * @compile/fail/ref=T7177306e.out -XDrawDiagnostics T7177306e.java */ import java.util.List;
--- a/test/tools/javac/generics/inference/7177306/T7177306e.out Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/inference/7177306/T7177306e.out Fri May 15 09:30:55 2015 -0700 @@ -1,2 +1,2 @@ -T7177306e.java:16:9: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.util.List<?>, java.util.List<compiler.misc.type.captureof: 1, ?>) +T7177306e.java:16:8: compiler.err.cant.apply.symbol: kindname.method, m, java.util.List<U>, java.util.List<java.util.List<?>>, kindname.class, T7177306e, (compiler.misc.incompatible.eq.upper.bounds: U, java.util.List<?>, java.util.List<compiler.misc.type.captureof: 1, ?>) 1 error
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/inference/7177306/T7177306e_7.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +T7177306e.java:16:9: compiler.err.prob.found.req: (compiler.misc.inferred.do.not.conform.to.upper.bounds: java.util.List<?>, java.util.List<compiler.misc.type.captureof: 1, ?>) +1 error
--- a/test/tools/javac/generics/rare/Rare2.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/rare/Rare2.java Fri May 15 09:30:55 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5024308 * @summary "rare" types * @author gafter * - * @compile/fail Rare2.java + * @compile/fail/ref=Rare2.out -XDrawDiagnostics Rare2.java */ package rare2;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/rare/Rare2.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +Rare2.java:20:14: compiler.err.improperly.formed.type.param.missing +1 error
--- a/test/tools/javac/generics/rare/Rare3.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/rare/Rare3.java Fri May 15 09:30:55 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5024308 * @summary "rare" types * @author gafter * - * @compile/fail Rare3.java + * @compile/fail/ref=Rare3.out -XDrawDiagnostics Rare3.java */ package rare3;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/rare/Rare3.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +Rare3.java:20:8: compiler.err.improperly.formed.type.inner.raw.param +1 error
--- a/test/tools/javac/generics/rare/Rare4.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/rare/Rare4.java Fri May 15 09:30:55 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5024308 * @summary "rare" types * @author gafter * - * @compile/fail Rare4.java + * @compile/fail/ref=Rare4.out -XDrawDiagnostics Rare4.java */ package rare4;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/rare/Rare4.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +Rare4.java:20:14: compiler.err.cant.select.static.class.from.param.type +1 error
--- a/test/tools/javac/generics/rare/Rare5.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/rare/Rare5.java Fri May 15 09:30:55 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5024308 * @summary "rare" types * @author gafter * - * @compile/fail Rare5.java + * @compile/fail/ref=Rare5.out -XDrawDiagnostics Rare5.java */ package rare5;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/rare/Rare5.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +Rare5.java:20:14: compiler.err.cant.select.static.class.from.param.type +1 error
--- a/test/tools/javac/generics/rare/Rare6.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/rare/Rare6.java Fri May 15 09:30:55 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5024308 * @summary "rare" types * @author gafter * - * @compile/fail Rare6.java + * @compile/fail/ref=Rare6.out -XDrawDiagnostics Rare6.java */ package rare6;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/rare/Rare6.out Fri May 15 09:30:55 2015 -0700 @@ -0,0 +1,2 @@ +Rare6.java:19:13: compiler.err.non-static.cant.be.ref: kindname.class, rare6.A.B +1 error
--- a/test/tools/javac/generics/rare/Rare7.java Fri May 15 11:41:04 2015 +0200 +++ b/test/tools/javac/generics/rare/Rare7.java Fri May 15 09:30:55 2015 -0700 @@ -1,33 +1,10 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * @test + * @test /nodynamiccopyright/ * @bug 5024308 * @summary "rare" types * @author gafter * - * @compile/fail Rare7.java + * @compile/fail/ref=Rare7.out -XDrawDiagnostics Rare7.java */ package rare7;