--- a/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Wed Feb 07 09:48:43 2018 -0800
+++ b/test/langtools/jdk/javadoc/doclet/testModules/TestModuleServices.java Wed Feb 07 11:28:23 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -124,31 +124,31 @@
"moduleServiceUserNoDescription/pkgServiceUserNoDescription");
checkExit(Exit.OK);
- checkOutput("moduleServiceProvider-summary.html", true,
+ checkOutput("moduleServiceProvider/module-summary.html", true,
"<tr class=\"altColor\">\n"
- + "<th class=\"colFirst\" scope=\"row\"><a href=\"pkgService/Service.html\" "
+ + "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" "
+ "title=\"interface in pkgService\">Service</a></th>\n"
+ "<td class=\"colLast\">\n"
+ "<div class=\"block\">Provides a service whose name is ServiceProvider.</div>\n"
+ "</td>\n"
+ "</tr>");
- checkOutput("moduleServiceUser-summary.html", true,
+ checkOutput("moduleServiceUser/module-summary.html", true,
"<tr class=\"altColor\">\n"
- + "<th class=\"colFirst\" scope=\"row\"><a href=\"pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ + "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ "<td class=\"colLast\">\n"
+ "<div class=\"block\">If no other provider is found, a default internal implementation will be used.</div>\n"
+ "</td>\n"
+ "</tr>");
- checkOutput("moduleServiceUserNoDescription-summary.html", true,
+ checkOutput("moduleServiceUserNoDescription/module-summary.html", true,
"<tr class=\"altColor\">\n"
- + "<th class=\"colFirst\" scope=\"row\"><a href=\"pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ + "<th class=\"colFirst\" scope=\"row\"><a href=\"../moduleService/pkgService/Service.html\" title=\"interface in pkgService\">Service</a></th>\n"
+ "<td class=\"colLast\">\n"
+ "<div class=\"block\">A service Interface for service providers.</div>\n"
+ "</td>\n"
+ "</tr>");
- checkOutput("moduleServiceProvider-summary.html", false,
+ checkOutput("moduleServiceProvider/module-summary.html", false,
"A service Interface for service providers.");
- checkOutput("moduleServiceUser-summary.html", false,
+ checkOutput("moduleServiceUser/module-summary.html", false,
"A service Interface for service providers.");
}
@@ -169,7 +169,7 @@
"--module", "m");
checkExit(Exit.OK);
- checkOutput("m-summary.html", false,
+ checkOutput("m/module-summary.html", false,
"<h3>Services</h3>");
}
@@ -190,10 +190,10 @@
"--module", "m");
checkExit(Exit.OK);
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<h3>Services</h3>");
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<table class=\"usesSummary\" summary=\"Uses table, listing types, and an explanation\">\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
"<tr>\n" +
@@ -230,10 +230,10 @@
"--module", "m");
checkExit(Exit.OK);
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<h3>Services</h3>");
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<table class=\"usesSummary\" summary=\"Uses table, listing types, and an explanation\">\n" +
"<caption><span>Uses</span><span class=\"tabEnd\"> </span></caption>\n" +
"<tr>\n" +
@@ -270,7 +270,7 @@
checkExit(Exit.OK);
- checkOutput("m-summary.html", false,
+ checkOutput("m/module-summary.html", false,
"<h3>Services</h3>");
}
@@ -296,10 +296,10 @@
checkExit(Exit.OK);
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<h3>Services</h3>");
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<table class=\"providesSummary\" summary=\"Provides table, listing types, and an explanation\">\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
"<tr>\n" +
@@ -339,10 +339,10 @@
checkExit(Exit.OK);
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<h3>Services</h3>");
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<table class=\"providesSummary\" summary=\"Provides table, listing types, and an explanation\">\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
"<tr>\n" +
@@ -381,10 +381,10 @@
checkExit(Exit.OK);
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<h3>Services</h3>");
- checkOutput("m-summary.html", true,
+ checkOutput("m/module-summary.html", true,
"<table class=\"providesSummary\" summary=\"Provides table, listing types, and an explanation\">\n" +
"<caption><span>Provides</span><span class=\"tabEnd\"> </span></caption>\n" +
"<tr>\n" +