From 0f2c889c46c78bad9ad788879d133d48066ff621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=91=E6=88=9F?= <jinji.lf@alibaba-inc.com>
Date: Tue, 29 Dec 2020 17:38:28 +0800
Subject: [PATCH] rename mock context class

---
 .../com/alibaba/testable/demo/DemoMockTest.java    |  2 +-
 .../com/alibaba/testable/demo/DemoMockTest.kt      |  2 +-
 .../testable/agent/handler/TestClassHandler.java   | 14 +++++++-------
 .../{TestableContext.java => MockContext.java}     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename testable-agent/src/main/java/com/alibaba/testable/agent/model/{TestableContext.java => MockContext.java} (86%)

diff --git a/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoMockTest.java b/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoMockTest.java
index 801ae48..6d50c5e 100644
--- a/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoMockTest.java
+++ b/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoMockTest.java
@@ -111,7 +111,7 @@ class DemoMockTest {
         // asynchronous
         assertEquals("mock_special", Executors.newSingleThreadExecutor().submit(() -> demoMock.callerOne()).get());
         verify("callFromDifferentMethod").withTimes(2);
-        MOCK_CONTEXT.remove("case");
+        MOCK_CONTEXT.clear();
     }
 
 }
diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoMockTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoMockTest.kt
index 7cc5108..12a77bb 100644
--- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoMockTest.kt
+++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoMockTest.kt
@@ -105,6 +105,6 @@ internal class DemoMockTest {
             demoMock.callerOne()
         }.get())
         verify("callFromDifferentMethod").withTimes(2)
-        MOCK_CONTEXT.remove("case")
+        MOCK_CONTEXT.clear()
     }
 }
diff --git a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java
index f3dcfb9..19fdae3 100644
--- a/testable-agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java
+++ b/testable-agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java
@@ -19,7 +19,7 @@ public class TestClassHandler extends BaseClassHandler {
     private static final String CLASS_TESTABLE_TOOL = "com/alibaba/testable/core/tool/TestableTool";
     private static final String CLASS_TESTABLE_UTIL = "com/alibaba/testable/core/util/TestableUtil";
     private static final String CLASS_INVOKE_RECORD_UTIL = "com/alibaba/testable/core/util/InvokeRecordUtil";
-    private static final String CLASS_TESTABLE_CONTEXT = "com/alibaba/testable/agent/model/TestableContext";
+    private static final String CLASS_MOCK_CONTEXT = "com/alibaba/testable/agent/model/MockContext";
     private static final String REF_TESTABLE_CONTEXT = "_testableContextReference";
     private static final String FIELD_TEST_CASE = "TEST_CASE";
     private static final String FIELD_SOURCE_METHOD = "SOURCE_METHOD";
@@ -39,7 +39,7 @@ public class TestClassHandler extends BaseClassHandler {
      */
     @Override
     protected void transform(ClassNode cn) {
-        if (wasTransformed(cn, REF_TESTABLE_CONTEXT, ClassUtil.toByteCodeClassName(CLASS_TESTABLE_CONTEXT))) {
+        if (wasTransformed(cn, REF_TESTABLE_CONTEXT, ClassUtil.toByteCodeClassName(CLASS_MOCK_CONTEXT))) {
             return;
         }
         for (MethodNode mn : cn.methods) {
@@ -54,11 +54,11 @@ public class TestClassHandler extends BaseClassHandler {
 
     private void initMockContextReference(ClassNode cn, MethodNode mn) {
         InsnList il = new InsnList();
-        il.add(new TypeInsnNode(NEW, CLASS_TESTABLE_CONTEXT));
+        il.add(new TypeInsnNode(NEW, CLASS_MOCK_CONTEXT));
         il.add(new InsnNode(DUP));
-        il.add(new MethodInsnNode(INVOKESPECIAL, CLASS_TESTABLE_CONTEXT, "<init>", "()V", false));
+        il.add(new MethodInsnNode(INVOKESPECIAL, CLASS_MOCK_CONTEXT, "<init>", "()V", false));
         il.add(new FieldInsnNode(PUTSTATIC, cn.name, REF_TESTABLE_CONTEXT,
-            ClassUtil.toByteCodeClassName(CLASS_TESTABLE_CONTEXT)));
+            ClassUtil.toByteCodeClassName(CLASS_MOCK_CONTEXT)));
         mn.instructions.insertBefore(mn.instructions.get(0), il);
     }
 
@@ -156,8 +156,8 @@ public class TestClassHandler extends BaseClassHandler {
                 SIGNATURE_CURRENT_SOURCE_METHOD_NAME, false));
         } else if (FIELD_MOCK_CONTEXT.equals(fieldName)) {
             il.add(new FieldInsnNode(GETSTATIC, cn.name, REF_TESTABLE_CONTEXT,
-                ClassUtil.toByteCodeClassName(CLASS_TESTABLE_CONTEXT)));
-            il.add(new FieldInsnNode(GETFIELD, CLASS_TESTABLE_CONTEXT, FIELD_PARAMETERS, SIGNATURE_PARAMETERS));
+                ClassUtil.toByteCodeClassName(CLASS_MOCK_CONTEXT)));
+            il.add(new FieldInsnNode(GETFIELD, CLASS_MOCK_CONTEXT, FIELD_PARAMETERS, SIGNATURE_PARAMETERS));
         }
         if (il.size() > 0) {
             mn.instructions.insert(instructions[pos], il);
diff --git a/testable-agent/src/main/java/com/alibaba/testable/agent/model/TestableContext.java b/testable-agent/src/main/java/com/alibaba/testable/agent/model/MockContext.java
similarity index 86%
rename from testable-agent/src/main/java/com/alibaba/testable/agent/model/TestableContext.java
rename to testable-agent/src/main/java/com/alibaba/testable/agent/model/MockContext.java
index 0e29fb0..8cc1418 100644
--- a/testable-agent/src/main/java/com/alibaba/testable/agent/model/TestableContext.java
+++ b/testable-agent/src/main/java/com/alibaba/testable/agent/model/MockContext.java
@@ -6,7 +6,7 @@ import java.util.Map;
 /**
  * @author flin
  */
-public class TestableContext {
+public class MockContext {
 
     public Map<String, Object> parameters = new HashMap<String, Object>();