test/langtools/jdk/javadoc/doclet/testModules/TestModulePackages.java

@@ -68,11 +68,11 @@
                 "-noindex",
                 "--module-source-path", src.toString(),
                 "--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\">");
     }
 

@@ -157,11 +157,11 @@
         checkExit(Exit.OK);
         checkCaption("m", TabKind.EXPORTS);
         checkTableHead("m", ColKind.EXPORTED_TO);
         checkPackageRow("m", "p", "i0", "All Modules", null, " ");
         checkPackageRow("m", "q", "i1",
-                "<a href=\"other-summary.html\">other</a>", null, "&nbsp;");
+                "<a href=\"../other/module-summary.html\">other</a>", null, "&nbsp;");
     }
 
     @Test
     public void exportWithConcealed(Path base) throws Exception {
         Path src = base.resolve("src");

@@ -245,15 +245,15 @@
         checkCaption("m", TabKind.EXPORTS, TabKind.OPENS, TabKind.CONCEALED);
         checkTableHead("m", ColKind.EXPORTED_TO, ColKind.OPENED_TO);
         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", "&nbsp;");
+                "<a href=\"../other/module-summary.html\">other</a>", "None", "&nbsp;");
         checkPackageRow("m", "eo", "i3", "All Modules", "All Modules", "&nbsp;");
         checkPackageRow("m", "o.all", "i4", "None", "All Modules", "&nbsp;");
         checkPackageRow("m", "o.other", "i5", "None",
-                "<a href=\"other-summary.html\">other</a>", "&nbsp;");
+                "<a href=\"../other/module-summary.html\">other</a>", "&nbsp;");
     }
 
     @Test
     public void openModule(Path base) throws Exception {
         Path src = base.resolve("src");

@@ -365,11 +365,11 @@
         checkExit(Exit.OK);
         checkCaption("m", TabKind.OPENS);
         checkTableHead("m", ColKind.OPENED_TO);
         checkPackageRow("m", "p", "i0", null, "All Modules", " ");
         checkPackageRow("m", "q", "i1", null,
-                "<a href=\"other-summary.html\">other</a>", "&nbsp;");
+                "<a href=\"../other/module-summary.html\">other</a>", "&nbsp;");
     }
 
     @Test
     public void openWithConcealed(Path base) throws Exception {
         Path src = base.resolve("src");

@@ -441,11 +441,11 @@
                         + "<span>" + name + "</span>"
                         + "<span class=\"tabEnd\">&nbsp;</span>"
                         + "</caption>";
         }
 
-        checkOutput(moduleName + "-summary.html", true, expect);
+        checkOutput(moduleName + "/module-summary.html", true, expect);
     }
 
 
     private void checkTableHead(String moduleName, ColKind... kinds) {
         Set<ColKind> kindSet = Set.of(kinds);

@@ -459,11 +459,11 @@
             sb.append("<th class=\"colSecond\" scope=\"col\">Opened To Modules</th>\n");
         }
         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,
             String id, String exportedTo, String openedTo, String desc) {
         StringBuilder sb = new StringBuilder();

@@ -479,10 +479,10 @@
         if (openedTo != null) {
             sb.append("<td class=\"colSecond\">" + openedTo + "</td>\n");
         }
         sb.append("<td class=\"colLast\">" + desc + "</td>");
 
-        checkOutput(moduleName + "-summary.html", true, sb.toString());
+        checkOutput(moduleName + "/module-summary.html", true, sb.toString());
     }
 
 }