--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java Wed Feb 07 09:48:43 2018 -0800
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java Wed Feb 07 11:28:23 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, 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
@@ -70,7 +70,7 @@
"--module", "m");
checkExit(Exit.OK);
- checkOutput("m-summary.html", false,
+ checkOutput("m/module-summary.html", false,
"<h3>Packages</h3>\n"
+ "<table class=\"packagesSummary\" summary=\"Packages table, "
+ "listing packages, and an explanation\">");
@@ -159,7 +159,7 @@
checkTableHead("m", ColKind.EXPORTED_TO);
checkPackageRow("m", "p", "i0", "All Modules", null, " ");
checkPackageRow("m", "q", "i1",
- "<a href=\"other-summary.html\">other</a>", null, " ");
+ "<a href=\"../other/module-summary.html\">other</a>", null, " ");
}
@Test
@@ -247,11 +247,11 @@
checkPackageRow("m", "c", "i0", "None", "None", " ");
checkPackageRow("m", "e.all", "i1", "All Modules", "None", " ");
checkPackageRow("m", "e.other", "i2",
- "<a href=\"other-summary.html\">other</a>", "None", " ");
+ "<a href=\"../other/module-summary.html\">other</a>", "None", " ");
checkPackageRow("m", "eo", "i3", "All Modules", "All Modules", " ");
checkPackageRow("m", "o.all", "i4", "None", "All Modules", " ");
checkPackageRow("m", "o.other", "i5", "None",
- "<a href=\"other-summary.html\">other</a>", " ");
+ "<a href=\"../other/module-summary.html\">other</a>", " ");
}
@Test
@@ -367,7 +367,7 @@
checkTableHead("m", ColKind.OPENED_TO);
checkPackageRow("m", "p", "i0", null, "All Modules", " ");
checkPackageRow("m", "q", "i1", null,
- "<a href=\"other-summary.html\">other</a>", " ");
+ "<a href=\"../other/module-summary.html\">other</a>", " ");
}
@Test
@@ -443,7 +443,7 @@
+ "</caption>";
}
- checkOutput(moduleName + "-summary.html", true, expect);
+ checkOutput(moduleName + "/module-summary.html", true, expect);
}
@@ -461,7 +461,7 @@
sb.append("<th class=\"colLast\" scope=\"col\">Description</th>\n"
+ "</tr>");
- checkOutput(moduleName + "-summary.html", true, sb.toString());
+ checkOutput(moduleName + "/module-summary.html", true, sb.toString());
}
private void checkPackageRow(String moduleName, String packageName,
@@ -481,7 +481,7 @@
}
sb.append("<td class=\"colLast\">" + desc + "</td>");
- checkOutput(moduleName + "-summary.html", true, sb.toString());
+ checkOutput(moduleName + "/module-summary.html", true, sb.toString());
}
}