Fix tests in scaladoc

Author: romanowski

project/Build.scala

@@ -1151,7 +1151,7 @@ object Build {
   lazy val `scala3-bench-bootstrapped` = project.in(file("bench")).asDottyBench(Bootstrapped)
   lazy val `scala3-bench-run` = project.in(file("bench-run")).asDottyBench(Bootstrapped)
 
-  val testcasesOutputDir = taskKey[String]("Root directory where tests classses are generated")
+  val testcasesOutputDir = taskKey[Seq[String]]("Root directory where tests classses are generated")
   val testcasesSourceRoot = taskKey[String]("Root directory where tests sources are generated")
   val testDocumentationRoot = taskKey[String]("Root directory where tests documentation are stored")
   val generateSelfDocumentation = taskKey[Unit]("Generate example documentation")
@@ -1512,13 +1512,13 @@ object Build {
         }
 
       def joinProducts(products: Seq[java.io.File]): String =
-        products.iterator.map(_.getAbsolutePath).map(p => s"'$p'").mkString(" ")
+        products.iterator.map(_.getAbsolutePath).mkString(" ")
 
       val flexmarkVersion = "0.42.12"
 
       scaladocBasic(Bootstrapped).settings(
         Test / test := (Test / test).dependsOn(compile.in(Compile).in(`scaladoc-testcases`)).value,
-        testcasesOutputDir.in(Test) := joinProducts((`scaladoc-testcases`/Compile/products).value),
+        testcasesOutputDir.in(Test) := (`scaladoc-testcases`/Compile/products).value.map(_.getAbsolutePath),
         testcasesSourceRoot.in(Test) := (baseDirectory.in(`scaladoc-testcases`).value / "src").getAbsolutePath.toString,
         baseDirectory.in(run) := baseDirectory.in(ThisBuild).value,
         generateSelfDocumentation := Def.taskDyn {
@@ -1588,7 +1588,7 @@ object Build {
 
         generateTestcasesDocumentation := Def.taskDyn {
           generateDocumentation(
-            Build.testcasesOutputDir.in(Test).value :: Nil,
+            Build.testcasesOutputDir.in(Test).value,
             "scaladoc testcases",
             "scaladoc/output/testcases",
             "master")

scaladoc/test/dotty/tools/scaladoc/BaseHtmlTest.scala

@@ -31,7 +31,7 @@ class BaseHtmlTest:
       try
         val args = Scaladoc.Args(
             name = projectName,
-            tastyFiles = pcks.flatMap(tastyFiles),
+            tastyFiles = pcks.flatMap(tastyFiles(_)),
             output = dest.toFile,
             docsRoot = docsRoot,
             projectVersion = Some(projectVersion),

scaladoc/test/dotty/tools/scaladoc/RaportingTest.scala

@@ -33,11 +33,6 @@ class ReportingTest:
     assertNoInfos(diag)
   }
 
-  @Test
-  def noClassesErors = checkReportedDiagnostics(_.copy(tastyFiles = Nil)){ diag =>
-    assertMessagesAbout(diag.errorMsgs)("classes should no be empty")
-  }
-
   @Test
   def errorsInCaseOfIncompletClasspath =
     val notTasty = Files.createTempFile("broken", ".notTasty")

scaladoc/test/dotty/tools/scaladoc/tasty/util/TestUtils.scala

@@ -8,20 +8,24 @@ object TestUtils {
     import java.io.File
     import scala.collection.mutable.ListBuffer
 
-    val classRoot = new File(BuildInfo.test_testcasesOutputDir)
-
     def go(bld: ListBuffer[String])(file: File): Unit =
       file.listFiles.foreach { f =>
         if f.isFile() then
           if f.toString.endsWith(".tasty") then bld.append(f.toString)
         else go(bld)(f)
       }
 
-    if classRoot.isDirectory then
-      val bld = new ListBuffer[String]
-      go(bld)(classRoot)
-      bld.result
-    else
-      sys.error(s"Class root could not be found: $classRoot")
+    def listEntry(entry: String): List[String] =
+      val classRoot = File(entry)
+      if classRoot.isDirectory then
+        val bld = new ListBuffer[String]
+        go(bld)(classRoot)
+        bld.result
+      else
+        sys.error(s"Class root could not be found: $classRoot")
+
+    val files = BuildInfo.test_testcasesOutputDir.flatMap(listEntry).toList
+    assert(files.nonEmpty, "Provided list of root directories is empty")
+    files
   }
 }

scaladoc/test/dotty/tools/scaladoc/testUtils.scala

@@ -60,7 +60,7 @@ def testContext = (new ContextBase).initialCtx.fresh.setReporter(new TestReporte
 
 def testDocContext(files: Seq[File] = Nil) = DocContext(testArgs(files), testContext)
 
-def tastyFiles(name: String) =
+def tastyFiles(name: String, allowEmpty: Boolean = false) =
   def listFilesSafe(dir: File) = Option(dir.listFiles).getOrElse {
     throw AssertionError(s"$dir not found. The test name is incorrect or scaladoc-testcases were not recompiled.")
   }
@@ -69,4 +69,7 @@ def tastyFiles(name: String) =
       case f if f.getName endsWith ".tasty" => f :: Nil
       case _ => Nil
     }
-  collectFiles(File(s"${BuildInfo.test_testcasesOutputDir}/tests/$name"))
+  val files = BuildInfo.test_testcasesOutputDir.flatMap(p => collectFiles(File(s"$p/tests/$name")))
+  assert(files.nonEmpty || allowEmpty)
+  files.toSeq
+