Added semantic error message when method is same, receiver is same cl…

…ass but different object.
kosi-libs · Jul 12, 2022 · 54bee37 · 54bee37
1 parent c1353a0
commit 54bee37
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,5 +7,5 @@ val kspVersion by extra { "1.7.0-1.0.6" }
 
 allprojects {
     group = "org.kodein.mock"
-    version = "1.8.0"
+    version = "1.8.1"
 }
diff --git a/mockmp-runtime/src/commonMain/kotlin/org/kodein/mock/Mocker.kt b/mockmp-runtime/src/commonMain/kotlin/org/kodein/mock/Mocker.kt
@@ -53,8 +53,14 @@ public class Mocker {
                 val call = if (mode.exhaustive && mode.inOrder) {
                     val call = calls.removeFirstOrNull()
                         ?: throw MockerVerificationLazyAssertionError { "Expected a call to ${methodName(receiver, method)} but call list was empty" }
-                    if (method != call.method || receiver !== call.receiver)
+                    if (method != call.method)
                         throw MockerVerificationLazyAssertionError { "Expected a call to ${methodName(receiver, method)}, but was a call to ${methodName(call.receiver, call.method)}" }
+                    if (receiver !== call.receiver) {
+                        if (receiver != null && call.receiver != null && receiver::class == call.receiver::class) {
+                            throw MockerVerificationLazyAssertionError { "Got a call to ${methodName(receiver, method)}, but expected a different ${receiver::class.simpleName} receiver" }
+                        }
+                        throw MockerVerificationLazyAssertionError { "Expected a call to ${methodName(receiver, method)}, but was a call to ${methodName(call.receiver, call.method)}" }
+                    }
                     if (constraints.size != call.arguments.size)
                         throw MockerVerificationLazyAssertionError { "Expected ${constraints.size} arguments to ${methodName(receiver, method)} but got ${call.arguments.size}" }
                     @Suppress("UNCHECKED_CAST")

diff --git a/tests/src/commonTest/kotlin/tests/VerificationTests.kt b/tests/src/commonTest/kotlin/tests/VerificationTests.kt
@@ -113,16 +113,19 @@ class VerificationTests {
         foo1.newString()
         foo2.newString()
 
+        var firstHalfPassed = false
         val ex = assertFailsWith<AssertionError> {
             mocker.verify(inOrder = true) {
                 foo1.doInt(42)
                 foo2.doInt(42)
+                firstHalfPassed = true
                 // Same method but different receiver order
                 foo2.newString()
                 foo1.newString()
             }
         }
-        assertEquals("Expected a call to MockFoo.newString(), but was a call to MockFoo.newString()", ex.message)
+        assertTrue(firstHalfPassed)
+        assertEquals("Got a call to MockFoo.newString(), but expected a different MockFoo receiver", ex.message)
     }
 
     @Test