Adjust tests to use the latest munit

VirtusLab · Jun 11, 2024 · bad6202 · bad6202
1 parent 237b324
commit bad6202
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/modules/docs-tests/src/test/scala/sclicheck/DocTests.scala b/modules/docs-tests/src/test/scala/sclicheck/DocTests.scala
@@ -1,6 +1,7 @@
 package sclicheck
 
 import java.util.concurrent.TimeUnit
+
 import scala.concurrent.duration.FiniteDuration
 
 class DocTests extends munit.FunSuite {

diff --git a/modules/integration/src/test/scala/scala/cli/integration/ScalaCliSuite.scala b/modules/integration/src/test/scala/scala/cli/integration/ScalaCliSuite.scala
@@ -1,7 +1,8 @@
 package scala.cli.integration
 
 import java.util.concurrent.TimeUnit
-import scala.concurrent.duration.FiniteDuration
+
+import scala.concurrent.duration.{Duration, FiniteDuration}
 
 abstract class ScalaCliSuite extends munit.FunSuite {
   val testStartEndLogger = new Fixture[Unit]("files") {
@@ -22,7 +23,7 @@ abstract class ScalaCliSuite extends munit.FunSuite {
     }
   }
 
-  override def munitTimeout = new FiniteDuration(120, TimeUnit.SECONDS)
+  override def munitTimeout: Duration = new FiniteDuration(120, TimeUnit.SECONDS)
 
   override def munitFixtures: List[Fixture[Unit]] = List(testStartEndLogger)
   def group: ScalaCliSuite.TestGroup              = ScalaCliSuite.TestGroup.Third

diff --git a/modules/integration/src/test/scala/scala/cli/integration/TestTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/TestTestDefinitions.scala
@@ -3,6 +3,7 @@ package scala.cli.integration
 import com.eed3si9n.expecty.Expecty.expect
 
 import scala.annotation.tailrec
+import scala.cli.integration.Constants.munitVersion
 
 abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionArgs {
   _: TestScalaVersion =>
@@ -13,7 +14,6 @@ abstract class TestTestDefinitions extends ScalaCliSuite with TestScalaVersionAr
   protected lazy val baseExtraOptions: Seq[String] = TestUtil.extraOptions ++ jvmOptions
   private lazy val extraOptions: Seq[String]       = scalaVersionArgs ++ baseExtraOptions
 
-  private val munitVersion = "1.0.0-M12"
   private val utestVersion = "0.8.3"
 
   def successfulTestInputs(directivesString: String =