Preliminary Munit port

alleycats-tests/jvm/src/test/scala/alleycats/tests/TestSettings.scala

@@ -1,17 +1,14 @@
 package alleycats.tests
 
-import org.scalactic.anyvals.{PosInt, PosZDouble, PosZInt}
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.prop.Configuration
+import org.scalacheck.Test.Parameters
 
-trait TestSettings extends Configuration with Matchers {
+trait TestSettings {
 
-  lazy val checkConfiguration: PropertyCheckConfiguration =
-    PropertyCheckConfiguration(
-      minSuccessful = PosInt(50),
-      maxDiscardedFactor = PosZDouble(5.0),
-      minSize = PosZInt(0),
-      sizeRange = PosZInt(10),
-      workers = PosInt(1)
-    )
+  lazy val checkConfiguration: Parameters =
+    Parameters.default
+      .withMinSuccessfulTests(50)
+      .withMaxDiscardRatio(5.0f)
+      .withMaxSize(10)
+      .withMinSize(0)
+      .withWorkers(1)
 }

alleycats-tests/shared/src/test/scala/alleycats/tests/AlleycatsSuite.scala

@@ -3,29 +3,17 @@ package alleycats.tests
 import alleycats.std.MapInstances
 import cats._
 import cats.instances.all._
-import cats.tests.StrictCatsEquality
-import org.scalatest.funsuite.AnyFunSuiteLike
-import org.scalatestplus.scalacheck.ScalaCheckDrivenPropertyChecks
-import org.typelevel.discipline.scalatest.FunSuiteDiscipline
 import org.scalacheck.{Arbitrary, Gen}
 import org.scalacheck.Arbitrary.arbitrary
-import org.scalatest.matchers.should.Matchers
 import scala.util.{Failure, Success, Try}
+import org.scalacheck.Test.Parameters
 
 /**
  * An opinionated stack of traits to improve consistency and reduce
  * boilerplate in Alleycats tests. Derived from Cats.
  */
-trait AlleycatsSuite
-    extends AnyFunSuiteLike
-    with Matchers
-    with ScalaCheckDrivenPropertyChecks
-    with FunSuiteDiscipline
-    with TestSettings
-    with TestInstances
-    with StrictCatsEquality
-    with MapInstances {
-  implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
+trait AlleycatsSuite extends munit.DisciplineSuite with TestSettings with TestInstances with MapInstances {
+  implicit override def scalaCheckTestParameters: Parameters =
     checkConfiguration
 
   implicit def EqIterable[A: Eq]: Eq[Iterable[A]] = Eq.by(_.toList)

alleycats-tests/shared/src/test/scala/alleycats/tests/IterableTests.scala

@@ -9,18 +9,22 @@ class IterableTests extends AlleycatsSuite {
 
   test("foldLeft sum == sum") {
     val it = Iterable(1, 2, 3)
-    Foldable[Iterable].foldLeft(it, 0) {
-      case (b, a) => a + b
-    } shouldEqual (it.sum)
+    assertEquals(Foldable[Iterable].foldLeft(it, 0) {
+                   case (b, a) => a + b
+                 },
+                 it.sum
+    )
   }
 
   test("foldRight early termination") {
-    Foldable[Iterable]
-      .foldRight(Iterable(1, 2, 3), Eval.now("KO")) {
-        case (2, _) => Eval.now("OK")
-        case (a, b) => b
-      }
-      .value shouldEqual (Eval.now("OK").value)
+    assertEquals(Foldable[Iterable]
+                   .foldRight(Iterable(1, 2, 3), Eval.now("KO")) {
+                     case (2, _) => Eval.now("OK")
+                     case (a, b) => b
+                   }
+                   .value,
+                 Eval.now("OK").value
+    )
   }
 
   checkAll("Foldable[Iterable]", FoldableTests[Iterable].foldable[Int, Int])

binCompatTest/src/test/scala/catsBC/MimaExceptionsTest.scala

@@ -1,8 +1,8 @@
 package catsBC
 
-import org.scalatest.funsuite.AnyFunSuiteLike
+import munit.FunSuite
 
-class MimaExceptionsTest extends AnyFunSuiteLike {
+class MimaExceptionsTest extends FunSuite {
   test("is binary compatible") {
     MimaExceptions.isBinaryCompatible
   }

build.sbt

@@ -20,12 +20,12 @@ isTravisBuild in Global := sys.env.get("TRAVIS").isDefined
 
 val scalaCheckVersion = "1.14.3"
 
-val scalatestVersion = "3.2.0"
-val scalatestplusScalaCheckVersion = "3.2.0.0"
+val munitVersion = "0.7.10"
 
 val disciplineVersion = "1.0.2"
 
 val disciplineScalatestVersion = "2.0.0"
+val disciplineMunitVersion = "0.2.2"
 
 val kindProjectorVersion = "0.11.0"
 
@@ -68,6 +68,7 @@ lazy val commonSettings = commonScalaVersionSettings ++ Seq(
   Test / unmanagedSourceDirectories ++= scalaVersionSpecificFolders("test", baseDirectory.value, scalaVersion.value),
   resolvers ++= Seq(Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots")),
   parallelExecution in Test := false,
+  testFrameworks += new TestFramework("munit.Framework"),
   scalacOptions in (Compile, doc) := (scalacOptions in (Compile, doc)).value.filter(_ != "-Xfatal-warnings")
 ) ++ warnUnusedImport
 
@@ -126,6 +127,7 @@ lazy val commonJsSettings = Seq(
   jsEnv := new org.scalajs.jsenv.nodejs.NodeJSEnv(),
   // batch mode decreases the amount of memory needed to compile Scala.js code
   scalaJSLinkerConfig := scalaJSLinkerConfig.value.withBatchMode(isTravisBuild.value),
+  scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule)),
   // currently sbt-doctest doesn't work in JS builds
   // https://github.com/tkawachi/sbt-doctest/issues/52
   doctestGenTests := Seq.empty,
@@ -159,17 +161,10 @@ lazy val disciplineDependencies = Seq(
 
 lazy val testingDependencies = Seq(
   libraryDependencies ++= Seq(
-    "org.scalatest" %%% "scalatest-shouldmatchers" % scalatestVersion % Test,
-    "org.scalatest" %%% "scalatest-funsuite" % scalatestVersion % Test,
-    "org.scalatestplus" %%% "scalacheck-1-14" % scalatestplusScalaCheckVersion % Test
-  ),
-  libraryDependencies ++= Seq(
-    ("org.typelevel" %%% "discipline-scalatest" % disciplineScalatestVersion % Test)
+    "org.scalameta" %%% "munit-scalacheck" % munitVersion % Test,
+    "org.typelevel" %%% "discipline-munit" % disciplineMunitVersion % Test
   ).map(
-    _.exclude("org.scalatestplus", "scalacheck-1-14_2.13")
-      .exclude("org.scalactic", "scalactic_2.13")
-      .exclude("org.scalatest", "scalatest_2.13")
-      .withDottyCompat(scalaVersion.value)
+    _.withDottyCompat(scalaVersion.value)
   )
 )
 

docs/src/main/tut/typeclasses/lawtesting.md

@@ -80,12 +80,14 @@ object arbitraries {
 ```
 
 Now we can convert these `ScalaCheck` `Properties` into tests that the test framework can run.  [discipline](https://github.com/typelevel/discipline) provides a helper `checkAll` function that performs
-this conversion for two test frameworks: `ScalaTest` and `Specs2`.
+this conversion for three test frameworks: `ScalaTest`, `Specs2` and `MUnit`.
 
 * If you are using `Specs2`, extend your test class with `org.typelevel.discipline.specs2.Discipline` (provided by `discipline-specs2`).
 
 * If you are using `ScalaTest`, extend your test class with `org.typelevel.discipline.scalatest.FunSuiteDiscipline` (provided by `discipline-scalatest`) and `org.scalatest.funsuite.AnyFunSuiteLike`.
 
+* If you are using `MUnit`, extend your test class with `munit.DisciplineSuite` (provided by `discipline-munit`).
+
 * For other test frameworks, you need to resort to their integration with `ScalaCheck` to test
 the `ScalaCheck` `Properties` provided by `cats-laws`.
 
@@ -111,7 +113,7 @@ class TreeLawTests extends AnyFunSuite with FunSuiteDiscipline with Checkers {
 * `arbitraries._` imports the `Arbitrary[Tree[_]]` instances needed to check the laws.
 
 Alternatively, you can use the `CatsSuite` provided by [Cats-testkit-scalatest](https://github.com/typelevel/cats-testkit-scalatest),
-which is the same `CatsSuite` used in Cats to test all instances.
+which used to be what Cats used internally to test all instances.
 
 Now when we run `test` in our sbt console, ScalaCheck will test if the `Functor` laws hold for our `Tree` type.
 You should see something like this:
@@ -167,7 +169,7 @@ import org.typelevel.discipline.scalatest.FunSuiteDiscipline
 import arbitraries._
 
 class TreeLawTests extends AnyFunSuite with FunSuiteDiscipline with Checkers {
-  checkAll("Tree[Int].SemigroupLaws", SemigroupTests[Tree[Int]].semigroup)
   checkAll("Tree.FunctorLaws", FunctorTests[Tree].functor[Int, Int, String])
+  checkAll("Tree[Int].SemigroupLaws", SemigroupTests[Tree[Int]].semigroup)
 }
 ```

free/src/test/scala/cats/free/CofreeSuite.scala

@@ -9,6 +9,7 @@ import cats.laws.discipline.SemigroupalTests.Isomorphisms
 import cats.syntax.list._
 import cats.tests.{CatsSuite, Spooky}
 import org.scalacheck.{Arbitrary, Cogen, Gen}
+import cats.syntax.eq._
 
 class CofreeSuite extends CatsSuite {
 
@@ -32,7 +33,7 @@ class CofreeSuite extends CatsSuite {
   test("Cofree.unfold") {
     val unfoldedHundred: CofreeNel[Int] = Cofree.unfold[Option, Int](0)(i => if (i == 100) None else Some(i + 1))
     val nelUnfoldedHundred: NonEmptyList[Int] = NonEmptyList.fromListUnsafe(List.tabulate(101)(identity))
-    cofNelToNel(unfoldedHundred) should ===(nelUnfoldedHundred)
+    assert(cofNelToNel(unfoldedHundred) === nelUnfoldedHundred)
   }
 
   test("Cofree.ana") {
@@ -41,7 +42,7 @@ class CofreeSuite extends CatsSuite {
                                                                        _.head
       )
     val nelUnfoldedHundred: NonEmptyList[Int] = NonEmptyList.fromListUnsafe(List.tabulate(101)(identity))
-    cofNelToNel(anaHundred) should ===(nelUnfoldedHundred)
+    assert(cofNelToNel(anaHundred) === nelUnfoldedHundred)
   }
 
   test("Cofree.tailForced") {
@@ -50,9 +51,9 @@ class CofreeSuite extends CatsSuite {
       Cofree.unfold[Id, Int](spooky.counter) { _ =>
         spooky.increment(); spooky.counter
       }
-    spooky.counter should ===(0)
+    assert(spooky.counter === 0)
     incrementor.tailForced
-    spooky.counter should ===(1)
+    assert(spooky.counter === 1)
   }
 
   test("Cofree.forceTail") {
@@ -61,9 +62,9 @@ class CofreeSuite extends CatsSuite {
       Cofree.unfold[Id, Int](spooky.counter) { _ =>
         spooky.increment(); spooky.counter
       }
-    spooky.counter should ===(0)
+    assert(spooky.counter === 0)
     incrementor.forceTail
-    spooky.counter should ===(1)
+    assert(spooky.counter === 1)
   }
 
   test("Cofree.forceAll") {
@@ -77,9 +78,9 @@ class CofreeSuite extends CatsSuite {
           Some(spooky.counter)
         }
       )
-    spooky.counter should ===(0)
+    assert(spooky.counter === 0)
     incrementor.forceAll
-    spooky.counter should ===(5)
+    assert(spooky.counter === 5)
   }
 
   test("Cofree.mapBranchingRoot") {
@@ -88,7 +89,7 @@ class CofreeSuite extends CatsSuite {
       def apply[A](a: Option[A]): Option[A] = None
     })
     val nelUnfoldedOne: NonEmptyList[Int] = NonEmptyList.one(0)
-    cofNelToNel(withNoneRoot) should ===(nelUnfoldedOne)
+    assert(cofNelToNel(withNoneRoot) === nelUnfoldedOne)
   }
 
   val unfoldedHundred: Cofree[Option, Int] = Cofree.unfold[Option, Int](0)(i => if (i == 100) None else Some(i + 1))
@@ -97,8 +98,8 @@ class CofreeSuite extends CatsSuite {
     val toNelS = unfoldedHundred.mapBranchingS(toList)
     val toNelT = unfoldedHundred.mapBranchingT(toList)
     val nelUnfoldedOne: NonEmptyList[Int] = NonEmptyList.fromListUnsafe(List.tabulate(101)(identity))
-    cofRoseTreeToNel(toNelS) should ===(nelUnfoldedOne)
-    cofRoseTreeToNel(toNelT) should ===(nelUnfoldedOne)
+    assert(cofRoseTreeToNel(toNelS) === nelUnfoldedOne)
+    assert(cofRoseTreeToNel(toNelT) === nelUnfoldedOne)
   }
 
   val nelUnfoldedHundred: NonEmptyList[Int] = NonEmptyList.fromListUnsafe(List.tabulate(101)(identity))
@@ -110,7 +111,7 @@ class CofreeSuite extends CatsSuite {
           Eval.now(NonEmptyList(i, lb.fold[List[Int]](Nil)(_.toList)))
         )
         .value
-    cata should ===(nelUnfoldedHundred)
+    assert(cata === nelUnfoldedHundred)
   }
 
   test("Cofree.cata is stack-safe") {
@@ -121,7 +122,7 @@ class CofreeSuite extends CatsSuite {
         .cata[Option, Int, Int](unfolded)((i, lb) => Eval.now(lb.fold(0)(_ + i)))
         .value
 
-    cata should ===(sum)
+    assert(cata === sum)
   }
 
   test("Cofree.cataM") {
@@ -141,8 +142,8 @@ class CofreeSuite extends CatsSuite {
         )(folder)(inclusion)
         .value
         .value
-    cataHundred should ===(Some(nelUnfoldedHundred))
-    cataHundredOne should ===(None)
+    assert(cataHundred === Some(nelUnfoldedHundred))
+    assert(cataHundredOne === None)
   }
 
 }

free/src/test/scala/cats/free/ContravariantCoyonedaSuite.scala

@@ -7,6 +7,8 @@ import cats.kernel.Eq
 import cats.laws.discipline.{ContravariantTests, SerializableTests}
 import cats.tests.CatsSuite
 import org.scalacheck.{Arbitrary}
+import cats.syntax.eq._
+import org.scalacheck.Prop._
 
 class ContravariantCoyonedaSuite extends CatsSuite {
 

free/src/test/scala/cats/free/CoyonedaSuite.scala

@@ -7,6 +7,8 @@ import cats.kernel.Eq
 import cats.laws.discipline.{FunctorTests, SerializableTests}
 import cats.tests.CatsSuite
 import org.scalacheck.Arbitrary
+import cats.syntax.eq._
+import org.scalacheck.Prop._
 
 class CoyonedaSuite extends CatsSuite {
   implicit def coyonedaArbitrary[F[_]: Functor, A: Arbitrary](implicit F: Arbitrary[F[A]]): Arbitrary[Coyoneda[F, A]] =
@@ -22,15 +24,15 @@ class CoyonedaSuite extends CatsSuite {
 
   test("toYoneda and then toCoyoneda is identity") {
     forAll { (y: Coyoneda[Option, Int]) =>
-      y.toYoneda.toCoyoneda should ===(y)
+      assert(y === y.toYoneda.toCoyoneda)
     }
   }
 
   test("mapK and run is same as applying natural trans") {
     val nt = new FunctionK[Option, List] { def apply[A](a: Option[A]): List[A] = a.toList }
     val o = Option("hello")
     val c = Coyoneda.lift(o)
-    c.mapK(nt).run should ===(nt(o))
+    assert(c.mapK(nt).run === nt(o))
   }
 
   test("map order") {