Merge pull request #231 from HankDevelop/0.6

接口继承支持

demo/java-demo/src/main/java/com/alibaba/demo/basic/DemoInherit.java

@@ -59,4 +59,12 @@ public class DemoInherit {
         BlackBox box = new BlackBox("");
         return box.getColor();
     }
+
+    /**
+     * call method defined in interface via sub class variable
+     */
+    public String getColorIdxViaColor() {
+        Color color = new BlackBox("");
+        return color.getColorIndex();
+    }
 }

demo/java-demo/src/main/java/com/alibaba/demo/basic/model/mock/BasicColor.java

@@ -0,0 +1,7 @@
+package com.alibaba.demo.basic.model.mock;
+
+public interface BasicColor {
+
+    String getColorIndex();
+
+}

demo/java-demo/src/main/java/com/alibaba/demo/basic/model/mock/BlackBox.java

@@ -20,4 +20,8 @@ public class BlackBox extends Box implements Color {
         return "black";
     }
 
+    @Override
+    public String getColorIndex() {
+        return "idx";
+    }
 }

demo/java-demo/src/main/java/com/alibaba/demo/basic/model/mock/Color.java

@@ -1,6 +1,6 @@
 package com.alibaba.demo.basic.model.mock;
 
-public interface Color {
+public interface Color extends BasicColor{
 
     String getColor();
 

demo/java-demo/src/test/java/com/alibaba/demo/basic/DemoInheritTest.java

@@ -47,6 +47,11 @@ class DemoInheritTest {
         private String get_color_from_blackbox(BlackBox self) {
         return "color_from_blackbox";
     }
+
+        @MockMethod(targetMethod = "getColorIndex")
+        private String get_colorIdx_from_color(Color self) {
+            return "colorIdx_from_color";
+        }
     }
 
     @Test
@@ -91,4 +96,10 @@ class DemoInheritTest {
         assertEquals("color_from_blackbox", color);
     }
 
+    @Test
+    void should_mock_call_interface_method_by_sub_interface_object() {
+        String colorIdx = demoInherit.getColorIdxViaColor();
+        verify("get_colorIdx_from_color").withTimes(1);
+        assertEquals("colorIdx_from_color", colorIdx);
+    }
 }

testable-agent/src/main/java/com/alibaba/testable/agent/transformer/MockClassParser.java

@@ -75,6 +75,12 @@ public class MockClassParser {
                 mns.addAll(getAllMethods(scn));
             }
         }
+        for(String interfaceClass : cn.interfaces) {
+            ClassNode scn = ClassUtil.getClassNode(interfaceClass);
+            if (scn != null) {
+                mns.addAll(getAllMethods(scn));
+            }
+        }
         for (InnerClassNode innerClass : cn.innerClasses) {
             if (innerClass.name.equals(cn.name + KOTLIN_POSTFIX_COMPANION)) {
                 ClassNode scn = ClassUtil.getClassNode(innerClass.name);