8046770: .out files for assert, boxing, and overload tests in tools/javac dir
Reviewed-by: jjg
diff --git a/test/tools/javac/assert/DU1.java b/test/tools/javac/assert/DU1.java
index a3a4716..a33fc0c 100644
--- a/test/tools/javac/assert/DU1.java
+++ b/test/tools/javac/assert/DU1.java
@@ -1,33 +1,9 @@
/*
- * Copyright (c) 2001, 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 4468510
* @summary Check correct DU computation for assertions.
* @author gafter
- *
- * @compile/fail DU1.java
+ * @compile/fail/ref=DU1.out -XDrawDiagnostics DU1.java
*/
class DU1 {
diff --git a/test/tools/javac/assert/DU1.out b/test/tools/javac/assert/DU1.out
new file mode 100644
index 0000000..d0cf01a
--- /dev/null
+++ b/test/tools/javac/assert/DU1.out
@@ -0,0 +1,2 @@
+DU1.java:16:9: compiler.err.var.might.already.be.assigned: i
+1 error
diff --git a/test/tools/javac/assert/DU2.java b/test/tools/javac/assert/DU2.java
index 5758335..ae27cce 100644
--- a/test/tools/javac/assert/DU2.java
+++ b/test/tools/javac/assert/DU2.java
@@ -1,33 +1,9 @@
/*
- * Copyright (c) 2001, 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 4468510
* @summary Check correct DU computation for assertions.
* @author gafter
- *
- * @compile/fail DU2.java
+ * @compile/fail/ref=DU2.out -XDrawDiagnostics DU2.java
*/
class DU2 {
diff --git a/test/tools/javac/assert/DU2.out b/test/tools/javac/assert/DU2.out
new file mode 100644
index 0000000..a9f2a50
--- /dev/null
+++ b/test/tools/javac/assert/DU2.out
@@ -0,0 +1,2 @@
+DU2.java:14:9: compiler.err.var.might.already.be.assigned: i
+1 error
diff --git a/test/tools/javac/boxing/Boxing2.java b/test/tools/javac/boxing/Boxing2.java
index 8ab1d51..83fe924 100644
--- a/test/tools/javac/boxing/Boxing2.java
+++ b/test/tools/javac/boxing/Boxing2.java
@@ -1,33 +1,9 @@
/*
- * 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 4974939
* @summary Boxing/unboxing negative unit and regression tests
* @author gafter
- *
- * @compile/fail Boxing2.java
+ * @compile/fail/ref=Boxing2.out -XDrawDiagnostics Boxing2.java
*/
public class Boxing2 {
diff --git a/test/tools/javac/boxing/Boxing2.out b/test/tools/javac/boxing/Boxing2.out
new file mode 100644
index 0000000..a10492c
--- /dev/null
+++ b/test/tools/javac/boxing/Boxing2.out
@@ -0,0 +1,2 @@
+Boxing2.java:12:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.Long)
+1 error
diff --git a/test/tools/javac/boxing/T5082929.java b/test/tools/javac/boxing/T5082929.java
index 69eada7..07ea7a3 100644
--- a/test/tools/javac/boxing/T5082929.java
+++ b/test/tools/javac/boxing/T5082929.java
@@ -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 5082929
* @summary Comparing Float and Integer
* @author Peter von der Ah\u00e9
- * @compile/fail T5082929.java
+ * @compile/fail/ref=T5082929.out -XDrawDiagnostics T5082929.java
*/
public class T5082929 {
diff --git a/test/tools/javac/boxing/T5082929.out b/test/tools/javac/boxing/T5082929.out
new file mode 100644
index 0000000..6708e54
--- /dev/null
+++ b/test/tools/javac/boxing/T5082929.out
@@ -0,0 +1,2 @@
+T5082929.java:11:23: compiler.err.incomparable.types: java.lang.Float, java.lang.Integer
+1 error
diff --git a/test/tools/javac/completion/C.java b/test/tools/javac/completion/C.java
deleted file mode 100644
index be709e8..0000000
--- a/test/tools/javac/completion/C.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2001, 2002, 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
- * @bug 4433676
- * @summary javac dies with NullPointerException in com.sun.tools.javac.v8.comp.Resolve.find
- * @author gafter
- *
- * @compile/fail C.java
- */
-public class C {
-
- class CInner extends example.B {
-
- public CInner(Object o) {
- }
-
- }
-
-}
diff --git a/test/tools/javac/completion/C.out b/test/tools/javac/completion/C.out
deleted file mode 100644
index f4d681b..0000000
--- a/test/tools/javac/completion/C.out
+++ /dev/null
@@ -1,5 +0,0 @@
-C.java:11: cannot access example.a.A
-file example/a/A.class not found
- class CInner extends example.B {
- ^
-1 error
diff --git a/test/tools/javac/completion/example/B.class b/test/tools/javac/completion/example/B.class
deleted file mode 100644
index 948e850..0000000
--- a/test/tools/javac/completion/example/B.class
+++ /dev/null
Binary files differ
diff --git a/test/tools/javac/expression/NullAppend.java b/test/tools/javac/expression/NullAppend.java
index 1b2c95e..1ced231 100644
--- a/test/tools/javac/expression/NullAppend.java
+++ b/test/tools/javac/expression/NullAppend.java
@@ -1,33 +1,10 @@
/*
- * Copyright (c) 2002, 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 4620794
* @summary compiler allows null + null
* @author gafter
*
- * @compile/fail NullAppend.java
+ * @compile/fail/ref=NullAppend.out -XDrawDiagnostics NullAppend.java
*/
class NullAppend {{
diff --git a/test/tools/javac/expression/NullAppend.out b/test/tools/javac/expression/NullAppend.out
new file mode 100644
index 0000000..a1ea4a7
--- /dev/null
+++ b/test/tools/javac/expression/NullAppend.out
@@ -0,0 +1,2 @@
+NullAppend.java:11:16: compiler.err.operator.cant.be.applied.1: +, compiler.misc.type.null, compiler.misc.type.null
+1 error
diff --git a/test/tools/javac/expression/NullAppend2.java b/test/tools/javac/expression/NullAppend2.java
index 4998684..857d12f 100644
--- a/test/tools/javac/expression/NullAppend2.java
+++ b/test/tools/javac/expression/NullAppend2.java
@@ -1,33 +1,9 @@
/*
- * Copyright (c) 2002, 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 4717193
* @summary javac improperly allows null + 1
* @author gafter
- *
- * @compile/fail NullAppend2.java
+ * @compile/fail/ref=NullAppend2.out -XDrawDiagnostics NullAppend2.java
*/
class NullAppend2 {{
diff --git a/test/tools/javac/expression/NullAppend2.out b/test/tools/javac/expression/NullAppend2.out
new file mode 100644
index 0000000..ac89877
--- /dev/null
+++ b/test/tools/javac/expression/NullAppend2.out
@@ -0,0 +1,2 @@
+NullAppend2.java:10:16: compiler.err.operator.cant.be.applied.1: +, compiler.misc.type.null, int
+1 error
diff --git a/test/tools/javac/nested/5009484/X.java b/test/tools/javac/nested/5009484/X.java
index 5829e40..b35f558 100644
--- a/test/tools/javac/nested/5009484/X.java
+++ b/test/tools/javac/nested/5009484/X.java
@@ -1,32 +1,9 @@
/*
- * Copyright (c) 2005, 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 5009484
* @summary Compiler fails to resolve appropriate type for outer member
* @author Philippe P Mulet
- * @compile/fail X.java
+ * @compile/fail/ref=X.out -XDrawDiagnostics X.java
*/
public class X<T> {
diff --git a/test/tools/javac/nested/5009484/X.out b/test/tools/javac/nested/5009484/X.out
new file mode 100644
index 0000000..5f7f640
--- /dev/null
+++ b/test/tools/javac/nested/5009484/X.out
@@ -0,0 +1,2 @@
+X.java:22:30: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, X)
+1 error
diff --git a/test/tools/javac/nested/5009484/Y.java b/test/tools/javac/nested/5009484/Y.java
index e0714eb..d563097 100644
--- a/test/tools/javac/nested/5009484/Y.java
+++ b/test/tools/javac/nested/5009484/Y.java
@@ -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 5009484
* @summary Compiler fails to resolve appropriate type for outer member
* @author Peter von der Ah\u00e9
- * @compile/fail Y.java
+ * @compile/fail/ref=Y.out -XDrawDiagnostics Y.java
*/
public class Y<T> {
diff --git a/test/tools/javac/nested/5009484/Y.out b/test/tools/javac/nested/5009484/Y.out
new file mode 100644
index 0000000..1860f93
--- /dev/null
+++ b/test/tools/javac/nested/5009484/Y.out
@@ -0,0 +1,2 @@
+Y.java:12:18: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: T, Y<T>)
+1 error
diff --git a/test/tools/javac/overload/T4743490.java b/test/tools/javac/overload/T4743490.java
index 86c39b6..9723301 100644
--- a/test/tools/javac/overload/T4743490.java
+++ b/test/tools/javac/overload/T4743490.java
@@ -1,33 +1,9 @@
/*
- * Copyright (c) 2002, 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 4743490
* @summary overloading versus super.f(args) versus interfaces
* @author gafter
- *
- * @compile/fail T4743490.java
+ * @compile/fail/ref=T4743490.out -XDrawDiagnostics T4743490.java
*/
class T4743490 {
diff --git a/test/tools/javac/overload/T4743490.out b/test/tools/javac/overload/T4743490.out
new file mode 100644
index 0000000..13f6352
--- /dev/null
+++ b/test/tools/javac/overload/T4743490.out
@@ -0,0 +1,2 @@
+T4743490.java:21:18: compiler.err.ref.ambiguous: m, kindname.method, m(java.lang.String,java.lang.Object), T4743490.B, kindname.method, m(java.lang.Object,java.lang.String), T4743490.A
+1 error
diff --git a/test/tools/javac/overload/T5090220.java b/test/tools/javac/overload/T5090220.java
index 63f3d98..96a897e 100644
--- a/test/tools/javac/overload/T5090220.java
+++ b/test/tools/javac/overload/T5090220.java
@@ -1,31 +1,8 @@
/*
- * Copyright (c) 2004, 2007, 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 5090220
* @summary Autoboxing applied when calculating most-specific method
- * @compile/fail T5090220.java
+ * @compile/fail/ref=T5090220.out -XDrawDiagnostics T5090220.java
*/
class T5090220 {
diff --git a/test/tools/javac/overload/T5090220.out b/test/tools/javac/overload/T5090220.out
new file mode 100644
index 0000000..e4390c8
--- /dev/null
+++ b/test/tools/javac/overload/T5090220.out
@@ -0,0 +1,2 @@
+T5090220.java:16:9: compiler.err.ref.ambiguous: foo, kindname.method, foo(int,java.lang.Integer), T5090220, kindname.method, foo(java.lang.Integer,double), T5090220
+1 error
