# HG changeset patch # User jlahoda # Date 1431953321 -7200 # Node ID 398f0f51917a153de75d353832e838dadfa880ad # Parent f0c022c5290cf02bc243ea44621735fe4f7e5a57 8080572: langtools/test/tools/javac/generics/T5011073.java failing Summary: test/tools/javac/generics/InterfaceCast1.java defines a top-level Set, moving it to a separate directory to avoid clashes. Reviewed-by: mcimadamore diff -r f0c022c5290c -r 398f0f51917a langtools/test/tools/javac/generics/4453032/InterfaceCast1.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/4453032/InterfaceCast1.java Mon May 18 14:48:41 2015 +0200 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2001, 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 + * @bug 4453032 + * @summary overridden interface method causes the compiler to reject cast + * @author gafter + * + * @compile InterfaceCast1.java + */ + +public class InterfaceCast1 { + public static void main(String[] args) throws Exception { + } +} + +interface Collection { + T[] toArray(T[] a); +} + +interface Set extends Collection { + T[] toArray(T[] a); +} + +interface SortedSet extends Set { +} + +class TreeSet { + public void addAll(Collection c) { + if (c instanceof SortedSet) { + SortedSet ss = (SortedSet) c; + } + } +} diff -r f0c022c5290c -r 398f0f51917a langtools/test/tools/javac/generics/InterfaceCast1.java --- a/langtools/test/tools/javac/generics/InterfaceCast1.java Mon May 11 13:28:14 2015 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2001, 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 - * @bug 4453032 - * @summary overridden interface method causes the compiler to reject cast - * @author gafter - * - * @compile InterfaceCast1.java - */ - -public class InterfaceCast1 { - public static void main(String[] args) throws Exception { - } -} - -interface Collection { - T[] toArray(T[] a); -} - -interface Set extends Collection { - T[] toArray(T[] a); -} - -interface SortedSet extends Set { -} - -class TreeSet { - public void addAll(Collection c) { - if (c instanceof SortedSet) { - SortedSet ss = (SortedSet) c; - } - } -}