From f40cfe929ad67d7fbccc5e73c1b18c812f404a99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E6=88=9F?= Date: Sun, 2 May 2021 09:25:36 +0800 Subject: [PATCH] always static import asserts --- .../com/alibaba/demo/basic/DemoMockTest.java | 3 +- .../demo/association/SellerServiceTest.kt | 6 +-- .../com/alibaba/demo/basic/DemoInheritTest.kt | 14 +++--- .../alibaba/demo/basic/DemoInnerClassTest.kt | 8 ++-- .../alibaba/demo/basic/DemoOmniMethodsTest.kt | 47 ++++++++++--------- .../alibaba/demo/basic/DemoTemplateTest.kt | 13 +++-- .../demo/one2multi/OneToMultiSvcTest.kt | 8 ++-- 7 files changed, 49 insertions(+), 50 deletions(-) diff --git a/demo/java-demo/src/test/java/com/alibaba/demo/basic/DemoMockTest.java b/demo/java-demo/src/test/java/com/alibaba/demo/basic/DemoMockTest.java index e587501..1ad7f11 100644 --- a/demo/java-demo/src/test/java/com/alibaba/demo/basic/DemoMockTest.java +++ b/demo/java-demo/src/test/java/com/alibaba/demo/basic/DemoMockTest.java @@ -3,7 +3,6 @@ package com.alibaba.demo.basic; import com.alibaba.demo.basic.model.mock.BlackBox; import com.alibaba.testable.core.annotation.MockConstructor; import com.alibaba.testable.core.annotation.MockMethod; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import java.util.concurrent.Executors; @@ -94,7 +93,7 @@ class DemoMockTest { @Test void should_mock_static_method() { - Assertions.assertEquals("not_secret_box", demoMock.getBox().get()); + assertEquals("not_secret_box", demoMock.getBox().get()); verify("secretBox").withTimes(1); } diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/association/SellerServiceTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/association/SellerServiceTest.kt index ef7b24f..5214e4d 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/association/SellerServiceTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/association/SellerServiceTest.kt @@ -1,6 +1,6 @@ package com.alibaba.demo.association -import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test internal class SellerServiceTest { @@ -9,11 +9,11 @@ internal class SellerServiceTest { @Test fun should_sell_sandwich() { - Assertions.assertEquals("Fake-Sandwich-Cooker & Faked-Sandwich", sellerService.sellSandwich()) + assertEquals("Fake-Sandwich-Cooker & Faked-Sandwich", sellerService.sellSandwich()) } @Test fun should_sell_hamburger() { - Assertions.assertEquals("Real-Hamburger-Cooker & Real-Hamburger", sellerService.sellHamburger()) + assertEquals("Real-Hamburger-Cooker & Real-Hamburger", sellerService.sellHamburger()) } } diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInheritTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInheritTest.kt index a21f060..7511a2d 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInheritTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInheritTest.kt @@ -5,7 +5,7 @@ import com.alibaba.testable.core.matcher.InvokeVerifier import com.alibaba.demo.basic.model.mock.BlackBox import com.alibaba.demo.basic.model.mock.Box import com.alibaba.demo.basic.model.mock.Color -import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test /** @@ -52,41 +52,41 @@ internal class DemoInheritTest { fun should_mock_call_sub_object_method_by_parent_object() { val box = demoInherit.putIntoBox() as BlackBox InvokeVerifier.verify("put_into_box").withTimes(1) - Assertions.assertEquals("put_data_into_box", box.get()) + assertEquals("put_data_into_box", box.get()) } @Test fun should_mock_call_sub_object_method_by_sub_object() { val box = demoInherit.putIntoBlackBox() InvokeVerifier.verify("put_into_blackbox").withTimes(1) - Assertions.assertEquals("put_data_into_blackbox", box.get()) + assertEquals("put_data_into_blackbox", box.get()) } @Test fun should_mock_call_parent_object_method_by_parent_object() { val content = demoInherit.fromBox InvokeVerifier.verify("get_from_box").withTimes(1) - Assertions.assertEquals("get_from_box", content) + assertEquals("get_from_box", content) } @Test fun should_mock_call_parent_object_method_by_sub_object() { val content = demoInherit.fromBlackBox InvokeVerifier.verify("get_from_blackbox").withTimes(1) - Assertions.assertEquals("get_from_blackbox", content) + assertEquals("get_from_blackbox", content) } @Test fun should_mock_call_interface_method_by_interface_object() { val color = demoInherit.colorViaColor InvokeVerifier.verify("get_color_from_color").withTimes(1) - Assertions.assertEquals("color_from_color", color) + assertEquals("color_from_color", color) } @Test fun should_mock_call_interface_method_by_sub_class_object() { val color = demoInherit.colorViaBox InvokeVerifier.verify("get_color_from_blackbox").withTimes(1) - Assertions.assertEquals("color_from_blackbox", color) + assertEquals("color_from_blackbox", color) } } diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInnerClassTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInnerClassTest.kt index 92e9923..f553fc1 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInnerClassTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoInnerClassTest.kt @@ -1,7 +1,7 @@ package com.alibaba.demo.basic import com.alibaba.testable.core.annotation.MockMethod -import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test /** @@ -21,8 +21,8 @@ internal class DemoInnerClassTest { @Throws(Exception::class) fun should_mock_invoke_inside_inner_class() { val demo = DemoInnerClass() - Assertions.assertEquals("MockedCall", demo.callInnerDemo()) - Assertions.assertEquals("MockedCall", demo.callAnonymousInner()) - Assertions.assertEquals("MockedCall", DemoInnerClass.StaticInner().demo()) + assertEquals("MockedCall", demo.callInnerDemo()) + assertEquals("MockedCall", demo.callAnonymousInner()) + assertEquals("MockedCall", DemoInnerClass.StaticInner().demo()) } } diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoOmniMethodsTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoOmniMethodsTest.kt index 63f2d68..3acdd21 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoOmniMethodsTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoOmniMethodsTest.kt @@ -4,7 +4,8 @@ import com.alibaba.demo.basic.model.omni.Child import com.alibaba.demo.basic.model.omni.Parent import com.alibaba.testable.core.tool.OmniAccessor import com.alibaba.testable.core.tool.OmniConstructor -import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test /** @@ -18,14 +19,14 @@ internal class DemoOmniMethodsTest { val parent = OmniConstructor.newInstance(Parent::class.java) // 任意深度的子孙成员对象都不为空 - Assertions.assertNotNull(parent.child?.grandChild?.content) + assertNotNull(parent.child?.grandChild?.content) // 所有基础类型初始化为默认数值 - Assertions.assertEquals(0, parent.child?.grandChild?.value) - Assertions.assertEquals("", parent.child?.grandChild?.content) + assertEquals(0, parent.child?.grandChild?.value) + assertEquals("", parent.child?.grandChild?.content) // 所有数组类型初始化为空数组 - Assertions.assertEquals(0, parent.children?.size) + assertEquals(0, parent.children?.size) } @Test @@ -39,23 +40,23 @@ internal class DemoOmniMethodsTest { // 使用成员名称快速读取成员对象 var contents = OmniAccessor.get(parent, "content") - Assertions.assertEquals(4, contents.size) - Assertions.assertEquals("from child", contents[0]) - Assertions.assertEquals("from 1st children", contents[1]) - Assertions.assertEquals("from 2nd children", contents[2]) - Assertions.assertEquals("from 3rd children", contents[3]) + assertEquals(4, contents.size) + assertEquals("from child", contents[0]) + assertEquals("from 1st children", contents[1]) + assertEquals("from 2nd children", contents[2]) + assertEquals("from 3rd children", contents[3]) // 使用成员类型快速读取成员对象 contents = OmniAccessor.get(parent, "{Child}/{GrandChild}/content") - Assertions.assertEquals(1, contents.size) - Assertions.assertEquals("from child", contents[0]) + assertEquals(1, contents.size) + assertEquals("from child", contents[0]) // 使用带下标的路径读取成员对象 - Assertions.assertEquals("from 2nd children", OmniAccessor.getFirst(parent, "children[1]/{GrandChild}/content")) - Assertions.assertEquals("from 3rd children", OmniAccessor.getFirst(parent, "{Child[]}[2]/{GrandChild}/content")) + assertEquals("from 2nd children", OmniAccessor.getFirst(parent, "children[1]/{GrandChild}/content")) + assertEquals("from 3rd children", OmniAccessor.getFirst(parent, "{Child[]}[2]/{GrandChild}/content")) // 使用模糊路径快速读取成员对象 - Assertions.assertEquals("from 1st children", OmniAccessor.getFirst(parent, "{C*[]}[0]/*/con*t")) + assertEquals("from 1st children", OmniAccessor.getFirst(parent, "{C*[]}[0]/*/con*t")) } @Test @@ -65,22 +66,22 @@ internal class DemoOmniMethodsTest { // 使用指定路径快速给成员对象赋值 OmniAccessor.set(parent, "child/grandChild/content", "demo child") - Assertions.assertEquals("demo child", parent.child?.grandChild?.content) + assertEquals("demo child", parent.child?.grandChild?.content) // 使用带下标的路径给成员对象赋值 OmniAccessor.set(parent, "children[1]/grandChild/content", "demo children[1]") - Assertions.assertEquals("demo children[1]", parent.children?.get(1)?.grandChild?.content) + assertEquals("demo children[1]", parent.children?.get(1)?.grandChild?.content) // 使用模糊路径批量给成员对象赋值 OmniAccessor.set(parent, "child*/*/content", "demo in batch") - Assertions.assertEquals("demo in batch", parent.child?.grandChild?.content) - Assertions.assertEquals("demo in batch", parent.children?.get(0)?.grandChild?.content) - Assertions.assertEquals("demo in batch", parent.children?.get(1)?.grandChild?.content) - Assertions.assertEquals("demo in batch", parent.children?.get(2)?.grandChild?.content) + assertEquals("demo in batch", parent.child?.grandChild?.content) + assertEquals("demo in batch", parent.children?.get(0)?.grandChild?.content) + assertEquals("demo in batch", parent.children?.get(1)?.grandChild?.content) + assertEquals("demo in batch", parent.children?.get(2)?.grandChild?.content) // 读写私有内部类类型的成员（使用类型名引用内部类时，无需带外部类名） - Assertions.assertEquals("", OmniAccessor.getFirst(parent, "subChild/secret")) + assertEquals("", OmniAccessor.getFirst(parent, "subChild/secret")) OmniAccessor.set(parent, "{InnerChild}/secret", "inner-class secret") - Assertions.assertEquals("inner-class secret", OmniAccessor.getFirst(parent, "subChild/secret")) + assertEquals("inner-class secret", OmniAccessor.getFirst(parent, "subChild/secret")) } } diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoTemplateTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoTemplateTest.kt index 8146697..395f696 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoTemplateTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/basic/DemoTemplateTest.kt @@ -2,9 +2,8 @@ package com.alibaba.demo.basic import com.alibaba.testable.core.annotation.MockConstructor import com.alibaba.testable.core.annotation.MockMethod -import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test -import java.util.* /** * 演示模板方法的Mock场景 @@ -42,22 +41,22 @@ internal class DemoTemplateTest { @Test fun should_mock_single_template_method() { val res = demoTemplate.singleTemplateMethod() - Assertions.assertEquals("demo_mock_list", res) + assertEquals("demo_mock_list", res) } @Test fun should_mock_double_template_method() { val res = demoTemplate.doubleTemplateMethod() - Assertions.assertEquals("testable_mock_map", res) + assertEquals("testable_mock_map", res) } @Test fun should_mock_new_template_method() { val res = demoTemplate.newTemplateMethod() - Assertions.assertEquals(2, res.size) + assertEquals(2, res.size) val iterator = res.stream().iterator() - Assertions.assertEquals("insert_mock", iterator.next()) - Assertions.assertEquals("world_mocked", iterator.next()) + assertEquals("insert_mock", iterator.next()) + assertEquals("world_mocked", iterator.next()) } } diff --git a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/one2multi/OneToMultiSvcTest.kt b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/one2multi/OneToMultiSvcTest.kt index 846ade4..4588ffc 100644 --- a/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/one2multi/OneToMultiSvcTest.kt +++ b/demo/kotlin-demo/src/test/kotlin/com/alibaba/demo/one2multi/OneToMultiSvcTest.kt @@ -2,7 +2,7 @@ package com.alibaba.demo.one2multi import com.alibaba.testable.core.annotation.MockWith import com.alibaba.testable.core.matcher.InvokeVerifier.verify -import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test @MockWith @@ -14,9 +14,9 @@ class OneToMultiSvcTest { @Test fun should_test_multi_class_together() { - Assertions.assertEquals("a_mock", aSvc.demo("test")) - Assertions.assertEquals("b_mock", bSvc.demo("test")) - Assertions.assertEquals("c_mock", cSvc.demo("test")) + assertEquals("a_mock", aSvc.demo("test")) + assertEquals("b_mock", bSvc.demo("test")) + assertEquals("c_mock", cSvc.demo("test")) verify("a_format").withTimes(1) verify("b_format").withTimes(1) verify("c_format").withTimes(1)