diff --git a/mockk/common/src/main/kotlin/io/mockk/impl/recording/ChainedCallDetector.kt b/mockk/common/src/main/kotlin/io/mockk/impl/recording/ChainedCallDetector.kt index 94207bd5b..04028886c 100644 --- a/mockk/common/src/main/kotlin/io/mockk/impl/recording/ChainedCallDetector.kt +++ b/mockk/common/src/main/kotlin/io/mockk/impl/recording/ChainedCallDetector.kt @@ -19,7 +19,7 @@ class ChainedCallDetector(safeToString: SafeToString) { fun detect( callRounds: List, callN: Int, - matcherList: SignatureMatchersList + matchersList: SignatureMatchersList ) { val callInAllRounds = callRounds.map { it.calls[callN] } val zeroCall = callInAllRounds[0] @@ -51,7 +51,7 @@ class ChainedCallDetector(safeToString: SafeToString) { log.trace { "Signature for $nArgument argument of ${zeroCall.method.toStr()}: $signature" } - val matcherBySignature = matcherList.remove(signature) + val matcherBySignature = matchersList.remove(signature) return buildMatcher( nArgument == 0, @@ -84,7 +84,7 @@ class ChainedCallDetector(safeToString: SafeToString) { log.trace { "Signature for $nArgument/$nVarArg argument of ${zeroCall.method.toStr()}: $signature" } - val matcherBySignature = matcherList.remove(signature) + val matcherBySignature = matchersList.remove(signature) varArgMatchers.add( buildMatcher( nArgument == 0 && nVarArg == 0, diff --git a/mockk/common/src/main/kotlin/io/mockk/impl/recording/SignatureMatcherDetector.kt b/mockk/common/src/main/kotlin/io/mockk/impl/recording/SignatureMatcherDetector.kt index 1f124dbb3..c7f020733 100644 --- a/mockk/common/src/main/kotlin/io/mockk/impl/recording/SignatureMatcherDetector.kt +++ b/mockk/common/src/main/kotlin/io/mockk/impl/recording/SignatureMatcherDetector.kt @@ -45,7 +45,7 @@ class SignatureMatcherDetector( } } - val matcherList = SignatureMatchersList() + val matchersList = SignatureMatchersList() val allCompositeMatchers = mutableListOf>>() fun gatherMatchers() { @@ -59,10 +59,10 @@ class SignatureMatcherDetector( }) } - matcherList.add(signature, matcher) + matchersList.add(signature, matcher) } - log.trace { "Matcher list: $matcherList" } + log.trace { "Matcher list: $matchersList" } } @Suppress("UNCHECKED_CAST") @@ -77,7 +77,7 @@ class SignatureMatcherDetector( log.trace { "Signature for $nOp operand of $matcher composite matcher: $signature" } - matcherList.remove(signature) + matchersList.remove(signature) ?: ChainedCallDetector.eqOrNullMatcher(matcher.operandValues[nOp]) } as List>? } @@ -90,13 +90,13 @@ class SignatureMatcherDetector( repeat(nCalls) { callN -> val detector = chainedCallDetectorFactory() - detector.detect(callRounds, callN, matcherList) + detector.detect(callRounds, callN, matchersList) calls.add(detector.call) } processCompositeMatchers() - if (matcherList.isNotEmpty()) { - throw MockKException("Failed matching mocking signature for\n${callRounds[0].calls.joinToString("\n")}\nleft matchers: $matcherList") + if (matchersList.isNotEmpty()) { + throw MockKException("Failed matching mocking signature for\n${callRounds[0].calls.joinToString("\n")}\nleft matchers: $matchersList") } } } diff --git a/mockk/common/src/test/kotlin/io/mockk/impl/recording/ChainedCallDetectorTest.kt b/mockk/common/src/test/kotlin/io/mockk/impl/recording/ChainedCallDetectorTest.kt index 585d905fe..44601d89c 100644 --- a/mockk/common/src/test/kotlin/io/mockk/impl/recording/ChainedCallDetectorTest.kt +++ b/mockk/common/src/test/kotlin/io/mockk/impl/recording/ChainedCallDetectorTest.kt @@ -37,9 +37,9 @@ class ChainedCallDetectorTest { @Test fun givenTwoCallsRoundsWithOneCallOneArgWhenDetectCallsHappenThenOneCallWithArgIsReturned() { - val matcherMap = SignatureMatchersList() + val matchersList = SignatureMatchersList() - matcherMap.add(listOf(signedMatcher1.signature, signedMatcher2.signature), signedMatcher1.matcher) + matchersList.add(listOf(signedMatcher1.signature, signedMatcher2.signature), signedMatcher1.matcher) every { callRound1.calls } returns listOf(call1) every { callRound2.calls } returns listOf(call2) @@ -56,7 +56,7 @@ class ChainedCallDetectorTest { every { call1.method.varArgsArg } returns -1 every { call2.method.varArgsArg } returns -1 - detector.detect(listOf(callRound1, callRound2), 0, matcherMap) + detector.detect(listOf(callRound1, callRound2), 0, matchersList) assertEquals("abc", detector.call.matcher.method.name) assertEquals(listOf>(EqMatcher(5)), detector.call.matcher.args)