chore: refactor misc minor things in unit tests

Author: Gedochao

modules/build-macros/src/test/scala/scala/build/CPSTest.scala

@@ -7,7 +7,7 @@ class CPSTest extends munit.FunSuite {
   val failed1: Either[Int, String] = Left(1)
   val ok: Either[Int, String]      = Right("OK")
 
-  def checkResult(expected: Either[Int, String])(res: => Either[Int, String]) =
+  def checkResult(expected: Either[Int, String])(res: => Either[Int, String]): Unit =
     assertEquals(expected, res)
 
   test("Basic CPS test") {

modules/build/src/test/scala/scala/build/tests/BuildTests.scala

@@ -8,6 +8,7 @@ import com.google.gson.Gson
 import dependency.parser.DependencyParser
 
 import java.io.IOException
+
 import scala.build.Ops.*
 import scala.build.errors.{
   DependencyFormatError,
@@ -45,7 +46,7 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
     )
   )
 
-  def sv2: String = Constants.defaultScala213Version
+  def sv2: String                  = Constants.defaultScala213Version
   val defaultOptions: BuildOptions = baseOptions.copy(
     scalaOptions = baseOptions.scalaOptions.copy(
       scalaVersion = Some(MaybeScalaVersion(sv2)),
@@ -54,7 +55,7 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
     scriptOptions = ScriptOptions(Some(true))
   )
 
-  def sv3: String = Constants.defaultScalaVersion
+  def sv3: String                        = Constants.defaultScalaVersion
   val defaultScala3Options: BuildOptions = defaultOptions.copy(
     scalaOptions = defaultOptions.scalaOptions.copy(
       scalaVersion = Some(MaybeScalaVersion(sv3)),

modules/build/src/test/scala/scala/build/tests/SourcesTests.scala

@@ -8,6 +8,7 @@ import dependency.*
 
 import java.io.File
 import java.nio.charset.StandardCharsets
+
 import scala.build.Ops.*
 import scala.build.errors.{UsingDirectiveValueNumError, UsingDirectiveWrongValueTypeError}
 import scala.build.input.ScalaCliInvokeData

modules/build/src/test/scala/scala/build/tests/TestLogger.scala

@@ -3,9 +3,10 @@ package scala.build.tests
 import bloop.rifle.BloopRifleLogger
 import coursier.cache.CacheLogger
 import coursier.cache.loggers.{FallbackRefreshDisplay, RefreshLogger}
-import org.scalajs.logging.{NullLogger, Logger as ScalaJsLogger}
+import org.scalajs.logging.{Logger as ScalaJsLogger, NullLogger}
 
 import java.io.PrintStream
+
 import scala.build.Logger
 import scala.build.errors.{BuildException, Diagnostic}
 import scala.build.internals.FeatureType
@@ -75,10 +76,6 @@ case class TestLogger(info: Boolean = true, debug: Boolean = false) extends Logg
     sn.Logger.nullLogger
   def scalaNativeCliInternalLoggerOptions: List[String] =
     List()
-  def bloopBspStderr: Option[Nothing] = None
-  def bloopBspStdout: Option[Nothing] = None
-  def bloopCliInheritStdout: Boolean  = false
-  def bloopCliInheritStderr: Boolean  = false
 
   def compilerOutputStream: PrintStream = System.err
 

modules/build/src/test/scala/scala/build/tests/TestUtil.scala

@@ -4,6 +4,7 @@ import munit.AnyFixture
 import munit.Assertions.assertEquals
 
 import java.util.concurrent.TimeUnit
+
 import scala.build.options.{BuildOptions, Platform}
 import scala.build.{Build, Positioned}
 import scala.concurrent.duration.FiniteDuration

modules/cli/src/test/scala/cli/commands/tests/ReplOptionsTests.scala

@@ -7,7 +7,6 @@ import scala.cli.commands.repl.{Repl, ReplOptions, SharedReplOptions}
 import scala.cli.commands.shared.{SharedOptions, SharedPythonOptions}
 
 class ReplOptionsTests extends munit.FunSuite {
-
   test("ScalaPy version") {
     val ver         = "X.Y.Z"
     val replOptions = ReplOptions(
@@ -32,5 +31,4 @@ class ReplOptionsTests extends munit.FunSuite {
     val buildOptions  = Repl.buildOptions0(replOptions, maxVersion, maxLtsVersion)
     expect(buildOptions.scalaOptions.scalaVersion.flatMap(_.versionOpt).contains(maxVersion))
   }
-
 }

modules/cli/src/test/scala/cli/commands/tests/RunOptionsTests.scala

@@ -6,7 +6,6 @@ import scala.cli.commands.run.{Run, RunOptions}
 import scala.cli.commands.shared.{SharedOptions, SharedPythonOptions}
 
 class RunOptionsTests extends munit.FunSuite {
-
   test("ScalaPy version") {
     val ver        = "X.Y.Z"
     val runOptions = RunOptions(
@@ -51,5 +50,4 @@ class RunOptionsTests extends munit.FunSuite {
     expect(toolkitDep.name == "toolkit")
     expect(toolkitDep.version == "latest.release")
   }
-
 }

modules/cli/src/test/scala/cli/tests/ArgSplitterTest.scala

@@ -12,5 +12,4 @@ class ArgSplitterTest extends TestUtil.ScalaCliSuite {
     val input = args.map(_.mkString("   ", " ", "")).mkString(" ", "\n", "")
     assertEquals(ArgSplitter.splitToArgs(input), args.flatten)
   }
-
 }

modules/cli/src/test/scala/cli/tests/LauncherCliTest.scala

@@ -8,7 +8,6 @@ import scala.cli.commands.shared.CoursierOptions
 import scala.cli.launcher.LauncherCli
 
 class LauncherCliTest extends TestUtil.ScalaCliSuite {
-
   test("resolve nightly version".flaky) {
     val logger          = TestLogger()
     val cache           = CoursierOptions().coursierCache(logger.coursierLogger(""))
@@ -19,7 +18,7 @@ class LauncherCliTest extends TestUtil.ScalaCliSuite {
     expect(nightlyCliVersion.endsWith("-SNAPSHOT"))
   }
 
-  val expectedScalaCliVersions = Seq(
+  val expectedScalaCliVersions: Seq[(String, String)] = Seq(
     "0.1.2"                       -> Constants.defaultScala212Version,
     "0.1.1+43-g15666b67-SNAPSHOT" -> Constants.defaultScala212Version,
     "0.1.3"                       -> Constants.defaultScala213Version,
@@ -29,8 +28,6 @@ class LauncherCliTest extends TestUtil.ScalaCliSuite {
   for ((cliVersion, expectedScalaVersion) <- expectedScalaCliVersions)
     test(s"use expected scala version for Scala CLI launcher: $cliVersion") {
       val scalaVersion = LauncherCli.scalaCliScalaVersion(cliVersion)
-
       expect(scalaVersion == expectedScalaVersion)
     }
-
 }

modules/cli/src/test/scala/cli/tests/OptionsCheck.scala

@@ -6,10 +6,7 @@ import scala.cli.ScalaCliCommands
 import scala.cli.commands.shared.HasGlobalOptions
 
 class OptionsCheck extends TestUtil.ScalaCliSuite {
-  for (
-    command <-
-      new ScalaCliCommands("scala-cli", "scala-cli", "Scala CLI").commands
-  )
+  for (command <- new ScalaCliCommands("scala-cli", "scala-cli", "Scala CLI").commands)
     test(s"No duplicated options in ${command.names.head.mkString(" ")}") {
       command.ensureNoDuplicates()
     }