Merge pull request #668 from alexarchambault/tweak-scala-js-native-te…

…st-logging Better Scala.JS and Scala Native logging during tests
VirtusLab · Feb 21, 2022 · 8ffc73b · 8ffc73b
2 parents c52d375 + cdce9f6
commit 8ffc73b
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 14 deletions.
diff --git a/modules/build/src/main/scala/scala/build/Logger.scala b/modules/build/src/main/scala/scala/build/Logger.scala
@@ -1,5 +1,7 @@
 package scala.build
 
+import org.scalajs.logging.{Logger => ScalaJsLogger, NullLogger}
+
 import java.io.{OutputStream, PrintStream}
 
 import scala.build.blooprifle.BloopRifleLogger
@@ -26,6 +28,7 @@ trait Logger {
 
   def coursierLogger: coursier.cache.CacheLogger
   def bloopRifleLogger: BloopRifleLogger
+  def scalaJsLogger: ScalaJsLogger
   def scalaNativeTestLogger: sn.Logger
   def scalaNativeCliInternalLoggerOptions: List[String]
 
@@ -48,6 +51,8 @@ object Logger {
       coursier.cache.CacheLogger.nop
     def bloopRifleLogger: BloopRifleLogger =
       BloopRifleLogger.nop
+    def scalaJsLogger: ScalaJsLogger =
+      NullLogger
     def scalaNativeTestLogger: sn.Logger =
       sn.Logger.nullLogger
     def scalaNativeCliInternalLoggerOptions: List[String] =

diff --git a/modules/build/src/main/scala/scala/build/PersistentDiagnosticLogger.scala b/modules/build/src/main/scala/scala/build/PersistentDiagnosticLogger.scala
@@ -1,5 +1,7 @@
 package scala.build
 
+import org.scalajs.logging.{Logger => ScalaJsLogger}
+
 import java.io.PrintStream
 
 import scala.build.blooprifle.BloopRifleLogger
@@ -27,6 +29,7 @@ class PersistentDiagnosticLogger(parent: Logger) extends Logger {
 
   def coursierLogger: coursier.cache.CacheLogger        = parent.coursierLogger
   def bloopRifleLogger: BloopRifleLogger                = parent.bloopRifleLogger
+  def scalaJsLogger: ScalaJsLogger                      = parent.scalaJsLogger
   def scalaNativeTestLogger: sn.Logger                  = parent.scalaNativeTestLogger
   def scalaNativeCliInternalLoggerOptions: List[String] = parent.scalaNativeCliInternalLoggerOptions
 

diff --git a/modules/build/src/main/scala/scala/build/internal/Runner.scala b/modules/build/src/main/scala/scala/build/internal/Runner.scala
@@ -241,7 +241,6 @@ object Runner {
   ): Either[TestError, Int] = either {
     import org.scalajs.jsenv.Input
     import org.scalajs.jsenv.nodejs.NodeJSEnv
-    import org.scalajs.logging.ScalaConsoleLogger
     import org.scalajs.testing.adapter.TestAdapter
     val nodePath = findInPath("node").fold("node")(_.toString)
     val jsEnv = new NodeJSEnv(
@@ -251,7 +250,7 @@ object Runner {
         .withEnv(Map.empty)
         .withSourceMap(NodeJSEnv.SourceMap.Disable)
     )
-    val adapterConfig        = TestAdapter.Config().withLogger(new ScalaConsoleLogger)
+    val adapterConfig        = TestAdapter.Config().withLogger(logger.scalaJsLogger)
     val inputs               = Seq(Input.Script(entrypoint.toPath))
     var adapter: TestAdapter = null
 

diff --git a/modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala b/modules/build/src/test/scala/scala/build/tests/BuildProjectTests.scala
@@ -1,18 +1,24 @@
 package scala.build.tests
 
-import scala.build.errors.Severity
 import com.eed3si9n.expecty.Expecty.expect
-import scala.build.options.{BuildOptions, InternalOptions, JavaOptions, Scope}
-import scala.build.{Build, Inputs, LocalRepo, Positioned, Sources}
-import scala.build.options.{ScalacOpt, ScalaOptions, ShadowingSeq}
-import scala.build.Logger
+import coursier.cache.CacheLogger
+import org.scalajs.logging.{Logger => ScalaJsLogger, NullLogger}
+
+import java.io.PrintStream
+
 import scala.build.Ops._
 import scala.build.blooprifle.BloopRifleLogger
-import scala.build.errors.BuildException
-import scala.build.errors.Diagnostic
-import java.io.PrintStream
-import coursier.cache.CacheLogger
-import scala.build.Position
+import scala.build.errors.{BuildException, Diagnostic, Severity}
+import scala.build.options.{
+  BuildOptions,
+  InternalOptions,
+  JavaOptions,
+  ScalacOpt,
+  ScalaOptions,
+  Scope,
+  ShadowingSeq
+}
+import scala.build.{Build, Inputs, LocalRepo, Logger, Position, Positioned, Sources}
 
 class BuildProjectTests extends munit.FunSuite {
 
@@ -39,6 +45,7 @@ class BuildProjectTests extends munit.FunSuite {
     override def coursierLogger: CacheLogger = CacheLogger.nop
 
     override def bloopRifleLogger: BloopRifleLogger = BloopRifleLogger.nop
+    override def scalaJsLogger: ScalaJsLogger       = NullLogger
 
     override def scalaNativeTestLogger: scala.scalanative.build.Logger =
       scala.scalanative.build.Logger.nullLogger

diff --git a/modules/build/src/test/scala/scala/build/tests/TestLogger.scala b/modules/build/src/test/scala/scala/build/tests/TestLogger.scala
@@ -2,6 +2,7 @@ package scala.build.tests
 
 import coursier.cache.CacheLogger
 import coursier.cache.loggers.{FallbackRefreshDisplay, RefreshLogger}
+import org.scalajs.logging.{Logger => ScalaJsLogger, NullLogger}
 
 import scala.build.blooprifle.BloopRifleLogger
 import scala.build.errors.BuildException
@@ -42,6 +43,8 @@ case class TestLogger(info: Boolean = true, debug: Boolean = false) extends Logg
 
   def bloopRifleLogger: BloopRifleLogger =
     BloopRifleLogger.nop
+  def scalaJsLogger: ScalaJsLogger =
+    NullLogger
   def scalaNativeTestLogger: sn.Logger =
     sn.Logger.nullLogger
   def scalaNativeCliInternalLoggerOptions: List[String] =

diff --git a/modules/cli/src/main/scala/scala/cli/internal/CliLogger.scala b/modules/cli/src/main/scala/scala/cli/internal/CliLogger.scala
@@ -3,6 +3,7 @@ package scala.cli.internal
 import ch.epfl.scala.{bsp4j => b}
 import coursier.cache.CacheLogger
 import coursier.cache.loggers.{FallbackRefreshDisplay, ProgressBarRefreshDisplay, RefreshLogger}
+import org.scalajs.logging.{Level => ScalaJsLevel, Logger => ScalaJsLogger, ScalaConsoleLogger}
 
 import java.io.PrintStream
 
@@ -150,13 +151,23 @@ class CliLogger(
       def bloopCliInheritStderr = verbosity >= 3
     }
 
+  def scalaJsLogger: ScalaJsLogger =
+    // FIXME Doesn't use 'out'
+    new ScalaConsoleLogger(
+      minLevel =
+        if (verbosity >= 2) ScalaJsLevel.Debug
+        else if (verbosity >= 1) ScalaJsLevel.Info
+        else if (verbosity >= 0) ScalaJsLevel.Warn
+        else ScalaJsLevel.Error
+    )
+
   def scalaNativeTestLogger: sn.Logger =
     new sn.Logger {
       def trace(msg: Throwable) = ()
       def debug(msg: String)    = logger.debug(msg)
-      def info(msg: String)     = logger.message(msg)
+      def info(msg: String)     = logger.log(msg)
       def warn(msg: String)     = logger.log(msg)
-      def error(msg: String)    = logger.log(msg)
+      def error(msg: String)    = logger.message(msg)
     }
 
   val scalaNativeCliInternalLoggerOptions: List[String] = {