--- old/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java Fri Jan 22 12:24:52 2016 +++ /dev/null Fri Jan 22 12:24:52 2016 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2002, 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 - * @bug 4638588 4635809 6256068 6270645 8025633 8026567 - * @summary Test to make sure that members are inherited properly in the Javadoc. - * Verify that inheritence labels are correct. - * @author jamieh - * @library ../lib - * @modules jdk.javadoc - * @build JavadocTester - * @run main TestMemberInheritence - */ - -public class TestMemberInheritence extends JavadocTester { - - public static void main(String... args) throws Exception { - TestMemberInheritence tester = new TestMemberInheritence(); - tester.runTests(); - } - - @Test - void test() { - javadoc("-d", "out", - "-sourcepath", testSrc, - "pkg", "diamond", "inheritDist"); - checkExit(Exit.OK); - - checkOutput("pkg/SubClass.html", true, - // Public field should be inherited - "", - // Public method should be inherited - "", - // Public inner class should be inherited. - "", - // Protected field should be inherited - "", - // Protected method should be inherited - "", - // Protected inner class should be inherited. - "", - // New labels as of 1.5.0 - "Nested classes/interfaces inherited from class pkg." - + "BaseClass", - "Nested classes/interfaces inherited from interface pkg." - + "BaseInterface"); - - checkOutput("pkg/BaseClass.html", true, - // Test overriding/implementing methods with generic parameters. - "
\n" - + "
Specified by:
\n" - + "
" - + "getAnnotation in interface " - + "" - + "BaseInterface
\n" - + "
"); - - checkOutput("diamond/Z.html", true, - // Test diamond inheritence member summary (6256068) - "aMethod"); - - checkOutput("inheritDist/C.html", true, - // Test that doc is inherited from closed parent (6270645) - "
m1-B
"); - - checkOutput("pkg/SubClass.html", false, - "staticMethod"); - } -} --- /dev/null Fri Jan 22 12:24:52 2016 +++ new/test/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java Fri Jan 22 12:24:52 2016 @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2002, 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 + * @bug 4638588 4635809 6256068 6270645 8025633 8026567 + * @summary Test to make sure that members are inherited properly in the Javadoc. + * Verify that inheritence labels are correct. + * @author jamieh + * @library ../lib + * @modules jdk.javadoc + * @build JavadocTester + * @run main TestMemberInheritence + */ + +public class TestMemberInheritence extends JavadocTester { + + public static void main(String... args) throws Exception { + TestMemberInheritence tester = new TestMemberInheritence(); + tester.runTests(); + } + + @Test + void test() { + javadoc("-d", "out", + "-sourcepath", testSrc, + "pkg", "diamond", "inheritDist", "pkg1"); + checkExit(Exit.OK); + + checkOutput("pkg/SubClass.html", true, + // Public field should be inherited + "", + // Public method should be inherited + "", + // Public inner class should be inherited. + "", + // Protected field should be inherited + "", + // Protected method should be inherited + "", + // Protected inner class should be inherited. + "", + // New labels as of 1.5.0 + "Nested classes/interfaces inherited from class pkg." + + "BaseClass", + "Nested classes/interfaces inherited from interface pkg." + + "BaseInterface"); + + checkOutput("pkg/BaseClass.html", true, + // Test overriding/implementing methods with generic parameters. + "
\n" + + "
Specified by:
\n" + + "
" + + "getAnnotation in interface " + + "" + + "BaseInterface
\n" + + "
"); + + checkOutput("diamond/Z.html", true, + // Test diamond inheritence member summary (6256068) + "aMethod"); + + checkOutput("inheritDist/C.html", true, + // Test that doc is inherited from closed parent (6270645) + "
m1-B
"); + + checkOutput("pkg/SubClass.html", false, + "staticMethod"); + + checkOutput("pkg1/Implementer.html", true, + // ensure the method makes it + "static java.time.Period\n" + + "" + + "" + + "between(java.time.LocalDate startDateInclusive,\n" + + " java.time.LocalDate endDateExclusive) ", + // check the inherited from interfaces + "

Methods inherited from interface pkg1.Interface

\n" + + "between" + ); + } +}