Upgrade to latest MUnit

scalameta · Jan 11, 2020 · 1ca7174 · 1ca7174
1 parent 100e0a7
commit 1ca7174
Show file tree

Hide file tree

Showing 53 changed files with 73 additions and 85 deletions.
diff --git a/build.sbt b/build.sbt
@@ -155,7 +155,7 @@ lazy val V = new {
   val mavenBloop = bloop
   val mdoc = "2.1.1"
   val scalafmt = "2.3.2"
-  val funsuite = "0.1.4"
+  val munit = "0.2.0"
   // List of supported Scala versions in SemanticDB. Needs to be manually updated
   // for every SemanticDB upgrade.
   def supportedScalaVersions =
@@ -336,7 +336,7 @@ lazy val input = project
 lazy val testSettings: Seq[Def.Setting[_]] = List(
   skip.in(publish) := true,
   fork := true,
-  testFrameworks := List(new TestFramework("funsuite.Framework"))
+  testFrameworks := List(new TestFramework("munit.Framework"))
 )
 
 lazy val mtest = project
@@ -347,7 +347,7 @@ lazy val mtest = project
     libraryDependencies ++= List(
       "io.get-coursier" %% "coursier" % V.coursier,
       "org.scalameta" %% "testkit" % V.scalameta,
-      "com.geirsson" %% "funsuite" % V.funsuite
+      "org.scalameta" %% "munit" % V.munit
     ),
     scalacOptions ++= crossSetting(
       scalaVersion.value,
@@ -403,7 +403,7 @@ lazy val unit = project
       "io.get-coursier" %% "coursier" % V.coursier, // for jars
       "org.scalameta" %% "testkit" % V.scalameta,
       "ch.epfl.scala" %% "bloop-config" % V.bloop,
-      "com.geirsson" %% "funsuite" % V.funsuite
+      "org.scalameta" %% "munit" % V.munit
     ),
     buildInfoPackage := "tests",
     resourceGenerators.in(Compile) += InputProperties.resourceGenerator(input),

diff --git a/tests/cross/src/main/scala/tests/BaseCompletionSuite.scala b/tests/cross/src/main/scala/tests/BaseCompletionSuite.scala
@@ -10,8 +10,8 @@ import scala.meta.internal.mtags.MtagsEnrichments._
 import scala.meta.pc.CancelToken
 import scala.collection.Seq
 import scala.meta.internal.metals.TextEdits
-import funsuite.TestOptions
-import funsuite.Location
+import munit.TestOptions
+import munit.Location
 
 abstract class BaseCompletionSuite extends BasePCSuite {
 

diff --git a/tests/cross/src/main/scala/tests/BasePCSuite.scala b/tests/cross/src/main/scala/tests/BasePCSuite.scala
@@ -25,7 +25,7 @@ import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import scala.collection.Seq
 import scala.meta.pc.PresentationCompiler
-import funsuite.TestOptions
+import munit.TestOptions
 
 abstract class BasePCSuite extends BaseSuite {
   def thisClasspath: Seq[Path] =
@@ -71,14 +71,14 @@ abstract class BasePCSuite extends BaseSuite {
     JdkSources().foreach(jdk => index.addSourceJar(jdk))
   }
 
-  override def funsuiteRunTest(options: TestOptions, body: => Any): Any = {
+  override def munitRunTest(options: TestOptions, body: => Any): Any = {
     // We are unable to infer the JDK jars on Appveyor
     // tests.BasePCSuite.indexJDK(BasePCSuite.scala:44)
     val testName =
       if (isCI && BuildInfo.scalaCompilerVersion != BuildInfoVersions.scala212)
         s"${BuildInfo.scalaCompilerVersion}-${options.name}"
       else options.name
-    super.funsuiteRunTest(
+    super.munitRunTest(
       options.copy(name = testName), {
         try {
           body

diff --git a/tests/cross/src/main/scala/tests/BaseSignatureHelpSuite.scala b/tests/cross/src/main/scala/tests/BaseSignatureHelpSuite.scala
@@ -2,7 +2,7 @@ package tests
 
 import scala.meta.internal.jdk.CollectionConverters._
 import scala.meta.internal.metals.CompilerOffsetParams
-import funsuite.Location
+import munit.Location
 
 abstract class BaseSignatureHelpSuite extends BasePCSuite {
   def checkDoc(

diff --git a/tests/cross/src/main/scala/tests/pc/BaseHoverSuite.scala b/tests/cross/src/main/scala/tests/pc/BaseHoverSuite.scala
@@ -5,7 +5,7 @@ import tests.RangeReplace
 import tests.TestHovers
 import scala.meta.internal.metals.CompilerOffsetParams
 import scala.meta.internal.mtags.MtagsEnrichments._
-import funsuite.Location
+import munit.Location
 
 abstract class BaseHoverSuite
     extends BasePCSuite

diff --git a/tests/cross/src/main/scala/tests/pc/BasePcDefinitionSuite.scala b/tests/cross/src/main/scala/tests/pc/BasePcDefinitionSuite.scala
@@ -7,7 +7,7 @@ import org.eclipse.{lsp4j => l}
 import scala.meta.internal.jdk.CollectionConverters._
 import scala.meta.internal.mtags.MtagsEnrichments._
 import scala.meta.internal.metals.TextEdits
-import funsuite.Location
+import munit.Location
 
 abstract class BasePcDefinitionSuite extends BasePCSuite {
   def check(

diff --git a/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala b/tests/cross/src/test/scala/tests/pc/AutoImportsSuite.scala
@@ -5,7 +5,7 @@ import scala.meta.pc.AutoImportsResult
 import scala.meta.internal.metals.CompilerOffsetParams
 import scala.meta.internal.jdk.CollectionConverters._
 import scala.meta.internal.metals.TextEdits
-import funsuite.Location
+import munit.Location
 
 class AutoImportsSuite extends BaseCodeActionSuite {
 

diff --git a/tests/cross/src/test/scala/tests/pc/CancelCompletionSuite.scala b/tests/cross/src/test/scala/tests/pc/CancelCompletionSuite.scala
@@ -10,7 +10,7 @@ import scala.meta.internal.metals.EmptyCancelToken
 import scala.meta.pc.CancelToken
 import tests.BaseCompletionSuite
 import scala.meta.internal.pc.InterruptException
-import funsuite.Location
+import munit.Location
 
 class CancelCompletionSuite extends BaseCompletionSuite {
 

diff --git a/tests/cross/src/test/scala/tests/pc/CompilerJobQueueSuite.scala b/tests/cross/src/test/scala/tests/pc/CompilerJobQueueSuite.scala
@@ -10,8 +10,6 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import scala.collection.mutable
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
-import funsuite.BeforeEach
-import funsuite.AfterEach
 
 class CompilerJobQueueSuite extends BaseSuite {
   var jobs: CompilerJobQueue = null

diff --git a/tests/cross/src/test/scala/tests/pc/InterruptPresentationCompilerSuite.scala b/tests/cross/src/test/scala/tests/pc/InterruptPresentationCompilerSuite.scala
@@ -13,8 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 import scala.meta.pc.PresentationCompiler
 import scala.meta.pc.OffsetParams
 import java.util.concurrent.atomic.AtomicReference
-import funsuite.BeforeEach
-import funsuite.Location
+import munit.Location
 
 class InterruptPresentationCompilerSuite extends BasePCSuite {
   class InterruptSymbolIndex

diff --git a/tests/cross/src/test/scala/tests/pc/PrettyPrintSuite.scala b/tests/cross/src/test/scala/tests/pc/PrettyPrintSuite.scala
@@ -1,7 +1,7 @@
 package tests.pc
 
 import tests.BaseCompletionSuite
-import funsuite.Location
+import munit.Location
 
 class PrettyPrintSuite extends BaseCompletionSuite {
 

diff --git a/tests/mtest/src/main/scala/tests/Assertions.scala b/tests/mtest/src/main/scala/tests/Assertions.scala
@@ -1,10 +1,10 @@
 package tests
 
-import funsuite.Location
+import munit.Location
 import scala.meta.io.AbsolutePath
 import scala.collection.JavaConverters._
 
-trait Assertions extends funsuite.Assertions {
+trait Assertions extends munit.Assertions {
 
   def unifiedDiff(expected: String, obtained: String): String = {
     def splitIntoLines(string: String): Seq[String] =
@@ -32,7 +32,7 @@ trait Assertions extends funsuite.Assertions {
       expected: String
   )(implicit loc: Location): Unit = {
     // FIXME(gabro): surface this in funsuite Assertions
-    funsuite.internal.Diffs.assertNoDiffOrPrintExpected(obtained, expected)
+    munit.Diffs.assertNoDiff(obtained, expected)
   }
 
   def assertNotEmpty(string: String)(implicit loc: Location): Unit = {

diff --git a/tests/mtest/src/main/scala/tests/BaseSuite.scala b/tests/mtest/src/main/scala/tests/BaseSuite.scala
@@ -7,15 +7,14 @@ import scala.meta.internal.metals.JdkSources
 import scala.meta.internal.mtags
 import scala.meta.internal.semver.SemVer
 import scala.util.Properties
-import funsuite.Test
-import funsuite.TestOptions
-import funsuite.Location
-import funsuite.FailException
-import funsuite.FlakyFailure
+import munit.TestOptions
+import munit.Location
+import munit.FailException
+import munit.TestValues.FlakyFailure
 import scala.reflect.ClassTag
 import scala.util.control.NonFatal
 
-class BaseSuite extends funsuite.FunSuite with Assertions {
+class BaseSuite extends munit.FunSuite with Assertions {
   def isJava8: Boolean =
     !Properties.isJavaAtLeast("9")
 
@@ -52,9 +51,9 @@ class BaseSuite extends funsuite.FunSuite with Assertions {
 
   def skipSuite: Boolean = false
 
-  override def funsuiteTests(): Seq[Test] = {
+  override def munitTests(): Seq[Test] = {
     if (skipSuite) Seq.empty
-    else super.funsuiteTests()
+    else super.munitTests()
   }
 
   def testAsync(

diff --git a/tests/slow/src/test/scala/tests/pants/PantsLspSuite.scala b/tests/slow/src/test/scala/tests/pants/PantsLspSuite.scala
@@ -11,8 +11,6 @@ import scala.meta.internal.metals.BuildInfo
 import java.nio.file.StandardOpenOption
 import scala.util.control.NonFatal
 import scala.sys.process._
-import funsuite.BeforeEach
-import funsuite.AfterEach
 
 class PantsLspSuite extends BaseImportSuite("pants") {
 

diff --git a/tests/unit/src/main/scala/tests/BaseCompletionLspSuite.scala b/tests/unit/src/main/scala/tests/BaseCompletionLspSuite.scala
@@ -3,7 +3,7 @@ package tests
 import org.eclipse.lsp4j.CompletionList
 import scala.concurrent.Future
 import scala.meta.internal.metals.TextEdits
-import funsuite.Location
+import munit.Location
 
 abstract class BaseCompletionLspSuite(name: String) extends BaseLspSuite(name) {
 

diff --git a/tests/unit/src/main/scala/tests/BaseDigestSuite.scala b/tests/unit/src/main/scala/tests/BaseDigestSuite.scala
@@ -3,7 +3,7 @@ package tests
 import scala.meta.io.AbsolutePath
 import scala.meta.internal.metals.RecursivelyDelete
 import scala.meta.internal.metals.UserConfiguration
-import funsuite.Location
+import munit.Location
 
 trait BaseDigestSuite extends BaseSuite {
 

diff --git a/tests/unit/src/main/scala/tests/BaseImportSuite.scala b/tests/unit/src/main/scala/tests/BaseImportSuite.scala
@@ -6,7 +6,7 @@ import scala.meta.internal.builds.BuildTool
 import scala.meta.internal.metals.Messages._
 import scala.meta.internal.metals.SlowTaskConfig
 import scala.meta.internal.metals.MetalsServerConfig
-import funsuite.Location
+import munit.Location
 
 abstract class BaseImportSuite(suiteName: String)
     extends BaseLspSuite(suiteName) {

diff --git a/tests/unit/src/main/scala/tests/BaseLspSuite.scala b/tests/unit/src/main/scala/tests/BaseLspSuite.scala
@@ -17,9 +17,8 @@ import scala.meta.internal.metals.UserConfiguration
 import scala.meta.io.AbsolutePath
 import scala.util.control.NonFatal
 import scala.meta.internal.metals.SlowTaskConfig
-import funsuite.BeforeEach
-import funsuite.Ignore
-import funsuite.Location
+import munit.Ignore
+import munit.Location
 
 /**
  * Full end to end integration tests against a full metals language server.

diff --git a/tests/unit/src/main/scala/tests/BaseWorkspaceSymbolSuite.scala b/tests/unit/src/main/scala/tests/BaseWorkspaceSymbolSuite.scala
@@ -4,7 +4,7 @@ import scala.meta.internal.metals.StatisticsConfig
 import scala.meta.internal.metals.WorkspaceSymbolProvider
 import scala.meta.io.AbsolutePath
 import tests.MetalsTestEnrichments._
-import funsuite.Location
+import munit.Location
 
 abstract class BaseWorkspaceSymbolSuite extends BaseSuite {
   def workspace: AbsolutePath

diff --git a/tests/unit/src/main/scala/tests/TestingServer.scala b/tests/unit/src/main/scala/tests/TestingServer.scala
@@ -197,7 +197,7 @@ final class TestingServer(
   }
 
   def assertReferenceDefinitionBijection()(
-      implicit loc: funsuite.Location
+      implicit loc: munit.Location
   ): Unit = {
     val compare = workspaceReferences()
     assert(compare.definition.nonEmpty)
@@ -209,7 +209,7 @@ final class TestingServer(
   }
   def assertReferenceDefinitionDiff(
       expectedDiff: String
-  )(implicit loc: funsuite.Location): Unit = {
+  )(implicit loc: munit.Location): Unit = {
     Assertions.assertNoDiffOrPrintObtained(
       workspaceReferences().diff,
       expectedDiff
@@ -454,7 +454,7 @@ final class TestingServer(
       expected: String,
       autoIndent: String,
       root: AbsolutePath = workspace
-  )(implicit loc: funsuite.Location): Future[Unit] = {
+  )(implicit loc: munit.Location): Future[Unit] = {
     for {
       (text, params) <- onTypeParams(filename, query, root, autoIndent)
       multiline <- server.onTypeFormatting(params).asScala
@@ -473,7 +473,7 @@ final class TestingServer(
       expected: String,
       paste: String,
       root: AbsolutePath = workspace
-  )(implicit loc: funsuite.Location): Future[Unit] = {
+  )(implicit loc: munit.Location): Future[Unit] = {
     for {
       (text, params) <- rangeFormattingParams(filename, query, paste, root)
       multiline <- server.rangeFormatting(params).asScala
@@ -628,7 +628,7 @@ final class TestingServer(
       query: String,
       expected: String,
       root: AbsolutePath = workspace
-  )(implicit loc: funsuite.Location): Future[Unit] = {
+  )(implicit loc: munit.Location): Future[Unit] = {
     for {
       hover <- hover(filename, query, root)
     } yield {
@@ -641,7 +641,7 @@ final class TestingServer(
       query: String,
       expected: String,
       root: AbsolutePath = workspace
-  )(implicit loc: funsuite.Location): Future[List[l.CodeAction]] =
+  )(implicit loc: munit.Location): Future[List[l.CodeAction]] =
     for {
       (codeActions, codeActionString) <- codeAction(filename, query, root)
     } yield {
@@ -693,7 +693,7 @@ final class TestingServer(
       query: String,
       expected: String,
       root: AbsolutePath = workspace
-  )(implicit loc: funsuite.Location): Future[Unit] = {
+  )(implicit loc: munit.Location): Future[Unit] = {
     for {
       highlight <- highlight(filename, query, root)
     } yield {
@@ -720,7 +720,7 @@ final class TestingServer(
       expected: Map[String, String],
       files: Set[String],
       newName: String
-  )(implicit loc: funsuite.Location): Future[Unit] = {
+  )(implicit loc: munit.Location): Future[Unit] = {
     for {
       renames <- rename(filename, query, files, newName)
     } yield {
@@ -803,7 +803,7 @@ final class TestingServer(
       query: String,
       expected: Map[String, String],
       base: Map[String, String]
-  )(implicit loc: funsuite.Location): Future[Unit] = {
+  )(implicit loc: munit.Location): Future[Unit] = {
     for {
       implementations <- implementation(filename, query, base)
     } yield {
@@ -1007,7 +1007,7 @@ final class TestingServer(
       filename: String,
       linePattern: String,
       isIgnored: String => Boolean = _ => true
-  )(implicit loc: funsuite.Location): String = {
+  )(implicit loc: munit.Location): String = {
     val path = toPath(filename)
     val line = path.toInput.value.linesIterator.zipWithIndex
       .collectFirst {
@@ -1053,7 +1053,7 @@ final class TestingServer(
   def assertTreeViewChildren(
       uri: String,
       expected: String
-  )(implicit loc: funsuite.Location): Unit = {
+  )(implicit loc: munit.Location): Unit = {
     val viewId: String = TreeViewProvider.Build
     val result =
       server.treeView.children(TreeViewChildrenParams(viewId, uri)).nodes

diff --git a/tests/unit/src/test/scala/tests/BaseTablesSuite.scala b/tests/unit/src/test/scala/tests/BaseTablesSuite.scala
@@ -6,8 +6,6 @@ import scala.meta.internal.metals.MetalsServerConfig
 import scala.meta.internal.metals.RecursivelyDelete
 import scala.meta.internal.metals.Tables
 import scala.meta.io.AbsolutePath
-import funsuite.AfterEach
-import funsuite.BeforeEach
 
 abstract class BaseTablesSuite extends BaseSuite {
   MetalsLogger.updateDefaultFormat()

diff --git a/tests/unit/src/test/scala/tests/CodeLensesLspSuite.scala b/tests/unit/src/test/scala/tests/CodeLensesLspSuite.scala
@@ -1,6 +1,6 @@
 package tests
 import scala.concurrent.Future
-import funsuite.Location
+import munit.Location
 
 class CodeLensesLspSuite extends BaseLspSuite("codeLenses") {
   check("empty-package")(

diff --git a/tests/unit/src/test/scala/tests/CompletionLspSuite.scala b/tests/unit/src/test/scala/tests/CompletionLspSuite.scala
@@ -2,7 +2,7 @@ package tests
 
 import scala.concurrent.Future
 import scala.meta.internal.metals.{BuildInfo => V}
-import funsuite.Location
+import munit.Location
 
 class CompletionLspSuite extends BaseCompletionLspSuite("completion") {
 

diff --git a/tests/unit/src/test/scala/tests/CompressionSuite.scala b/tests/unit/src/test/scala/tests/CompressionSuite.scala
@@ -2,7 +2,7 @@ package tests
 
 import scala.meta.internal.metals.Compression
 import scala.meta.internal.metals.ClassfileElementPart
-import funsuite.Location
+import munit.Location
 
 class CompressionSuite extends BaseSuite {
   def checkRoundtrip(a: String)(implicit loc: Location): Unit = {