support mock invoke by interface instance

demo/java-demo/src/main/java/com/alibaba/testable/demo/BlackBox.java

@@ -1,14 +1,19 @@
 package com.alibaba.testable.demo;
 
-public class BlackBox {
+public class BlackBox implements Box {
 
     private String data;
 
+    @Override
+    public void put(String something) {
+        data = something;
+    }
+
     public BlackBox(String data) {
         this.data = data;
     }
 
-    public String callMe() {
+    public String get() {
         return data;
     }
 

demo/java-demo/src/main/java/com/alibaba/testable/demo/Box.java

@@ -0,0 +1,7 @@
+package com.alibaba.testable.demo;
+
+public interface Box {
+
+    void put(String something);
+
+}

demo/java-demo/src/main/java/com/alibaba/testable/demo/DemoService.java

@@ -30,7 +30,7 @@ public class DemoService {
      */
     public String newFunc() {
         BlackBox component = new BlackBox("something");
-        return component.callMe();
+        return component.get();
     }
 
     /**
@@ -54,6 +54,18 @@ public class DemoService {
         return BlackBox.secretBox();
     }
 
+    /**
+     * Target 7 - method with override method invoke
+     */
+    public Box putBox() {
+        Box box = new BlackBox("");
+        box.put("data");
+        return box;
+    }
+
+    /**
+     * Target 8 - two methods invoke same private method
+     */
     public String callerOne() {
         return callFromDifferentMethod();
     }

demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoServiceTest.java

@@ -43,6 +43,11 @@ class DemoServiceTest {
         return new BlackBox("not_secret_box");
     }
 
+    @TestableMock
+    private void put(Box self, String something) {
+        self.put("put_" + something + "_mocked");
+    }
+
     @TestableMock
     private String callFromDifferentMethod(DemoService self) {
         if (TEST_CASE.equals("should_able_to_get_test_case_name")) {
@@ -93,10 +98,17 @@ class DemoServiceTest {
 
     @Test
     void should_able_to_mock_static_method() throws Exception {
-        assertEquals("not_secret_box", demoService.getBox().callMe());
+        assertEquals("not_secret_box", demoService.getBox().get());
         verify("secretBox").times(1);
     }
 
+    @Test
+    void should_able_to_mock_override_method() throws Exception {
+        BlackBox box = (BlackBox)demoService.putBox();
+        verify("put").times(1);
+        assertEquals("put_data_mocked", box.get());
+    }
+
     @Test
     void should_able_to_get_source_method_name() throws Exception {
         // synchronous

demo/kotlin-demo/src/main/kotlin/com/alibaba/testable/demo/BlackBox.kt

@@ -1,9 +1,13 @@
 package com.alibaba.testable.demo
 
 
-class BlackBox(private val data: String) {
+class BlackBox(private var data: String) : Box {
 
-    fun callMe(): String {
+    override fun put(something: String) {
+        data = something
+    }
+
+    fun get(): String {
         return data
     }
 
@@ -29,6 +33,6 @@ class BlackBox(private val data: String) {
 
 object ColorBox {
     fun createBox(color: String, box: BlackBox): BlackBox {
-        return BlackBox("${color}_${box.callMe()}")
+        return BlackBox("${color}_${box.get()}")
     }
 }

demo/kotlin-demo/src/main/kotlin/com/alibaba/testable/demo/Box.kt

@@ -0,0 +1,7 @@
+package com.alibaba.testable.demo
+
+interface Box {
+
+    fun put(something: String)
+
+}

demo/kotlin-demo/src/main/kotlin/com/alibaba/testable/demo/DemoService.kt

@@ -29,7 +29,7 @@ class DemoService {
      * Target 3 - method with new operation
      */
     fun newFunc(): String {
-        return BlackBox("something").callMe()
+        return BlackBox("something").get()
     }
 
     /**
@@ -54,6 +54,18 @@ class DemoService {
         return ColorBox.createBox("Red", BlackBox.secretBox())
     }
 
+    /**
+     * Target 7 - method with override method invoke
+     */
+    fun putBox(): Box {
+        val box: Box = BlackBox("")
+        box.put("data")
+        return box
+    }
+
+    /**
+     * Target 8 - two methods invoke same private method
+     */
     fun callerOne(): String {
         return callFromDifferentMethod()
     }

demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoServiceTest.kt

@@ -34,7 +34,12 @@ internal class DemoServiceTest {
 
     @TestableMock
     private fun createBox(ignore: ColorBox, color: String, box: BlackBox): BlackBox {
-        return BlackBox("White_${box.callMe()}")
+        return BlackBox("White_${box.get()}")
+    }
+
+    @TestableMock
+    private fun put(self: Box, something: String) {
+        self.put("put_" + something + "_mocked")
     }
 
     @TestableMock
@@ -85,11 +90,18 @@ internal class DemoServiceTest {
 
     @Test
     fun should_able_to_mock_static_method() {
-        assertEquals("White_not_secret_box", demoService.getBox().callMe())
+        assertEquals("White_not_secret_box", demoService.getBox().get())
         verify("secretBox").times(1)
         verify("createBox").times(1)
     }
 
+    @Test
+    fun should_able_to_mock_override_method() {
+        val box = demoService.putBox() as BlackBox
+        verify("put").times(1)
+        assertEquals("put_data_mocked", box.get())
+    }
+
     @Test
     fun should_able_to_get_source_method_name() {
         // synchronous

testable-agent/src/main/java/com/alibaba/testable/agent/handler/SourceClassHandler.java

@@ -19,9 +19,10 @@ public class SourceClassHandler extends BaseClassHandler {
 
     private final List<MethodInfo> injectMethods;
     private final Set<Integer> invokeOps = new HashSet<Integer>() {{
-        add(Opcodes.INVOKESTATIC);
-        add(Opcodes.INVOKESPECIAL);
         add(Opcodes.INVOKEVIRTUAL);
+        add(Opcodes.INVOKESPECIAL);
+        add(Opcodes.INVOKESTATIC);
+        add(Opcodes.INVOKEINTERFACE);
     }};
 
     public SourceClassHandler(List<MethodInfo> injectMethods) {
@@ -58,7 +59,7 @@ public class SourceClassHandler extends BaseClassHandler {
                 MethodInsnNode node = (MethodInsnNode)instructions[i];
                 String memberInjectMethodName = getMemberInjectMethodName(memberInjectMethodList, node);
                 if (memberInjectMethodName != null) {
-                    // it's a member method and an inject method for it exist
+                    // it's a member or static method and an inject method for it exist
                     int rangeStart = getMemberMethodStart(instructions, i);
                     if (rangeStart >= 0) {
                         instructions = replaceMemberCallOps(cn, mn, memberInjectMethodName, instructions,
@@ -119,11 +120,11 @@ public class SourceClassHandler extends BaseClassHandler {
         int stackLevel = ClassUtil.getParameterTypes(((MethodInsnNode)instructions[rangeEnd]).desc).size();
         for (int i = rangeEnd - 1; i >= 0; i--) {
             switch (instructions[i].getOpcode()) {
-                case Opcodes.INVOKEINTERFACE:
                 case Opcodes.INVOKEVIRTUAL:
                 case Opcodes.INVOKESPECIAL:
-                case Opcodes.INVOKEDYNAMIC:
                 case Opcodes.INVOKESTATIC:
+                case Opcodes.INVOKEINTERFACE:
+                case Opcodes.INVOKEDYNAMIC:
                     stackLevel += ClassUtil.getParameterTypes(((MethodInsnNode)instructions[i]).desc).size();
                     break;
                 case -1: