Merge pull request #529 from Jeibniz/Issue-315-Allow-combine-SpyK-Inj…

…ectMockKs

Issue 315: Allow to combine @spyk with @InjectMockKs

mockk/common/src/test/kotlin/io/mockk/it/AnnotationsTest.kt

@@ -86,6 +86,14 @@ class AnnotationsTest {
         val obj = MockCls()
     }
 
+    class InjectionTarget4{
+        lateinit var obj: MockCls
+        fun op(a: Int): Int {
+            return obj.op(a)
+        }
+
+    }
+
     class InjectSourceCls {
         @MockK
         lateinit var mock: MockCls
@@ -112,4 +120,25 @@ class AnnotationsTest {
         assertSame(source.mock, source.target2.obj)
         assertSame(source.mock, source.target3.obj)
     }
+
+    class InjectIntoSpySourceCls {
+        @MockK
+        lateinit var mock: MockCls
+
+        @InjectMockKs
+        @SpyK
+        lateinit var target4: InjectionTarget4
+    }
+
+    @Test
+    fun injectIntoSpy() {
+        val callValue = 5
+        val source = InjectIntoSpySourceCls()
+        MockKAnnotations.init(source)
+
+        every { source.mock.op(any()) } returns callValue
+        assertNotNull(source.target4)
+        assertEquals(callValue, source.target4.op(0))
+        verify { source.target4.op(any()) }
+    }
 }

mockk/jvm/src/main/kotlin/io/mockk/impl/annotations/JvmMockInitializer.kt

@@ -45,11 +45,14 @@ class JvmMockInitializer(val gateway: MockKGateway) : MockKGateway.MockInitializ
                 relaxed
             )
             assignRelaxedMockK(property, target)
-            assignSpyK(
-                property,
-                target,
-                overrideRecordPrivateCalls
-            )
+
+            if (!isAnnotatedWith<InjectMockKs>(property)) {
+                assignSpyK(
+                    property,
+                    target,
+                    overrideRecordPrivateCalls
+                )
+            }
         }
 
         for (property in cls.memberProperties) {
@@ -62,8 +65,8 @@ class JvmMockInitializer(val gateway: MockKGateway) : MockKGateway.MockInitializ
                     annotation.injectImmutable,
                     annotation.overrideValues
                 )
-
-                doInjection(property, target, mockInjector)
+                val instance = doInjection(property, target, mockInjector)
+                convertSpyKAnnotatedToSpy(property, instance, overrideRecordPrivateCalls)
             }
             property.annotated<OverrideMockKs>(target) { annotation ->
                 val mockInjector = MockInjector(
@@ -99,25 +102,38 @@ class JvmMockInitializer(val gateway: MockKGateway) : MockKGateway.MockInitializ
         }
     }
 
+    private fun convertSpyKAnnotatedToSpy(property: KProperty1<Any, Any>, instance: Any, overrideRecordPrivateCalls: Boolean): Any {
+        val spyAnnotation = property.findAnnotation<SpyK>() ?: return instance
+        return createSpyK(property, spyAnnotation, instance, overrideRecordPrivateCalls)
+    }
+
     private fun assignSpyK(
         property: KProperty1<Any, Any>,
         target: Any,
         overrideRecordPrivateCalls: Boolean
     ) {
         property.annotated<SpyK>(target) { annotation ->
             val obj = property.get(target)
-
-            gateway.mockFactory.spyk(
-                null,
-                obj,
-                overrideName(annotation.name, property.name),
-                moreInterfaces(property),
-                annotation.recordPrivateCalls
-                        || overrideRecordPrivateCalls
-            )
+            createSpyK(property, annotation, obj, overrideRecordPrivateCalls)
         }
     }
 
+    private fun createSpyK(
+        property: KProperty1<Any, Any>,
+        spyAnnotation: SpyK,
+        instance: Any,
+        overrideRecordPrivateCalls: Boolean
+    ): Any {
+        return gateway.mockFactory.spyk(
+            null,
+            instance,
+            overrideName(spyAnnotation.name, property.name),
+            moreInterfaces(property),
+            spyAnnotation.recordPrivateCalls
+                    || overrideRecordPrivateCalls
+        )
+    }
+
     private fun assignRelaxedMockK(property: KProperty1<Any, Any>, target: Any) {
         property.annotated<RelaxedMockK>(target) { annotation ->
             val type = property.returnType.classifier as? KClass<*>
@@ -205,6 +221,11 @@ class JvmMockInitializer(val gateway: MockKGateway) : MockKGateway.MockInitializ
         }
     }
 
+    private inline fun <reified T : Annotation>  isAnnotatedWith(property: KProperty<*>) : Boolean {
+        val annotation = property.findAnnotation<T>()
+        return null != annotation
+    }
+
     companion object {
         private fun moreInterfaces(property: KProperty1<out Any, Any?>) =
             property.annotations