diff --git a/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMatcherServiceTest.java b/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMatcherServiceTest.java index 7aa6938..9c5a5e0 100644 --- a/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMatcherServiceTest.java +++ b/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMatcherServiceTest.java @@ -5,8 +5,7 @@ import com.alibaba.testable.demo.model.BlackBox; import org.junit.jupiter.api.Test; import static com.alibaba.testable.core.matcher.InvokeMatcher.*; -import static com.alibaba.testable.core.tool.TestableTool.*; - +import static com.alibaba.testable.core.matcher.InvokeVerifier.verify; class DemoMatcherServiceTest { diff --git a/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMockServiceTest.java b/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMockServiceTest.java index e2eb215..431338b 100644 --- a/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMockServiceTest.java +++ b/demo/java-demo/src/test/java/com/alibaba/testable/demo/service/DemoMockServiceTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import java.util.concurrent.Executors; +import static com.alibaba.testable.core.matcher.InvokeVerifier.verify; import static com.alibaba.testable.core.tool.TestableTool.*; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/service/DemoMockServiceTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/service/DemoMockServiceTest.kt index 9e9d0d6..936684c 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/service/DemoMockServiceTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/service/DemoMockServiceTest.kt @@ -1,6 +1,7 @@ package com.alibaba.testable.demo.service import com.alibaba.testable.core.annotation.TestableMock +import com.alibaba.testable.core.matcher.InvokeVerifier.verify import com.alibaba.testable.core.tool.TestableTool.* import com.alibaba.testable.demo.model.BlackBox import com.alibaba.testable.demo.model.Box @@ -9,7 +10,6 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import java.util.concurrent.Executors - internal class DemoMockServiceTest { @TestableMock(targetMethod = CONSTRUCTOR) diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/util/PathUtilTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/util/PathUtilTest.kt index 85c2310..1553d11 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/util/PathUtilTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/testable/demo/util/PathUtilTest.kt @@ -1,8 +1,8 @@ package com.alibaba.testable.demo.util -import org.junit.jupiter.api.Test import com.alibaba.testable.core.annotation.TestableMock -import com.alibaba.testable.core.tool.TestableTool.verify +import com.alibaba.testable.core.matcher.InvokeVerifier.verify +import org.junit.jupiter.api.Test import java.io.File class PathUtilTest { diff --git a/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeVerifier.java b/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeVerifier.java index c044ef7..e03ae15 100644 --- a/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeVerifier.java +++ b/testable-core/src/main/java/com/alibaba/testable/core/matcher/InvokeVerifier.java @@ -2,6 +2,7 @@ package com.alibaba.testable.core.matcher; import com.alibaba.testable.core.error.VerifyFailedError; import com.alibaba.testable.core.model.Verification; +import com.alibaba.testable.core.util.InvokeRecordUtil; import com.alibaba.testable.core.util.TestableUtil; import java.security.InvalidParameterException; @@ -15,10 +16,20 @@ public class InvokeVerifier { private final List records; private Verification lastVerification = null; - public InvokeVerifier(List records) { + private InvokeVerifier(List records) { this.records = records; } + /** + * Get counter to check whether specified mock method invoked + * @param mockMethodName name of a mock method + */ + public static InvokeVerifier verify(String mockMethodName) { + String testClass = Thread.currentThread().getStackTrace()[InvokeRecordUtil.INDEX_OF_TEST_CLASS].getClassName(); + String testCaseName = TestableUtil.currentTestCaseName(testClass); + return new InvokeVerifier(InvokeRecordUtil.getInvokeRecord(mockMethodName, testCaseName)); + } + /** * Expect mock method invoked with specified parameters * @param args parameters to compare diff --git a/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java b/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java index ad1de58..47c5d38 100644 --- a/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java +++ b/testable-core/src/main/java/com/alibaba/testable/core/tool/TestableTool.java @@ -1,9 +1,5 @@ package com.alibaba.testable.core.tool; -import com.alibaba.testable.core.matcher.InvokeVerifier; -import com.alibaba.testable.core.util.InvokeRecordUtil; -import com.alibaba.testable.core.util.TestableUtil; - /** * @author flin */ @@ -24,14 +20,4 @@ public class TestableTool { */ public static String SOURCE_METHOD; - /** - * Get counter to check whether specified mock method invoked - * @param mockMethodName name of a mock method - */ - public static InvokeVerifier verify(String mockMethodName) { - String testClass = Thread.currentThread().getStackTrace()[InvokeRecordUtil.INDEX_OF_TEST_CLASS].getClassName(); - String testCaseName = TestableUtil.currentTestCaseName(testClass); - return new InvokeVerifier(InvokeRecordUtil.getInvokeRecord(mockMethodName, testCaseName)); - } - }