1.1 --- a/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Wed Jul 17 10:40:53 2013 -0700
1.2 +++ b/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java Wed Jul 17 18:18:45 2013 -0700
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -23,11 +23,9 @@
1.11
1.12 /*
1.13 * @test
1.14 - * @bug 4460354
1.15 + * @bug 4460354 8014636
1.16 * @summary Test to make sure that relative paths are redirected in the
1.17 * output so that they are not broken.
1.18 - * NOTE: these tests have \\n instead of NL because they are user
1.19 - * generated new lines, not Java generated.
1.20 * @author jamieh
1.21 * @library ../lib/
1.22 * @build JavadocTester
1.23 @@ -38,7 +36,7 @@
1.24 public class TestRelativeLinks extends JavadocTester {
1.25
1.26 //Test information.
1.27 - private static final String BUG_ID = "4460354";
1.28 + private static final String BUG_ID = "4460354-8014636";
1.29
1.30 //Javadoc arguments.
1.31 private static final String[] ARGS = new String[] {
1.32 @@ -58,7 +56,7 @@
1.33 {BUG_ID + FS + "pkg" + FS + "package-summary.html",
1.34 "<a href=\"relative-package-link.html\">relative package link</a>"},
1.35 {BUG_ID + FS + "pkg" + FS + "C.html",
1.36 - " <a\n" +
1.37 + " <a" + NL +
1.38 " href=\"relative-multi-line-link.html\">relative-multi-line-link</a>."},
1.39
1.40 //These relative paths should be redirected because they are in different
1.41 @@ -74,7 +72,7 @@
1.42 {BUG_ID + FS + "index-all.html",
1.43 "<a href=\"./pkg/relative-package-link.html\">relative package link</a>"},
1.44 {BUG_ID + FS + "index-all.html",
1.45 - " <a\n" +
1.46 + " <a" + NL +
1.47 " href=\"./pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
1.48
1.49
1.50 @@ -92,7 +90,7 @@
1.51 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
1.52 "<a href=\"../../pkg/relative-package-link.html\">relative package link</a>"},
1.53 {BUG_ID + FS + "pkg" + FS + "class-use" + FS + "C.html",
1.54 - " <a\n" +
1.55 + " <a" + NL +
1.56 " href=\"../../pkg/relative-multi-line-link.html\">relative-multi-line-link</a>."},
1.57
1.58 //PACKAGE OVERVIEW
