Fix compile error of other javadoc tests

Author: liach

…vadoc/lib/javadoc/tester/JdkTaglets.java …tools/jdk/javadoc/taglet/JdkTaglets.javatest/langtools/jdk/javadoc/lib/javadoc/tester/JdkTaglets.java renamed to test/langtools/jdk/javadoc/taglet/JdkTaglets.java test/langtools/jdk/javadoc/lib/javadoc/tester/JdkTaglets.java renamed to test/langtools/jdk/javadoc/taglet/JdkTaglets.java

@@ -21,27 +21,33 @@
  * questions.
  */
 
-package javadoc.tester;
-
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.stream.Stream;
 
 import toolbox.JavacTask;
 import toolbox.ToolBox;
 
-/// Utilities to build the JDK taglets.
+/// Utilities to build the JDK-specific taglets.
+/// This guy uses JavacTask so can't be in javadoc.tester.
 public final class JdkTaglets {
 
     /// Build a taglet and return its path for `-tagletpath`.
-    public static Path buildTaglet(ToolBox tb, Path base, String tagletFile) throws IOException {
+    public static Path build(ToolBox tb, Path base, String... tagletFiles) throws IOException {
         Path tagletOutDir = base.resolve("taglet");
+        Files.deleteIfExists(tagletOutDir);
         Files.createDirectories(tagletOutDir);
         Path tagletRoot = tb.findFromTestRoot("../../make/jdk/src/classes/build/tools/taglet");
+
         new JavacTask(tb)
-                .files(tagletRoot.resolve(tagletFile + ".java"))
+                .files(Stream.of(tagletFiles)
+                        .map(tagletFile -> tagletRoot.resolve(tagletFile + ".java"))
+                        .toArray(Path[]::new))
                 .outdir(tagletOutDir)
                 .run(JavacTask.Expect.SUCCESS);
         return tagletOutDir;
     }
+
+    private JdkTaglets() {}
 }

test/langtools/jdk/javadoc/taglet/sealedGraph/TestSealedTaglet.java

@@ -25,7 +25,7 @@
  * @test
  * @summary General tests for SealedGraph block tag
  * @bug 8380913
- * @library /tools/lib /jdk/javadoc/lib
+ * @library /tools/lib /jdk/javadoc/lib ../
  * @modules jdk.compiler/com.sun.tools.javac.api
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.javadoc/jdk.javadoc.internal.tool
@@ -37,7 +37,6 @@
 
 import builder.ClassBuilder;
 import javadoc.tester.JavadocTester;
-import javadoc.tester.JdkTaglets;
 import toolbox.ToolBox;
 
 public class TestSealedTaglet extends JavadocTester {
@@ -55,7 +54,7 @@ public static void main(String... args) throws Exception {
 
     @Test
     public void testInvisibleInMiddle(Path base) throws Exception {
-        var builtTaglet = JdkTaglets.buildTaglet(tb, base, "SealedGraph");
+        var builtTaglet = JdkTaglets.build(tb, base, "SealedGraph");
 
         Path srcDir = base.resolve("src");
         Path outDir = base.resolve("out");