diff --git a/demo/android-demo/app/build.gradle b/demo/android-demo/app/build.gradle index 9be7bd4..3854b59 100644 --- a/demo/android-demo/app/build.gradle +++ b/demo/android-demo/app/build.gradle @@ -49,7 +49,7 @@ dependencies { testImplementation 'androidx.test:runner:1.4.0-alpha05' testImplementation 'junit:junit:4.+' testImplementation 'org.robolectric:robolectric:4.5.1' - testImplementation 'com.alibaba.testable:testable-all:0.7.0' + testImplementation 'com.alibaba.testable:testable-all:0.7.1' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } \ No newline at end of file diff --git a/demo/java-demo/build.gradle b/demo/java-demo/build.gradle index 3827a08..bfccee2 100644 --- a/demo/java-demo/build.gradle +++ b/demo/java-demo/build.gradle @@ -13,8 +13,8 @@ repositories { dependencies { testImplementation('org.junit.jupiter:junit-jupiter:5.6.2') - testImplementation('com.alibaba.testable:testable-all:0.7.0') - testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.0') + testImplementation('com.alibaba.testable:testable-all:0.7.1') + testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.1') } tasks.withType(JavaCompile) { diff --git a/demo/java-demo/pom.xml b/demo/java-demo/pom.xml index 1a3334b..0677f57 100644 --- a/demo/java-demo/pom.xml +++ b/demo/java-demo/pom.xml @@ -12,7 +12,7 @@ 1.8 1.8 5.6.2 - 0.7.0 + 0.7.1 diff --git a/demo/java-demo/src/main/java/com/alibaba/demo/basic/issue/AbstractServiceA.java b/demo/java-demo/src/main/java/com/alibaba/demo/basic/issue/AbstractServiceA.java new file mode 100644 index 0000000..518225f --- /dev/null +++ b/demo/java-demo/src/main/java/com/alibaba/demo/basic/issue/AbstractServiceA.java @@ -0,0 +1,9 @@ +package com.alibaba.demo.basic.issue; + +public abstract class AbstractServiceA { + + public String put(Object input) { + return "object"; + } + +} diff --git a/demo/java-demo/src/main/java/com/alibaba/demo/basic/issue/ServiceA.java b/demo/java-demo/src/main/java/com/alibaba/demo/basic/issue/ServiceA.java new file mode 100644 index 0000000..2d8484f --- /dev/null +++ b/demo/java-demo/src/main/java/com/alibaba/demo/basic/issue/ServiceA.java @@ -0,0 +1,9 @@ +package com.alibaba.demo.basic.issue; + +public class ServiceA extends AbstractServiceA { + + public String get(Object input) { + return super.put(input); + } + +} diff --git a/demo/java-demo/src/test/java/com/alibaba/demo/basic/issue/ServiceATest.java b/demo/java-demo/src/test/java/com/alibaba/demo/basic/issue/ServiceATest.java new file mode 100644 index 0000000..aa33ac2 --- /dev/null +++ b/demo/java-demo/src/test/java/com/alibaba/demo/basic/issue/ServiceATest.java @@ -0,0 +1,23 @@ +package com.alibaba.demo.basic.issue; + +import com.alibaba.testable.core.annotation.MockInvoke; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class ServiceATest { + + private ServiceA sa = new ServiceA(); + + public static class Mock { + @MockInvoke(targetClass = AbstractServiceA.class, targetMethod = "put") + public String put(Object input) { + return "mocked"; + } + } + + @Test + void get() { + assertEquals("mocked", sa.get(123)); + } +} \ No newline at end of file diff --git a/demo/kotlin-demo/build.gradle.kts b/demo/kotlin-demo/build.gradle.kts index 25d2762..3650799 100644 --- a/demo/kotlin-demo/build.gradle.kts +++ b/demo/kotlin-demo/build.gradle.kts @@ -17,8 +17,8 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("org.junit.jupiter:junit-jupiter:5.6.2") - testImplementation("com.alibaba.testable:testable-all:0.7.0") - testAnnotationProcessor("com.alibaba.testable:testable-processor:0.7.0") + testImplementation("com.alibaba.testable:testable-all:0.7.1") + testAnnotationProcessor("com.alibaba.testable:testable-processor:0.7.1") } tasks.withType { diff --git a/demo/kotlin-demo/pom.xml b/demo/kotlin-demo/pom.xml index 74f15c7..83b2dee 100644 --- a/demo/kotlin-demo/pom.xml +++ b/demo/kotlin-demo/pom.xml @@ -14,7 +14,7 @@ 1.8 1.8 5.6.2 - 0.7.0 + 0.7.1 diff --git a/demo/spock-demo/build.gradle b/demo/spock-demo/build.gradle index c69d0ac..ca55303 100644 --- a/demo/spock-demo/build.gradle +++ b/demo/spock-demo/build.gradle @@ -14,8 +14,8 @@ repositories { dependencies { testImplementation 'org.codehaus.groovy:groovy-all:3.0.7' testImplementation 'org.spockframework:spock-core:2.0-M5-groovy-3.0' - testImplementation('com.alibaba.testable:testable-all:0.7.0') - testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.0') + testImplementation('com.alibaba.testable:testable-all:0.7.1') + testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.1') } tasks.withType(JavaCompile) { diff --git a/demo/spock-demo/pom.xml b/demo/spock-demo/pom.xml index bca758f..67c5380 100644 --- a/demo/spock-demo/pom.xml +++ b/demo/spock-demo/pom.xml @@ -12,7 +12,7 @@ 1.8 1.8 1.8 - 0.7.0 + 0.7.1 diff --git a/docs/en-us/doc/release-note.md b/docs/en-us/doc/release-note.md index d4c8db1..733582c 100644 --- a/docs/en-us/doc/release-note.md +++ b/docs/en-us/doc/release-note.md @@ -1,5 +1,8 @@ # Release Note +## 0.7.1 +- fix an issue cause mock class unrecognized after package-mapping + ## 0.7.0 - fix an improper exception issue when mock method with `associated` scope invoked - rename type `InvokeVerifier`/`InvockeMatcher` to `InvocationVerifier`/`InvocationMatcher` diff --git a/docs/en-us/doc/setup.md b/docs/en-us/doc/setup.md index 5d8dcb2..fa41854 100644 --- a/docs/en-us/doc/setup.md +++ b/docs/en-us/doc/setup.md @@ -16,7 +16,7 @@ It is recommended to add a `property` field that identifies the TestableMock ver ```xml - 0.7.0 + 0.7.1 ``` @@ -63,8 +63,8 @@ Add dependence of `TestableMock` in `build.gradle` file: ```groovy dependencies { - testImplementation('com.alibaba.testable:testable-all:0.7.0') - testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.0') + testImplementation('com.alibaba.testable:testable-all:0.7.1') + testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.1') } ``` diff --git a/docs/zh-cn/doc/release-note.md b/docs/zh-cn/doc/release-note.md index 153456e..357acc1 100644 --- a/docs/zh-cn/doc/release-note.md +++ b/docs/zh-cn/doc/release-note.md @@ -1,5 +1,8 @@ # Release Note +## 0.7.1 +- 修复包路径映射时后识别不到Mock类的问题(issue-248) + ## 0.7.0 - 修复当`scope`为`associated`的Mock方法被`null`对象调用,且上下文与测试用例未关联时抛错不合理的问题(issue-163) - 类型`InvokeVerifier`和`InvockeMatcher`更名为`InvocationVerifier`和`InvocationMatcher` diff --git a/docs/zh-cn/doc/setup.md b/docs/zh-cn/doc/setup.md index 178f0df..ebd9377 100644 --- a/docs/zh-cn/doc/setup.md +++ b/docs/zh-cn/doc/setup.md @@ -16,7 +16,7 @@ ```xml - 0.7.0 + 0.7.1 ``` @@ -63,8 +63,8 @@ ```groovy dependencies { - testImplementation('com.alibaba.testable:testable-all:0.7.0') - testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.0') + testImplementation('com.alibaba.testable:testable-all:0.7.1') + testAnnotationProcessor('com.alibaba.testable:testable-processor:0.7.1') } ``` diff --git a/testable-agent/pom.xml b/testable-agent/pom.xml index 4235e24..f4f3a22 100755 --- a/testable-agent/pom.xml +++ b/testable-agent/pom.xml @@ -6,7 +6,7 @@ com.alibaba.testable testable-parent - 0.7.0 + 0.7.1 ../testable-parent testable-agent diff --git a/testable-all/pom.xml b/testable-all/pom.xml index 0a5e5fa..b1bf7e2 100644 --- a/testable-all/pom.xml +++ b/testable-all/pom.xml @@ -6,7 +6,7 @@ com.alibaba.testable testable-parent - 0.7.0 + 0.7.1 ../testable-parent testable-all diff --git a/testable-core/pom.xml b/testable-core/pom.xml index 81ca563..49dad92 100644 --- a/testable-core/pom.xml +++ b/testable-core/pom.xml @@ -6,7 +6,7 @@ com.alibaba.testable testable-parent - 0.7.0 + 0.7.1 ../testable-parent testable-core diff --git a/testable-maven-plugin/pom.xml b/testable-maven-plugin/pom.xml index ab00959..eff91a1 100644 --- a/testable-maven-plugin/pom.xml +++ b/testable-maven-plugin/pom.xml @@ -6,7 +6,7 @@ com.alibaba.testable testable-parent - 0.7.0 + 0.7.1 ../testable-parent testable-maven-plugin diff --git a/testable-parent/pom.xml b/testable-parent/pom.xml index 3c5683a..5749c60 100644 --- a/testable-parent/pom.xml +++ b/testable-parent/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.alibaba.testable testable-parent - 0.7.0 + 0.7.1 pom testable-parent Unit test enhancement toolkit @@ -42,7 +42,7 @@ 1.6 1.6.8 3.6.0 - 0.7.0 + 0.7.1 diff --git a/testable-processor/pom.xml b/testable-processor/pom.xml index 3195c41..c3b3d83 100644 --- a/testable-processor/pom.xml +++ b/testable-processor/pom.xml @@ -6,7 +6,7 @@ com.alibaba.testable testable-parent - 0.7.0 + 0.7.1 ../testable-parent testable-processor