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

@@ -45,7 +45,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 +54,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/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()
     }

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

@@ -1,9 +1,9 @@
 package cli.tests
 
+import bloop.rifle.BloopRifleConfig
 import com.eed3si9n.expecty.Expecty.expect
 
 import java.nio.file.FileSystems
-
 import scala.build.Ops.*
 import scala.build.options.{BuildOptions, InternalOptions, PackageType}
 import scala.build.tests.util.BloopServer
@@ -13,11 +13,11 @@ import scala.cli.commands.package0.Package
 import scala.cli.packaging.Library
 
 class PackageTests extends TestUtil.ScalaCliSuite {
-  val buildThreads = BuildThreads.create()
-  def bloopConfig  = BloopServer.bloopConfig
+  val buildThreads: BuildThreads    = BuildThreads.create()
+  def bloopConfig: BloopRifleConfig = BloopServer.bloopConfig
 
-  val extraRepoTmpDir = os.temp.dir(prefix = "scala-cli-tests-extra-repo-")
-  val directories     = Directories.under(extraRepoTmpDir)
+  val extraRepoTmpDir: os.Path = os.temp.dir(prefix = "scala-cli-tests-extra-repo-")
+  val directories: Directories = Directories.under(extraRepoTmpDir)
 
   val defaultOptions = BuildOptions(
     internal = InternalOptions(
@@ -92,5 +92,4 @@ class PackageTests extends TestUtil.ScalaCliSuite {
         expect(packageType == PackageType.Native.Application)
     }
   }
-
 }

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

@@ -2,10 +2,10 @@ package cli.tests
 
 import coursier.cache.{ArtifactError, FileCache}
 import coursier.util.{Artifact, Task}
+import munit.AnyFixture
 
 import java.io.File
 import java.util.concurrent.TimeUnit
-
 import scala.concurrent.duration.{DurationInt, FiniteDuration}
 import scala.util.control.NonFatal
 
@@ -23,7 +23,7 @@ object TestUtil {
 
     override def munitTimeout = new FiniteDuration(120, TimeUnit.SECONDS)
 
-    val testStartEndLogger = new Fixture[Unit]("files") {
+    val testStartEndLogger: Fixture[Unit] = new Fixture[Unit]("files") {
       def apply(): Unit = ()
 
       override def beforeEach(context: BeforeEach): Unit = {
@@ -41,7 +41,7 @@ object TestUtil {
       }
     }
 
-    override def munitFixtures = List(testStartEndLogger)
+    override def munitFixtures: Seq[AnyFixture[?]] = List(testStartEndLogger)
   }
 
   def downloadFile(url: String): Either[ArtifactError, Array[Byte]] = {

modules/options/src/test/scala/scala/build/options/ConfigMonoidTest.scala

@@ -51,6 +51,5 @@ class ConfigMonoidTest extends munit.FunSuite {
 
     assertEquals(Outer.monoid.orElse(outer1, outer2).name, Some("o1"))
     assertEquals(Outer.monoid.orElse(outer2, outer1).name, Some("o2"))
-
   }
 }