Add simple parallelism

Author: nicolasstucki

language-server/test/dotty/tools/languageserver/Main.scala

@@ -1,63 +1,61 @@
 package dotty.tools.languageserver
 
 import org.junit.Test
-
 import java.lang.reflect.InvocationTargetException
+import java.util.concurrent.TimeUnit
+
+import scala.concurrent.{Await, Future}
+import scala.concurrent.duration.Duration
+import scala.concurrent.ExecutionContext.Implicits.global
 
 // TODO remove this and use JUnit to run the tests
 object Main {
   def main(args: Array[String]): Unit = {
-    var testsFailed = 0
-    for (clazz <- testsClasses) {
-      val t0 = System.currentTimeMillis()
-      var passed = 0
-      var failed = 0
-      println(s"Starting tests in ${clazz.getSimpleName}")
-      for (method <- clazz.getMethods.sortBy(_.getName)) {
-        if (method.getAnnotation(classOf[Test]) ne null) {
-          print(s"Testing $clazz.${method.getName} ")
-          try {
-            method.invoke(clazz.getConstructor().newInstance())
-            println(Console.GREEN + "passed" + Console.RESET)
-            passed += 1
-          } catch {
-            case ex: InvocationTargetException =>
-              ex.getCause match {
-                case ex1: AssertionError =>
-                  println(Console.RED + "failed" + Console.RESET)
-                  System.err.println(s"${method.getName} failed with")
-                  ex1.printStackTrace()
-                  failed += 1
-                case _ => throw ex.getCause
-              }
-          }
+    var failed = 0
+    var passed = 0
+    val tests =
+      for {
+        clazz <- testsClasses
+        method <- clazz.getMethods.sortBy(_.getName)
+        if method.getAnnotation(classOf[Test]) ne null
+      } yield {
+          Future {
+            println(s"Testing ${clazz.getCanonicalName}.${method.getName} ")
+            try {
+                method.invoke(clazz.getConstructor().newInstance())
+                println(s"Testing ${clazz.getCanonicalName}.${method.getName} " + Console.GREEN + "passed" + Console.RESET)
+                passed += 1
+            } catch {
+              case ex: InvocationTargetException =>
+                ex.getCause match {
+                  case ex1: AssertionError =>
+                    println(s"Testing ${clazz.getCanonicalName}.${method.getName} " + Console.RED + "failed" + Console.RESET)
+                    System.err.println(s"${method.getName} failed with")
+                    ex1.printStackTrace()
+                    failed += 1
+                  case _ => throw ex.getCause
+                }
+            }
         }
       }
 
-      val time = (System.currentTimeMillis() - t0).toDouble / 1000
+    Await.ready(Future.sequence(tests), Duration.Inf)
 
-      if (failed == 0) {
-        println(s"${Console.GREEN}Passed all $passed tests${Console.RESET} in ${time}s")
-      } else {
-        testsFailed += 1
-        System.err.println(s"Passed $passed, ${Console.RED}failed $failed${Console.RESET}, total ${passed + failed} in ${time}s")
-      }
-      println()
-    }
-    if (testsFailed != 0) {
-      System.err.println(s"Failed $testsFailed tests")
+    if (failed != 0) {
+      System.err.println(s"Failed $failed tests")
       System.exit(1)
     }
+    println(Console.GREEN + s"Passed all $passed tests" + Console.RESET)
   }
 
   private def testsClasses = List(
+    classOf[SymbolTest],
+    classOf[RenameTest],
+    classOf[ReferencesTest],
+    classOf[DocumentSymbolTest],
+    classOf[DefinitionTest],
     classOf[HighlightTest],
     classOf[CompletionTest],
-    classOf[DefinitionTest],
     classOf[HoverTest],
-    classOf[ReferencesTest],
-    classOf[RenameTest],
-    classOf[DocumentSymbolTest],
-    classOf[SymbolTest],
   )
 }

language-server/test/dotty/tools/languageserver/util/CodeTester.scala

@@ -1,10 +1,11 @@
 package dotty.tools.languageserver.util
 
+import java.nio.file.Paths
+
 import dotty.tools.languageserver.util.Code.SourceWithPositions
 import dotty.tools.languageserver.util.actions._
 import dotty.tools.languageserver.util.embedded.CodeMarker
 import dotty.tools.languageserver.util.server.{TestFile, TestServer}
-import org.eclipse.lsp4j.SymbolInformation
 
 class CodeTester(sources: List[SourceWithPositions], actions: List[Action]) {
 

language-server/test/dotty/tools/languageserver/util/server/TestFile.scala

@@ -9,6 +9,6 @@ class TestFile(val file: String) extends AnyVal {
 }
 
 object TestFile {
-  lazy val testDir: Path = Paths.get("../out/ide-tests").toAbsolutePath
-  lazy val sourceDir: Path = testDir.resolve("src")
+  val testDir: Path = Paths.get("../out/ide-tests").toAbsolutePath
+  val sourceDir: Path = testDir.resolve("src")
 }