stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8134483: A recent update to copyright headers caused two tests to fail

Browse Source 
Replaced copyright notice with nodynamiccopyright and adjusted line numbers.

Reviewed-by: jfranck
This commit is contained in:
Andreas Lundblad 2015-08-26 11:14:28 +02:00
parent 8d0ebb66bd
commit 97577b084f
3 changed files with 5 additions and 51 deletions

25
langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.java

@ -1,28 +1,5 @@
/*
* Copyright (c) 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 8022316
* @summary Generic throws, overriding and method reference
* @compile/fail/ref=CompilerErrorGenericThrowPlusMethodRefTest.out -XDrawDiagnostics CompilerErrorGenericThrowPlusMethodRefTest.java

2
langtools/test/tools/javac/T8022316/CompilerErrorGenericThrowPlusMethodRefTest.out

@ -1,2 +1,2 @@
CompilerErrorGenericThrowPlusMethodRefTest.java:55:26: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Exception
CompilerErrorGenericThrowPlusMethodRefTest.java:30:26: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Exception
1 error

29
langtools/test/tools/javac/linenumbers/NestedLineNumberTest.java

@ -1,28 +1,5 @@
/*
* Copyright (c) 2014, 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
* 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 8061778
* @summary Wrong LineNumberTable for default constructors
* @modules jdk.jdeps/com.sun.tools.classfile
@ -48,8 +25,8 @@ public class NestedLineNumberTest {
}
int line = lines[0].line_number;
if (line != 79) {
error(String.format("LineNumberTable contains wrong line number - expected %d, found %d", 79, line));
if (line != 54) {
error(String.format("LineNumberTable contains wrong line number - expected %d, found %d", 54, line));
}
}