Rewrites to case classes and enums

Author: hamzaremmal

compiler/test/dotty/tools/vulpix/FailedTestInfo.scala

@@ -52,6 +52,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
    *  all tests. All absolute paths that contain any of the substrings in `testFilter`
    *  will be run
    */
+  // TODO: Why not just use a FileFilter ??
   def testFilter: List[String]
 
   /** Tests should override the checkfiles with the current output */
@@ -868,18 +869,18 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     private def verifyOutput(checkFile: Option[JFile], dir: JFile, testSource: TestSource, warnings: Int, reporters: Seq[TestReporter], logger: LoggedRunnable) = {
       if Properties.testsNoRun then addNoRunWarning()
       else runMain(testSource.runClassPath, testSource.allToolArgs) match {
-        case Success(output) => checkFile match {
+        case Status.Success(output) => checkFile match {
           case Some(file) if file.exists => diffTest(testSource, file, output.linesIterator.toList, reporters, logger)
           case _ =>
         }
-        case Failure(output) =>
+        case Status.Failure(output) =>
           if output == "" then
             echo(s"Test '${testSource.title}' failed with no output")
           else
             echo(s"Test '${testSource.title}' failed with output:")
             echo(output)
           failTestSource(testSource)
-        case Timeout =>
+        case Status.Timeout =>
           echo("failed because test " + testSource.title + " timed out")
           failTestSource(testSource, TimeoutFailure(testSource.title))
       }
@@ -1589,16 +1590,14 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     }.getOrElse(StandardCharsets.UTF_8)
 }
 
-object ParallelTesting {
+object ParallelTesting:
 
-  def defaultOutputDir: String = "out"+JFile.separator
+  def defaultOutputDir: String = s"out${JFile.separator}"
 
-  def isSourceFile(f: JFile): Boolean = {
+  def isSourceFile(f: JFile): Boolean =
     val name = f.getName
     name.endsWith(".scala") || name.endsWith(".java")
-  }
 
   def isTastyFile(f: JFile): Boolean =
     f.getName.endsWith(".tasty")
 
-}

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -138,22 +138,22 @@ trait RunnerOrchestration {
             childOutput = childStdout.readLine()
           }
 
-          if (process.isAlive && childOutput != null) Success(sb.toString)
-          else Failure(sb.toString)
+          if (process.isAlive && childOutput != null) Status.Success(sb.toString)
+          else Status.Failure(sb.toString)
         }
 
         // Await result for `maxDuration` and then timout and destroy the
         // process:
         val status =
           try Await.result(readOutput, maxDuration)
-          catch { case _: TimeoutException =>  Timeout }
+          catch { case _: TimeoutException =>  Status.Timeout }
 
         // Handle failure of the VM:
         status match {
-          case _: Success if safeMode => respawn()
-          case _: Success => // no need to respawn sub process
-          case _: Failure => respawn()
-          case Timeout => respawn()
+          case _: Status.Success if safeMode => respawn()
+          case _: Status.Success => // no need to respawn sub process
+          case _: Status.Failure => respawn()
+          case Status.Timeout => respawn()
         }
         status
       }

compiler/test/dotty/tools/vulpix/RunnerOrchestration.scala

@@ -6,10 +6,14 @@ package dotty.tools.vulpix
  *    compileFilesInDir("tests/pos", defaultOptions)(TestGroup("compileStdLib")) // will output in ./out/compileStdLib/...
  *    compileFilesInDir("tests/pos", defaultOptimised)(TestGroup("optimised/testOptimised")) // will output in ./out/optimised/testOptimised/...
  */
-class TestGroup(val name: String) extends AnyVal {
+case class TestGroup(val name: String) extends AnyVal:
   override def toString: String = name
-}
 
-object TestGroup {
-  def apply(name: String): TestGroup = new TestGroup(name)
-}
+/** ??? */
+enum Status:
+    case Success(output: String)
+    case Failure(output: String)
+    case Timeout
+
+/** ??? */
+case class FailedTestInfo(title: String, extra: String)