Mon, 26 Jan 2009 15:14:46 -0800
6797871: Fix for 6797463 did not remove the jtreg tests, and it should have
Reviewed-by: jjg
test/tools/javac/generics/rawOverride/6557199/T6557199.java | file | annotate | diff | comparison | revisions | |
test/tools/javac/generics/rawOverride/6557199/T6557199.out | file | annotate | diff | comparison | revisions |
1.1 --- a/test/tools/javac/generics/rawOverride/6557199/T6557199.java Sat Jan 24 16:35:52 2009 -0800 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,44 +0,0 @@ 1.4 -/* 1.5 - * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved. 1.6 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.7 - * 1.8 - * This code is free software; you can redistribute it and/or modify it 1.9 - * under the terms of the GNU General Public License version 2 only, as 1.10 - * published by the Free Software Foundation. 1.11 - * 1.12 - * This code is distributed in the hope that it will be useful, but WITHOUT 1.13 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.14 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 1.15 - * version 2 for more details (a copy is included in the LICENSE file that 1.16 - * accompanied this code). 1.17 - * 1.18 - * You should have received a copy of the GNU General Public License version 1.19 - * 2 along with this work; if not, write to the Free Software Foundation, 1.20 - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.21 - * 1.22 - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 1.23 - * CA 95054 USA or visit www.sun.com if you need additional information or 1.24 - * have any questions. 1.25 - */ 1.26 - 1.27 -/* 1.28 - * @test 1.29 - * @bug 6557199 1.30 - * @summary Fails to reject bad override of generic method 1.31 - * @author Maurizio Cimadamore 1.32 - * @compile/fail/ref=T6557199.out T6557199.java -XDrawDiagnostics 1.33 - */ 1.34 - 1.35 -class T6557199 { 1.36 - static class X<S> { 1.37 - public static <U> X<U> test() { 1.38 - return null; 1.39 - } 1.40 - } 1.41 - 1.42 - static class B extends X<B> { 1.43 - public static B test() { 1.44 - return null; 1.45 - } 1.46 - } 1.47 -}
2.1 --- a/test/tools/javac/generics/rawOverride/6557199/T6557199.out Sat Jan 24 16:35:52 2009 -0800 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,2 +0,0 @@ 2.4 -T6557199.java:40:25: compiler.err.prob.found.req: (- compiler.misc.override.incompatible.ret: (- compiler.misc.cant.override: test(), T6557199.B, <U>test(), T6557199.X)), T6557199.B, T6557199.X<U> 2.5 -1 error