--- a/test/langtools/jdk/javadoc/doclet/testIndexWithModules/TestIndexWithModules.java Fri Dec 21 16:56:40 2018 +0100
+++ b/test/langtools/jdk/javadoc/doclet/testIndexWithModules/TestIndexWithModules.java Fri Dec 21 10:38:33 2018 -0800
@@ -25,12 +25,12 @@
* @test
* @bug 8190875
* @summary modules not listed in overview/index page
- * @library /tools/lib ../lib
+ * @library /tools/lib ../../lib
* @modules
* jdk.javadoc/jdk.javadoc.internal.tool
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
- * @build JavadocTester
+ * @build javadoc.tester.*
* @run main TestIndexWithModules
*/
@@ -42,6 +42,8 @@
import toolbox.ToolBox;
+import javadoc.tester.JavadocTester;
+
public class TestIndexWithModules extends JavadocTester {
final ToolBox tb;
@@ -59,7 +61,7 @@
}
@Test
- void testIndexWithOverviewPath(Path base) throws Exception {
+ public void testIndexWithOverviewPath(Path base) throws Exception {
Path out = base.resolve("out");
tb.writeFile("overview.html",
@@ -80,7 +82,7 @@
//multiple modules with frames
@Test
- void testIndexWithMultipleModules1(Path base) throws Exception {
+ public void testIndexWithMultipleModules1(Path base) throws Exception {
Path out = base.resolve("out");
javadoc("-d", out.toString(),
"--module-source-path", src.toString(),
@@ -100,7 +102,7 @@
//multiple modules with out frames
@Test
- void testIndexWithMultipleModules2(Path base) throws Exception {
+ public void testIndexWithMultipleModules2(Path base) throws Exception {
Path out = base.resolve("out");
javadoc("-d", out.toString(),
"--module-source-path", src.toString(),
@@ -116,7 +118,7 @@
}
@Test
- void testIndexWithSingleModule(Path base) throws Exception {
+ public void testIndexWithSingleModule(Path base) throws Exception {
Path out = base.resolve("out");
javadoc("-d", out.toString(),
"--module-source-path", src.toString(),
@@ -129,7 +131,7 @@
//no modules and multiple packages
@Test
- void testIndexWithNoModules1(Path base) throws Exception{
+ public void testIndexWithNoModules1(Path base) throws Exception{
Path out = base.resolve("out");
new ClassBuilder(tb, "P1.A1")
.setModifiers("public","class")
@@ -154,7 +156,7 @@
//no modules and one package
@Test
- void testIndexWithNoModules2(Path base) throws Exception{
+ public void testIndexWithNoModules2(Path base) throws Exception{
Path out = base.resolve("out");
new ClassBuilder(tb, "P1.A1")
.setModifiers("public","class")