--- old/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Fri Jan 22 12:22:57 2016 +++ /dev/null Fri Jan 22 12:22:57 2016 @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2011, 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 6553182 8025416 8029504 - * @summary This test verifies the -Xdocrootparent option. - * @author Bhavesh Patel - * @library ../lib - * @modules jdk.javadoc - * @build JavadocTester - * @run main TestDocRootLink - */ -public class TestDocRootLink extends JavadocTester { - - public static void main(String... args) throws Exception { - TestDocRootLink tester = new TestDocRootLink(); - tester.runTests(); - } - - @Test - void test1() { - javadoc("-d", "out-1", - "-sourcepath", testSrc, - "pkg1", "pkg2"); - checkExit(Exit.OK); - - checkOutput("pkg1/C1.html", true, - "Refer Here", - "This Here should not be replaced\n" + - " with an absolute link.", - "Testing Link 1 and\n" + - " Link 2."); - - checkOutput("pkg1/package-summary.html", true, - "\n" + - " Test document 1", - "\n" + - " Another Test document 1", - "\n" + - " Another Test document 2."); - - // TODO: should this check *any* reference to http://download.oracle.com/ - checkOutput("pkg1/C1.html", false, - "", - ""); - - checkOutput("pkg1/package-summary.html", false, - "", - ""); - } - - @Test - void test2() { - javadoc("-d", "out-2", - "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", - "-sourcepath", testSrc, - "pkg1", "pkg2"); - checkExit(Exit.OK); - - checkOutput("pkg2/C2.html", true, - "Refer Here", - "This Here should not be replaced\n" + - " with an absolute link.", - "Testing Link 1 and\n" + - " Link 2."); - - checkOutput("pkg2/package-summary.html", true, - "\n" + - " Test document 1", - "\n" + - " Another Test document 1", - "\n" + - " Another Test document 2."); - - checkOutput("pkg2/C2.html", false, - "", - ""); - - checkOutput("pkg2/package-summary.html", false, - "", - ""); - } -} --- /dev/null Fri Jan 22 12:22:57 2016 +++ new/test/jdk/javadoc/doclet/testDocRootLink/TestDocRootLink.java Fri Jan 22 12:22:57 2016 @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2011, 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 6553182 8025416 8029504 + * @summary This test verifies the -Xdocrootparent option. + * @author Bhavesh Patel + * @library ../lib + * @modules jdk.javadoc + * @build JavadocTester + * @run main TestDocRootLink + */ +public class TestDocRootLink extends JavadocTester { + + public static void main(String... args) throws Exception { + TestDocRootLink tester = new TestDocRootLink(); + tester.runTests(); + } + + @Test + void test1() { + javadoc("-d", "out-1", + "-sourcepath", testSrc, + "pkg1", "pkg2"); + checkExit(Exit.OK); + + checkOutput("pkg1/C1.html", true, + "Refer Here", + "This Here should not be replaced\n" + + " with an absolute link.", + "Testing Link 1 and\n" + + " Link 2."); + + checkOutput("pkg1/package-summary.html", true, + "\n" + + " Test document 1", + "\n" + + " Another Test document 1", + "\n" + + " Another Test document 2."); + + // TODO: should this check *any* reference to http://download.oracle.com/ + checkOutput("pkg1/C1.html", false, + "", + ""); + + checkOutput("pkg1/package-summary.html", false, + "", + ""); + } + + @Test + void test2() { + javadoc("-d", "out-2", + "-Xdocrootparent", "http://download.oracle.com/javase/7/docs", + "-sourcepath", testSrc, + "pkg1", "pkg2"); + checkExit(Exit.OK); + + checkOutput("pkg2/C2.html", true, + "Refer Here", + "This Here should not be replaced\n" + + " with an absolute link.", + "Testing Link 1 and\n" + + " Link 2."); + + checkOutput("pkg2/package-summary.html", true, + "\n" + + " Test document 1", + "\n" + + " Another Test document 1", + "\n" + + " Another Test document 2."); + + checkOutput("pkg2/C2.html", false, + "", + ""); + + checkOutput("pkg2/package-summary.html", false, + "", + ""); + } +}