Merge pull request #1143 from k163377/fix-1139

Reduce the use of spread operator to improve performance
mockk · Sep 18, 2023 · f131526 · f131526
2 parents 5a811c7 + e45af83
commit f131526
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/modules/mockk-dsl/src/commonMain/kotlin/io/mockk/API.kt b/modules/mockk-dsl/src/commonMain/kotlin/io/mockk/API.kt
@@ -26,7 +26,7 @@ object MockKDsl {
     inline fun <reified T : Any> internalMockk(
         name: String? = null,
         relaxed: Boolean = false,
-        vararg moreInterfaces: KClass<*>,
+        moreInterfaces: Array<out KClass<*>>,
         relaxUnitFun: Boolean = false,
         block: T.() -> Unit = {}
     ): T {
@@ -47,7 +47,7 @@ object MockKDsl {
     inline fun <T : Any> internalSpyk(
         objToCopy: T,
         name: String? = null,
-        vararg moreInterfaces: KClass<*>,
+        moreInterfaces: Array<out KClass<*>>,
         recordPrivateCalls: Boolean = false,
         block: T.() -> Unit = {}
     ): T {
@@ -67,7 +67,7 @@ object MockKDsl {
      */
     inline fun <reified T : Any> internalSpyk(
         name: String? = null,
-        vararg moreInterfaces: KClass<*>,
+        moreInterfaces: Array<out KClass<*>>,
         recordPrivateCalls: Boolean = false,
         block: T.() -> Unit = {}
     ): T {
@@ -269,7 +269,7 @@ object MockKDsl {
     /**
      * Checks if all recorded calls were verified.
      */
-    fun internalConfirmVerified(vararg mocks: Any) {
+    fun internalConfirmVerified(mocks: Array<out Any>) {
         if (mocks.isEmpty()) {
             MockKGateway.implementation().verificationAcknowledger.acknowledgeVerified()
         }
@@ -282,7 +282,7 @@ object MockKDsl {
     /**
      * Checks if all recorded calls are necessary.
      */
-    fun internalCheckUnnecessaryStub(vararg mocks: Any) {
+    fun internalCheckUnnecessaryStub(mocks: Array<out Any>) {
         if (mocks.isEmpty()) {
             MockKGateway.implementation().verificationAcknowledger.checkUnnecessaryStub()
         }
@@ -297,7 +297,7 @@ object MockKDsl {
      */
     inline fun internalClearMocks(
         firstMock: Any,
-        vararg mocks: Any,
+        mocks: Array<out Any>,
         answers: Boolean = true,
         recordedCalls: Boolean = true,
         childMocks: Boolean = true,
@@ -354,7 +354,7 @@ object MockKDsl {
     /**
      * Declares static mockk. Deprecated
      */
-    inline fun internalStaticMockk(vararg kClass: KClass<out Any>) = MockKStaticScope(*kClass)
+    inline fun internalStaticMockk(kClass: Array<KClass<*>>) = MockKStaticScope(*kClass)
 
     /**
      * Declares object mockk. Deprecated
@@ -378,7 +378,7 @@ object MockKDsl {
         type: KClass<T>,
         name: String?,
         relaxed: Boolean,
-        vararg moreInterfaces: KClass<*>,
+        moreInterfaces: Array<out KClass<*>>,
         relaxUnitFun: Boolean = false,
         block: T.() -> Unit
     ): T {
@@ -406,13 +406,13 @@ object MockKDsl {
     /**
      * Object mockk
      */
-    inline fun internalMockkObject(vararg objects: Any, recordPrivateCalls: Boolean = false) {
+    inline fun internalMockkObject(objects: Array<out Any>, recordPrivateCalls: Boolean = false) {
         val factory = MockKGateway.implementation().objectMockFactory
 
         objects.forEach {
             val cancellation = factory.objectMockk(it, recordPrivateCalls)
 
-            internalClearMocks(it)
+            internalClearMocks(it, emptyArray())
 
             MockKCancellationRegistry
                 .subRegistry(MockKCancellationRegistry.Type.OBJECT)
@@ -424,7 +424,7 @@ object MockKDsl {
     /**
      * Cancel object mocks.
      */
-    inline fun internalUnmockkObject(vararg objects: Any) {
+    inline fun internalUnmockkObject(objects: Array<out Any>) {
         objects.forEach {
             MockKCancellationRegistry
                 .subRegistry(MockKCancellationRegistry.Type.OBJECT)
@@ -436,7 +436,7 @@ object MockKDsl {
      * Clear object mocks.
      */
     inline fun internalClearObjectMockk(
-        vararg objects: Any,
+        objects: Array<out Any>,
         answers: Boolean = true,
         recordedCalls: Boolean = true,
         childMocks: Boolean = true,
@@ -460,13 +460,13 @@ object MockKDsl {
     /**
      * Static mockk
      */
-    inline fun internalMockkStatic(vararg classes: KClass<*>) {
+    inline fun internalMockkStatic(classes: Array<out KClass<*>>) {
         val factory = MockKGateway.implementation().staticMockFactory
 
         classes.forEach {
             val cancellation = factory.staticMockk(it)
 
-            internalClearStaticMockk(it)
+            internalClearStaticMockk(arrayOf(it))
 
             MockKCancellationRegistry
                 .subRegistry(MockKCancellationRegistry.Type.STATIC)
@@ -477,7 +477,7 @@ object MockKDsl {
     /**
      * Cancel static mocks.
      */
-    inline fun internalUnmockkStatic(vararg classes: KClass<*>) {
+    inline fun internalUnmockkStatic(classes: Array<out KClass<*>>) {
         classes.forEach {
             MockKCancellationRegistry
                 .subRegistry(MockKCancellationRegistry.Type.STATIC)
@@ -489,7 +489,7 @@ object MockKDsl {
      * Clear static mocks.
      */
     inline fun internalClearStaticMockk(
-        vararg classes: KClass<*>,
+        classes: Array<out KClass<*>>,
         answers: Boolean = true,
         recordedCalls: Boolean = true,
         childMocks: Boolean = true,
@@ -514,7 +514,7 @@ object MockKDsl {
      * Constructor mockk
      */
     inline fun internalMockkConstructor(
-        vararg classes: KClass<*>,
+        classes: Array<out KClass<*>>,
         recordPrivateCalls: Boolean = false,
         localToThread: Boolean = true
     ) {
@@ -523,7 +523,7 @@ object MockKDsl {
         classes.forEach {
             val cancellation = factory.constructorMockk(it, recordPrivateCalls, localToThread)
 
-            internalClearConstructorMockk(it)
+            internalClearConstructorMockk(arrayOf(it))
 
             MockKCancellationRegistry
                 .subRegistry(MockKCancellationRegistry.Type.CONSTRUCTOR)
@@ -534,7 +534,7 @@ object MockKDsl {
     /**
      * Cancel constructor mocks.
      */
-    inline fun internalUnmockkConstructor(vararg classes: KClass<*>) {
+    inline fun internalUnmockkConstructor(classes: Array<out KClass<*>>) {
         classes.forEach {
             MockKGateway.implementation().constructorMockFactory.clear(
                 it,
@@ -556,7 +556,7 @@ object MockKDsl {
      * Clear constructor mocks.
      */
     inline fun internalClearConstructorMockk(
-        vararg classes: KClass<*>,
+        classes: Array<out KClass<*>>,
         answers: Boolean = true,
         recordedCalls: Boolean = true,
         childMocks: Boolean = true,

diff --git a/modules/mockk/src/commonMain/kotlin/io/mockk/MockK.kt b/modules/mockk/src/commonMain/kotlin/io/mockk/MockK.kt
@@ -42,7 +42,7 @@ inline fun <reified T : Any> mockk(
     MockKDsl.internalMockk(
         name,
         relaxed,
-        *moreInterfaces,
+        moreInterfaces,
         relaxUnitFun = relaxUnitFun,
         block = block
     )
@@ -67,7 +67,7 @@ inline fun <reified T : Any> spyk(
 ): T = MockK.useImpl {
     MockKDsl.internalSpyk(
         name,
-        *moreInterfaces,
+        moreInterfaces,
         recordPrivateCalls = recordPrivateCalls,
         block = block
     )
@@ -94,7 +94,7 @@ inline fun <reified T : Any> spyk(
     MockKDsl.internalSpyk(
         objToCopy,
         name,
-        *moreInterfaces,
+        moreInterfaces,
         recordPrivateCalls = recordPrivateCalls,
         block = block
     )
@@ -390,14 +390,14 @@ fun coExcludeRecords(
  * Checks if all recorded calls were verified.
  */
 fun confirmVerified(vararg mocks: Any) = MockK.useImpl {
-    MockKDsl.internalConfirmVerified(*mocks)
+    MockKDsl.internalConfirmVerified(mocks)
 }
 
 /**
  * Checks if all recorded calls are necessary.
  */
 fun checkUnnecessaryStub(vararg mocks: Any) = MockK.useImpl {
-    MockKDsl.internalCheckUnnecessaryStub(*mocks)
+    MockKDsl.internalCheckUnnecessaryStub(mocks)
 }
 
 /**
@@ -457,7 +457,7 @@ inline fun <T : Any> mockkClass(
         type,
         name,
         relaxed,
-        *moreInterfaces,
+        moreInterfaces,
         relaxUnitFun = relaxUnitFun,
         block = block
     )
@@ -479,14 +479,14 @@ inline fun <T : Any> mockkClass(
  * @see [unmockkObject] To manually cancel mock
  */
 inline fun mockkObject(vararg objects: Any, recordPrivateCalls: Boolean = false) = MockK.useImpl {
-    MockKDsl.internalMockkObject(*objects, recordPrivateCalls = recordPrivateCalls)
+    MockKDsl.internalMockkObject(objects, recordPrivateCalls = recordPrivateCalls)
 }
 
 /**
  * Cancel object mocks.
  */
 inline fun unmockkObject(vararg objects: Any) = MockK.useImpl {
-    MockKDsl.internalUnmockkObject(*objects)
+    MockKDsl.internalUnmockkObject(objects)
 }
 
 /**
@@ -507,7 +507,7 @@ inline fun mockkObject(vararg objects: Any, recordPrivateCalls: Boolean = false,
  * @see [unmockkStatic] To manually cancel mock
  */
 inline fun mockkStatic(vararg classes: KClass<*>) = MockK.useImpl {
-    MockKDsl.internalMockkStatic(*classes)
+    MockKDsl.internalMockkStatic(classes)
 }
 
 /**
@@ -516,7 +516,7 @@ inline fun mockkStatic(vararg classes: KClass<*>) = MockK.useImpl {
  * @see [unmockkStatic] To manually cancel mock
  */
 inline fun mockkStatic(vararg classes: String) = MockK.useImpl {
-    MockKDsl.internalMockkStatic(*classes.map { InternalPlatformDsl.classForName(it) as KClass<*> }.toTypedArray())
+    MockKDsl.internalMockkStatic(classes.map { InternalPlatformDsl.classForName(it) as KClass<*> }.toTypedArray())
 }
 
 /**
@@ -529,7 +529,7 @@ inline fun clearStaticMockk(
     childMocks: Boolean = true
 ) = MockK.useImpl {
     MockKDsl.internalClearStaticMockk(
-        *classes,
+        classes,
         answers = answers,
         recordedCalls = recordedCalls,
         childMocks = childMocks
@@ -540,14 +540,14 @@ inline fun clearStaticMockk(
  * Cancel static mocks.
  */
 inline fun unmockkStatic(vararg classes: KClass<*>) = MockK.useImpl {
-    MockKDsl.internalUnmockkStatic(*classes)
+    MockKDsl.internalUnmockkStatic(classes)
 }
 
 /**
  * Cancel static mocks.
  */
 inline fun unmockkStatic(vararg classes: String) = MockK.useImpl {
-    MockKDsl.internalUnmockkStatic(*classes.map { InternalPlatformDsl.classForName(it) as KClass<*> }.toTypedArray())
+    MockKDsl.internalUnmockkStatic(classes.map { InternalPlatformDsl.classForName(it) as KClass<*> }.toTypedArray())
 }
 
 /**
@@ -597,7 +597,7 @@ inline fun mockkConstructor(
     localToThread: Boolean = false
 ) = MockK.useImpl {
     MockKDsl.internalMockkConstructor(
-        *classes,
+        classes,
         recordPrivateCalls = recordPrivateCalls,
         localToThread = localToThread
     )
@@ -607,7 +607,7 @@ inline fun mockkConstructor(
  * Cancel constructor mocks.
  */
 inline fun unmockkConstructor(vararg classes: KClass<*>) = MockK.useImpl {
-    MockKDsl.internalUnmockkConstructor(*classes)
+    MockKDsl.internalUnmockkConstructor(classes)
 }
 
 /**
@@ -637,7 +637,7 @@ inline fun clearConstructorMockk(
     childMocks: Boolean = true
 ) = MockK.useImpl {
     MockKDsl.internalClearConstructorMockk(
-        *classes,
+        classes,
         answers = answers,
         recordedCalls = recordedCalls,
         childMocks = childMocks