diff -r 5111c1aa3ecd -r 3c2e9a2bbed6 langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java --- a/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Wed Jul 17 10:40:53 2013 -0700 +++ b/langtools/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Wed Jul 17 18:18:45 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, 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 @@ -23,11 +23,9 @@ /* * @test - * @bug 4460354 + * @bug 4460354 8014636 * @summary Test to make sure that relative paths are redirected in the * output so that they are not broken. - * NOTE: these tests have \\n instead of NL because they are user - * generated new lines, not Java generated. * @author jamieh * @library ../lib/ * @build JavadocTester @@ -38,7 +36,7 @@ public class TestRelativeLinks extends JavadocTester { //Test information. - private static final String BUG_ID = "4460354"; + private static final String BUG_ID = "4460354-8014636"; //Javadoc arguments. private static final String[] ARGS = new String[] { @@ -58,7 +56,7 @@ {BUG_ID + FS + "pkg" + FS + "package-summary.html", "relative package link"}, {BUG_ID + FS + "pkg" + FS + "C.html", - " relative-multi-line-link."}, //These relative paths should be redirected because they are in different @@ -74,7 +72,7 @@ {BUG_ID + FS + "index-all.html", "relative package link"}, {BUG_ID + FS + "index-all.html", - " relative-multi-line-link."}, @@ -92,7 +90,7 @@ {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html", "relative package link"}, {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html", - " relative-multi-line-link."}, //PACKAGE OVERVIEW