Update kotest and replace ComparableMatcherResult with ComparisonMatcherResult (#114)

Author: mjaggard

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ jmh = "1.37"
 jmhreport = "0.9.6"
 junit = "5.11.4"
 junit-platform-launcher = "1.9.3"
-kotest = "5.6.2"
+kotest = "6.0.7"
 kotlin = "2.2.21"
 kotlinx-benchmark = "0.4.14"
 kotlinx-coroutines = "1.10.2"

result4k/kotest/src/main/kotlin/dev/forkhandles/result4k/kotest/matchers.kt

@@ -3,7 +3,8 @@ package dev.forkhandles.result4k.kotest
 import dev.forkhandles.result4k.Failure
 import dev.forkhandles.result4k.Result
 import dev.forkhandles.result4k.Success
-import io.kotest.matchers.ComparableMatcherResult
+import io.kotest.assertions.print.Printed
+import io.kotest.matchers.ComparisonMatcherResult
 import io.kotest.matchers.Matcher
 import io.kotest.matchers.MatcherResult
 import io.kotest.matchers.should
@@ -62,24 +63,24 @@ infix fun <E> Result<*, E>.shouldBeFailure(expected: E) =
 private fun <T, E> Result<T, E>.matchesValue(actual: Result<T, E>): MatcherResult =
     matcherResultWithIntelliJDiff(
         passed = this == actual,
-        actual = actual.toString(),
-        expected = this.toString()
+        actual = Printed(actual.toString()),
+        expected = Printed(this.toString())
     )
 
 private fun <T, E, C : Result<T, E>> Result<T, E>.matchesType(expected: KClass<C>): MatcherResult =
     matcherResultWithIntelliJDiff(
         passed = expected.isInstance(this),
-        actual = this.toString(),
-        expected = expected.simpleName!!
+        actual = Printed(this.toString()),
+        expected = Printed(expected.simpleName!!)
     )
 
 /**
- * Return ComparableMatcherResult so that Kotest throws AssertFailedError
+ * Return ComparisonMatcherResult so that Kotest throws AssertFailedError
  * with the failure message formatted by io.kotest.assertions.intellijFormatError()
  * which makes IntelliJ show the link to the diff window.
  */
-private fun matcherResultWithIntelliJDiff(passed: Boolean, actual: String, expected: String) =
-    ComparableMatcherResult(
+private fun matcherResultWithIntelliJDiff(passed: Boolean, actual: Printed, expected: Printed) =
+    ComparisonMatcherResult(
         passed = passed,
         failureMessageFn = { "" },
         negatedFailureMessageFn = { "not " },

result4k/kotest/src/test/kotlin/dev/forkhandles/result4k/kotest/MatchersTest.kt

@@ -41,13 +41,13 @@ class MatchersTest {
         val value = "Test successful"
         val success = Success(value)
 
-        throwsAssertionError("expected:<Failure> but was:<Success(value=Test successful)>") {
+        throwsAssertionError("\nexpected:<Failure> but was:<Success(value=Test successful)>") {
             success.shouldBeFailure()
         }
-        throwsAssertionError("expected:<Failure> but was:<Success(value=Test successful)>") {
+        throwsAssertionError("\nexpected:<Failure> but was:<Success(value=Test successful)>") {
             success.shouldBeFailure { }
         }
-        throwsAssertionError("expected:<Failure(reason=Test successful)> but was:<Success(value=Test successful)>") {
+        throwsAssertionError("\nexpected:<Failure(reason=Test successful)> but was:<Success(value=Test successful)>") {
             success shouldBeFailure value
         }
     }
@@ -57,23 +57,23 @@ class MatchersTest {
         val reason = "Test failed"
         val failure = Failure(reason)
 
-        throwsAssertionError("expected:<Success> but was:<Failure(reason=Test failed)>") {
+        throwsAssertionError("\nexpected:<Success> but was:<Failure(reason=Test failed)>") {
             failure.shouldBeSuccess()
         }
-        throwsAssertionError("expected:<Success> but was:<Failure(reason=Test failed)>") {
+        throwsAssertionError("\nexpected:<Success> but was:<Failure(reason=Test failed)>") {
             failure.shouldBeSuccess { }
         }
-        throwsAssertionError("expected:<Success(value=Test failed)> but was:<Failure(reason=Test failed)>") {
+        throwsAssertionError("\nexpected:<Success(value=Test failed)> but was:<Failure(reason=Test failed)>") {
             failure shouldBeSuccess reason
         }
     }
 
     @Test
     fun `should correctly assert value`() {
-        throwsAssertionError("expected:<Failure(reason=Expected value)> but was:<Failure(reason=Actual value)>") {
+        throwsAssertionError("\nexpected:<Failure(reason=Expected value)> but was:<Failure(reason=Actual value)>") {
             Failure("Actual value") shouldBeFailure "Expected value"
         }
-        throwsAssertionError("expected:<Success(value=Expected value)> but was:<Success(value=Actual value)>") {
+        throwsAssertionError("\nexpected:<Success(value=Expected value)> but was:<Success(value=Actual value)>") {
             Success("Actual value") shouldBeSuccess "Expected value"
         }
     }