--- old/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java Fri Jan 22 12:21:56 2016 +++ /dev/null Fri Jan 22 12:21:56 2016 @@ -1,57 +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 4640745 - * @summary This test verifys that the -link option handles absolute paths. - * @author jamieh - * @library ../lib - * @modules jdk.javadoc - * @build JavadocTester - * @run main TestAbsLinkPath - */ - -public class TestAbsLinkPath extends JavadocTester { - - public static void main(String... args) throws Exception { - TestAbsLinkPath tester = new TestAbsLinkPath(); - tester.runTests(); - } - - @Test - void test1() { - String out1 = "out1"; - javadoc("-d", out1, "-sourcepath", testSrc, "pkg2"); - checkExit(Exit.OK); - - javadoc("-d", "out2", - "-sourcepath", testSrc, - "-link", "../" + out1, - "pkg1"); - checkExit(Exit.OK); - - checkOutput("pkg1/C1.html", true, - "C2.html"); - } -} --- /dev/null Fri Jan 22 12:21:56 2016 +++ new/test/jdk/javadoc/doclet/testAbsLinkPath/TestAbsLinkPath.java Fri Jan 22 12:21:56 2016 @@ -0,0 +1,57 @@ +/* + * 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 4640745 + * @summary This test verifys that the -link option handles absolute paths. + * @author jamieh + * @library ../lib + * @modules jdk.javadoc + * @build JavadocTester + * @run main TestAbsLinkPath + */ + +public class TestAbsLinkPath extends JavadocTester { + + public static void main(String... args) throws Exception { + TestAbsLinkPath tester = new TestAbsLinkPath(); + tester.runTests(); + } + + @Test + void test1() { + String out1 = "out1"; + javadoc("-d", out1, "-sourcepath", testSrc, "pkg2"); + checkExit(Exit.OK); + + javadoc("-d", "out2", + "-sourcepath", testSrc, + "-link", "../" + out1, + "pkg1"); + checkExit(Exit.OK); + + checkOutput("pkg1/C1.html", true, + "C2.html"); + } +}