diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java index 1b5d3765c39..b887385df5f 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/DocRootSlash.java @@ -51,13 +51,12 @@ public class DocRootSlash extends JavadocTester { // Directory that contains source files that javadoc runs on String srcdir = System.getProperty("test.src", "."); - setAutomaticCheckLinks(false); // @ignore JDK-8202621 javadoc("-d", "out", "-Xdoclint:none", "-overview", (srcdir + "/overview.html"), "--frames", - "-header", "{@docroot} {@docRoot}", + "-header", "{@docroot} {@docRoot}", "-sourcepath", srcdir, "p1", "p2"); @@ -69,8 +68,8 @@ public class DocRootSlash extends JavadocTester { // Bug 4633447: Special test for overview-frame.html // Find two strings in file "overview-frame.html" checkOutput("overview-frame.html", true, - "", - ""); + "", + ""); } void checkFiles(String... filenameArray) { @@ -81,7 +80,7 @@ public class DocRootSlash extends JavadocTester { String fileString = readFile(f); System.out.println("\nSub-tests for file: " + f + " --------------"); // Loop over all tests in a single file - for ( int j = 0; j < 11; j++ ) { + for ( int j = 0; j < 7; j++ ) { // Compare actual to expected string for a single subtest compareActualToExpected(++count, fileString); @@ -107,9 +106,6 @@ public class DocRootSlash extends JavadocTester { */ private static final String prefix = "(?i)()"; // doublequotes (end group1, group2, group3) - private static final String ref2 = ")(\\S+?)([^<>]*>)"; // no quotes (end group1, group2, group3) - private static final String label = "(.*?)"; // text label (group4) - private static final String end = "()"; // (group5) /** * Compares the actual string to the expected string in the specified string diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html b/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html index 56ccb05b517..766bce489e1 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/overview.html @@ -9,55 +9,33 @@ Dummy first sentence to suppress BreakIterator warning. Case 0 Actual: .   Current directory

-Sub-test 23 Actual: {@docroot} Bare tag - ALL LOWERCASE
-Sub-test 23 Expect:
-(Expect empty string because lowercase docroot is illegal) +Sub-test 15 Actual: {@docroot} Bare tag - ALL LOWERCASE
+Sub-test 15 Expect:
+(Expect empty string because lowercase docroot is illegal)

-Sub-test 24 Actual: {@docRoot} Bare tag - "R" UPPERCASE
-Sub-test 24 Expect: . +Sub-test 16 Actual: {@docRoot} Bare tag - "R" UPPERCASE
+Sub-test 16 Expect: .

-Sub-test 25 Actual: {@docRoot}/package-list
-Sub-test 25 Expect: ./package-list +Sub-test 17 Actual: {@docRoot}/element-list
+Sub-test 17 Expect: ./element-list

-Sub-test 26 Actual: {@docRoot}/p2/C2.html
-Sub-test 26 Expect: ./p2/C2.html +Sub-test 18 Actual: {@docRoot}/p2/C2.html
+Sub-test 18 Expect: ./p2/C2.html

-Sub-test 27 Actual: {@docRoot}/../docs1/p2/C2.html
-Sub-test 27 Expect: ./../docs1/p2/C2.html +Sub-test 19 Actual: {@docRoot}/../out/p2/C2.html
+Sub-test 19 Expect: ./../out/p2/C2.html

-Sub-test 28 Actual: {@docRoot}/p2/package-summary.html#package_description
-Sub-test 28 Expect: ./p2/package-summary.html#package_description +Sub-test 20 Actual: {@docRoot}/p2/package-summary.html#package.description
+Sub-test 20 Expect: ./p2/package-summary.html#package.description

-Sub-test 29 Actual: {@docRoot}/../docs1/p2/package-summary.html#package_description
-Sub-test 29 Expect: ./../docs1/p2/package-summary.html#package_description -

- - - -Allow docRoot to work without a trailing slash for those who had to change their comments -to work with the 1.4.0 bug: -

- -Sub-test 30 Actual: {@docRoot}p2/C2.html
-Sub-test 30 Expect: ./p2/C2.html -

- -Sub-test 31 Actual: {@docRoot}../docs1/p2/C2.html
-Sub-test 31 Expect: ./../docs1/p2/C2.html -

- -Sub-test 32 Actual: {@docRoot}/p2/package-summary.html#package_description
-Sub-test 32 Expect: ./p2/package-summary.html#package_description - -

-Sub-test 33 Actual: {@docRoot}/../docs1/p2/package-summary.html#package_description
-Sub-test 33 Expect: ./../docs1/p2/package-summary.html#package_description +Sub-test 21 Actual: {@docRoot}/../out/p2/package-summary.html#package.description
+Sub-test 21 Expect: ./../out/p2/package-summary.html#package.description diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java index 69f8df4dc4c..51a345a0890 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/C1.java @@ -39,46 +39,24 @@ package p1; * Sub-test 2 Expect: .. *

* - * Sub-test 3 Actual: {@docRoot}/package-list
- * Sub-test 3 Expect: ../package-list + * Sub-test 3 Actual: {@docRoot}/element-list
+ * Sub-test 3 Expect: ../element-list *

* * Sub-test 4 Actual: {@docRoot}/p2/C2.html
* Sub-test 4 Expect: ../p2/C2.html *

* - * Sub-test 5 Actual: {@docRoot}/../docs1/p2/C2.html
- * Sub-test 5 Expect: ../../docs1/p2/C2.html + * Sub-test 5 Actual: {@docRoot}/../out/p2/C2.html
+ * Sub-test 5 Expect: ../../out/p2/C2.html *

* - * Sub-test 6 Actual: {@docRoot}/p2/package-summary.html#package_description
- * Sub-test 6 Expect: ../p2/package-summary.html#package_description + * Sub-test 6 Actual: {@docRoot}/p2/package-summary.html#package.description
+ * Sub-test 6 Expect: ../p2/package-summary.html#package.description *

* - * Sub-test 7 Actual: {@docRoot}/../docs1/p2/package-summary.html#package_description
- * Sub-test 7 Expect: ../../docs1/p2/package-summary.html#package_description - *

- * - * - * - * Allow docRoot to work without a trailing slash for those who had to change their comments - * to work with the 1.4.0 bug: - *

- * - * Sub-test 8 Actual: {@docRoot}p2/C2.html
- * Sub-test 8 Expect: ../p2/C2.html - *

- * - * Sub-test 9 Actual: {@docRoot}../docs1/p2/C2.html
- * Sub-test 9 Expect: ../../docs1/p2/C2.html - *

- * - * Sub-test 10 Actual: {@docRoot}/p2/package-summary.html#package_description
- * Sub-test 10 Expect: ../p2/package-summary.html#package_description#package_description - *

- * - * Sub-test 11 Actual: {@docRoot}/../docs1/p2/package-summary.html#package_description
- * Sub-test 11 Expect: ../../docs1/p2/package-summary.html#package_description + * Sub-test 7 Actual: {@docRoot}/../out/p2/package-summary.html#package.description
+ * Sub-test 7 Expect: ../../out/p2/package-summary.html#package.description * */ public class C1 { diff --git a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html index abda92fd0c7..63ec94e1978 100644 --- a/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html +++ b/test/langtools/jdk/javadoc/doclet/DocRootSlash/p1/package.html @@ -10,55 +10,33 @@ Dummy first sentence to suppress breakiterator warning. Case 0 Actual: .   Current directory

-Sub-test 12 Actual: {@docroot} Bare tag - ALL LOWERCASE
-Sub-test 12 Expect:
+Sub-test 8 Actual: {@docroot} Bare tag - ALL LOWERCASE
+Sub-test 8 Expect:
(Expect empty string because lowercase docroot is illegal)

-Sub-test 13 Actual: {@docRoot} Bare tag - "R" UPPERCASE
-Sub-test 13 Expect: .. +Sub-test 9 Actual: {@docRoot} Bare tag - "R" UPPERCASE
+Sub-test 9 Expect: ..

-Sub-test 14 Actual: {@docRoot}/package-list
-Sub-test 14 Expect: ../package-list +Sub-test 10 Actual: {@docRoot}/element-list
+Sub-test 10 Expect: ../element-list

-Sub-test 15 Actual: {@docRoot}/p2/C2.html
-Sub-test 15 Expect: ../p2/C2.html +Sub-test 11 Actual: {@docRoot}/p2/C2.html
+Sub-test 11 Expect: ../p2/C2.html

-Sub-test 16 Actual: {@docRoot}/../docs1/p2/C2.html
-Sub-test 16 Expect: ../../docs1/p2/C2.html +Sub-test 12 Actual: {@docRoot}/../out/p2/C2.html
+Sub-test 12 Expect: ../../out/p2/C2.html

-Sub-test 17 Actual: {@docRoot}/p2/package-summary.html#package_description
-Sub-test 17 Expect: ../p2/package-summary.html#package_description +Sub-test 13 Actual: {@docRoot}/p2/package-summary.html#package.description
+Sub-test 13 Expect: ../p2/package-summary.html#package.description

-Sub-test 18 Actual: {@docRoot}/../docs1/p2/package-summary.html#package_description
-Sub-test 18 Expect: ../../docs1/p2/package-summary.html#package_description -

- - - -Allow docRoot to work without a trailing slash for those who had to change their comments -to work with the 1.4.0 bug: -

- -Sub-test 19 Actual: {@docRoot}p2/C2.html
-Sub-test 19 Expect: ../p2/C2.html -

- -Sub-test 20 Actual: {@docRoot}../docs1/p2/C2.html
-Sub-test 20 Expect: ../../docs1/p2/C2.html -

- -Sub-test 21 Actual: {@docRoot}/p2/package-summary.html#package_description
-Sub-test 21 Expect: ../p2/package-summary.html#package_description -

- -Sub-test 22 Actual: {@docRoot}/../docs1/p2/package-summary.html#package_description
-Sub-test 22 Expect: ../../docs1/p2/package-summary.html#package_description +Sub-test 14 Actual: {@docRoot}/../out/p2/package-summary.html#package.description
+Sub-test 14 Expect: ../../out/p2/package-summary.html#package.description