Merge pull request #38 from jatcwang/munit_1.0.1

Upgrade to munit 1.0.1
jatcwang · Aug 31, 2024 · 5a45842 · 5a45842
2 parents 1a77c27 + 8e3a27b
commit 5a45842
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 19 deletions.
diff --git a/build.sbt b/build.sbt
@@ -3,8 +3,8 @@ import sbtghactions.JavaSpec
 import complete.DefaultParsers._
 import sbt.Reference.display
 
-val munitVersion = "0.7.29" // Upgrading to 1.0.1 seems to break Scala 3 DifferAutoDerivationSpec.scala..
-val munitScalacheckVersion = "0.7.29"
+val munitVersion = "1.0.1"
+val munitScalacheckVersion = "1.0.0"
 val catsVersion = "2.12.0"
 val scalatestVersion = "3.2.19"
 val weaverVersion = "0.8.4"

diff --git a/modules/coretest/src/test/scala-3/difflicious/DifferAutoDerivationSpec.scala b/modules/coretest/src/test/scala-3/difflicious/DifferAutoDerivationSpec.scala
@@ -1,10 +1,12 @@
 package difflicioustest
 
 import munit.ScalaCheckSuite
+import DifferAutoDerivationSpec.P1
 
 class DifferAutoDerivationSpec extends ScalaCheckSuite {
   test("should not compile without instance in scope") {
-    val result = compileErrors("""
+    val result = compileErrors(
+      """
         import difflicious._
         final case class P1(f1: String)
         
@@ -14,35 +16,28 @@ class DifferAutoDerivationSpec extends ScalaCheckSuite {
         """)
     assertNoDiff(
       result,
-      """error:
-        |No given instance of type difflicious.Differ[P1] was found for parameter differ of method apply in object Differ
-        |
-        |The following import might fix the problem:
-        |
-        |  import difflicious.generic.auto.autoDerived
-        |
+      """error: No given instance of type difflicious.Differ[P1] was found for parameter differ of method apply in object Differ
         |        Differ[P1].diff(P1("a"), P1("b"))
         |                 ^
         |""".stripMargin
     )
   }
   test("should find auto derived instance for product") {
-    val result = compileErrors("""
+    val result = compileErrors(
+      """
         import difflicious._
         import difflicious.generic.auto.given
-
-        final case class P1(f1: String)
         
         Differ[P1].diff(P1("a"), P1("b"))
         """)
     assertNoDiff(result, "")
   }
   test("should put auto derived instance back into scope") {
-    val result = compileErrors("""
+    val result = compileErrors(
+      """
         import difflicious._
         import difflicious.generic.auto.given
 
-        final case class P1(f1: String)
         implicit val d: Differ[P1] = implicitly[Derived[P1]].differ
         
         Differ[P1].diff(P1("a"), P1("b"))
@@ -54,11 +49,15 @@ class DifferAutoDerivationSpec extends ScalaCheckSuite {
     import difflicious.generic.auto._
     import difflicious.generic.auto.given
 
-    final case class P1(f1: String, f2: String)
-    final case class P2(p1: P1)
-    implicit val d: Differ[P1] = implicitly[Derived[P1]].differ.ignoreAt(_.f1)
+    final case class Pi(f1: String, f2: String)
+    final case class P2(p1: Pi)
+    implicit val d: Differ[Pi] = implicitly[Derived[Pi]].differ.ignoreAt(_.f1)
 
-    val r = Differ[P2].diff(P2(P1("a", "a")), P2(P1("b", "a")))
+    val r = Differ[P2].diff(P2(Pi("a", "a")), P2(Pi("b", "a")))
     assertEquals(r.isOk, true)
   }
 }
+
+object DifferAutoDerivationSpec {
+  final case class P1(f1: String)
+}