--- old/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Fri Jan 22 12:26:29 2016 +++ /dev/null Fri Jan 22 12:26:29 2016 @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2003, 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 4460354 8014636 8043186 - * @summary Test to make sure that relative paths are redirected in the - * output so that they are not broken. - * @author jamieh - * @library ../lib - * @modules jdk.javadoc - * @build JavadocTester - * @run main TestRelativeLinks - */ - -public class TestRelativeLinks extends JavadocTester { - - public static void main(String... args) throws Exception { - TestRelativeLinks tester = new TestRelativeLinks(); - tester.runTests(); - } - - @Test - void test() { - javadoc("-d", "out", - "-use", - "-sourcepath", testSrc, - "pkg", "pkg2"); - checkExit(Exit.OK); - - // These relative paths should stay relative because they appear - // in the right places. - checkOutput("pkg/C.html", true, - "relative class link", - "relative field link", - "relative method link", - " relative-multi-line-link."); - checkOutput("pkg/package-summary.html", true, - "relative package link"); - - // These relative paths should be redirected because they are in different - // places. - - // INDEX PAGE - checkOutput("index-all.html", true, - "relative class link", - "relative field link", - "relative method link", - "relative package link", - " relative-multi-line-link."); - - // PACKAGE USE - checkOutput("pkg/package-use.html", true, - "relative package link.", - "relative class link"); - - // CLASS_USE - checkOutput("pkg/class-use/C.html", true, - "relative field link", - "relative method link", - "relative package link", - " relative-multi-line-link."); - - // PACKAGE OVERVIEW - checkOutput("overview-summary.html", true, - "relative package link"); - } -} --- /dev/null Fri Jan 22 12:26:29 2016 +++ new/test/jdk/javadoc/doclet/testRelativeLinks/TestRelativeLinks.java Fri Jan 22 12:26:29 2016 @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2003, 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 4460354 8014636 8043186 + * @summary Test to make sure that relative paths are redirected in the + * output so that they are not broken. + * @author jamieh + * @library ../lib + * @modules jdk.javadoc + * @build JavadocTester + * @run main TestRelativeLinks + */ + +public class TestRelativeLinks extends JavadocTester { + + public static void main(String... args) throws Exception { + TestRelativeLinks tester = new TestRelativeLinks(); + tester.runTests(); + } + + @Test + void test() { + javadoc("-d", "out", + "-use", + "-sourcepath", testSrc, + "pkg", "pkg2"); + checkExit(Exit.OK); + + // These relative paths should stay relative because they appear + // in the right places. + checkOutput("pkg/C.html", true, + "relative class link", + "relative field link", + "relative method link", + " relative-multi-line-link."); + checkOutput("pkg/package-summary.html", true, + "relative package link"); + + // These relative paths should be redirected because they are in different + // places. + + // INDEX PAGE + checkOutput("index-all.html", true, + "relative class link", + "relative field link", + "relative method link", + "relative package link", + " relative-multi-line-link.", + "
"); + + // PACKAGE USE + checkOutput("pkg/package-use.html", true, + "relative package link.", + "relative class link"); + + // CLASS_USE + checkOutput("pkg/class-use/C.html", true, + "relative field link", + "relative method link", + "relative package link", + " relative-multi-line-link."); + + // PACKAGE OVERVIEW + checkOutput("overview-summary.html", true, + "relative package link"); + } +}