diff --git a/agent/pom.xml b/agent/pom.xml index f0a29e6..4d141d3 100755 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -5,7 +5,7 @@ com.alibaba.testable agent - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT jar testable-agent diff --git a/agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java b/agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java index f7fe0f8..99d26a4 100644 --- a/agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java +++ b/agent/src/main/java/com/alibaba/testable/agent/handler/TestClassHandler.java @@ -14,6 +14,7 @@ import java.util.Map; */ 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 FIELD_TEST_CASE = "TEST_CASE"; private static final String FIELD_SOURCE_METHOD = "SOURCE_METHOD"; @@ -75,7 +76,7 @@ public class TestClassHandler extends BaseClassHandler { } private boolean isTestableUtilField(FieldInsnNode fieldInsnNode) { - return fieldInsnNode.owner.equals(CLASS_TESTABLE_UTIL) && + return fieldInsnNode.owner.equals(CLASS_TESTABLE_TOOL) && (fieldInsnNode.name.equals(FIELD_TEST_CASE) || fieldInsnNode.name.equals(FIELD_SOURCE_METHOD)); } diff --git a/core/pom.xml b/core/pom.xml index 070b74e..e13392c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -7,7 +7,7 @@ Unit test enhancement toolkit com.alibaba.testable core - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT testable-core diff --git a/core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java b/core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java new file mode 100644 index 0000000..de3856b --- /dev/null +++ b/core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java @@ -0,0 +1,11 @@ +package com.alibaba.testable.core.tool; + +/** + * @author flin + */ +public class TestableTool { + + public static String TEST_CASE; + public static String SOURCE_METHOD; + +} diff --git a/core/src/main/java/com/alibaba/testable/core/util/TestableUtil.java b/core/src/main/java/com/alibaba/testable/core/util/TestableUtil.java index e96acdd..91d0001 100644 --- a/core/src/main/java/com/alibaba/testable/core/util/TestableUtil.java +++ b/core/src/main/java/com/alibaba/testable/core/util/TestableUtil.java @@ -7,9 +7,6 @@ import com.alibaba.testable.core.constant.ConstPool; */ public class TestableUtil { - public static String TEST_CASE; - public static String SOURCE_METHOD; - public static String currentSourceMethodName(Object testClassRef) { Class testClass = testClassRef.getClass(); StackTraceElement[] stack = getMainThread().getStackTrace(); diff --git a/demo/java-demo/pom.xml b/demo/java-demo/pom.xml index 9583949..636afe2 100644 --- a/demo/java-demo/pom.xml +++ b/demo/java-demo/pom.xml @@ -16,7 +16,7 @@ 1.8 - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT diff --git a/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoServiceTest.java b/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoServiceTest.java index 1c45581..2879c15 100644 --- a/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoServiceTest.java +++ b/demo/java-demo/src/test/java/com/alibaba/testable/demo/DemoServiceTest.java @@ -7,8 +7,8 @@ import org.junit.jupiter.api.Test; import java.util.concurrent.Callable; -import static com.alibaba.testable.core.util.TestableUtil.SOURCE_METHOD; -import static com.alibaba.testable.core.util.TestableUtil.TEST_CASE; +import static com.alibaba.testable.core.tool.TestableTool.SOURCE_METHOD; +import static com.alibaba.testable.core.tool.TestableTool.TEST_CASE; import static org.junit.jupiter.api.Assertions.assertEquals; @EnableTestable diff --git a/demo/kotlin-demo/pom.xml b/demo/kotlin-demo/pom.xml index 0a5116c..aad9f5d 100644 --- a/demo/kotlin-demo/pom.xml +++ b/demo/kotlin-demo/pom.xml @@ -17,7 +17,7 @@ 1.8 1.3.72 - 0.1.0-SNAPSHOT + 0.1.1-SNAPSHOT diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoServiceTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoServiceTest.kt index 45ac974..7554509 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoServiceTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/DemoServiceTest.kt @@ -3,8 +3,8 @@ package com.alibaba.testable.demo import com.alibaba.testable.core.accessor.PrivateAccessor import com.alibaba.testable.core.annotation.EnableTestable import com.alibaba.testable.core.annotation.TestableInject -import com.alibaba.testable.core.util.TestableUtil.SOURCE_METHOD -import com.alibaba.testable.core.util.TestableUtil.TEST_CASE +import com.alibaba.testable.core.tool.TestableTool.SOURCE_METHOD +import com.alibaba.testable.core.tool.TestableTool.TEST_CASE import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.util.concurrent.Callable diff --git a/docs/ReleaseNote.md b/docs/ReleaseNote.md index cbf6264..5408852 100644 --- a/docs/ReleaseNote.md +++ b/docs/ReleaseNote.md @@ -1,5 +1,8 @@ # Release Note +## v0.1.1 +- use `TestableTool` class to expose test context + ## v0.1.0 - move generated agent jar to class folder - now support mock method of any object