From 8f783fad911edea9b0a7a50ffad94f26f7499af7 Mon Sep 17 00:00:00 2001 From: jimin Date: Sun, 2 Jun 2019 01:16:53 +0800 Subject: [PATCH] optimize junit Assert usage (#4214) --- .../apache/dubbo/rpc/cluster/StickyTest.java | 4 +- .../rpc/cluster/merger/ResultMergerTest.java | 12 ++-- .../router/condition/ConditionRouterTest.java | 22 +++---- .../support/AbstractClusterInvokerTest.java | 20 +++---- .../wrapper/MockClusterInvokerTest.java | 22 +++---- .../java/org/apache/dubbo/common/URLTest.java | 12 ++-- .../beanutil/JavaBeanSerializeUtilTest.java | 14 ++--- .../dubbo/common/bytecode/MixinTest.java | 7 ++- .../dubbo/common/bytecode/WrapperTest.java | 8 +-- .../compiler/support/ClassUtilsTest.java | 2 +- .../common/extension/ExtensionLoaderTest.java | 18 +++--- .../support/ActivateComparatorTest.java | 1 - .../apache/dubbo/common/json/JSONTest.java | 6 +- .../threadlocal/InternalThreadLocalTest.java | 29 ++++----- .../NamedInternalThreadFactoryTest.java | 2 +- .../eager/EagerThreadPoolExecutorTest.java | 8 +-- .../common/utils/CompatibleTypeUtilsTest.java | 2 +- .../dubbo/common/utils/MethodUtilsTest.java | 4 +- .../dubbo/common/utils/PojoUtilsTest.java | 6 +- .../apache/dubbo/config/MethodConfigTest.java | 3 +- .../dubbo/config/ReferenceConfigTest.java | 10 ++-- .../AnnotationPropertyValuesAdapterTest.java | 10 ++-- .../annotation/ReferenceBeanBuilderTest.java | 2 +- .../dubbo/cache/filter/CacheFilterTest.java | 4 +- .../support/jvalidation/JValidationTest.java | 1 - .../identifier/MetadataIdentifierTest.java | 1 - .../support/AbstractMetadataReportTest.java | 8 +-- .../monitor/support/MonitorFilterTest.java | 4 +- .../qos/command/util/CommandHelperTest.java | 1 - .../registry/PerformanceRegistryTest.java | 1 - .../support/AbstractRegistryTest.java | 2 +- .../support/FailbackRegistryTest.java | 2 +- .../registry/dubbo/RegistryDirectoryTest.java | 60 ++++++++++--------- .../registry/dubbo/RegistryProtocolTest.java | 11 ++-- .../dubbo/registry/etcd/EtcdRegistryTest.java | 30 +++++----- .../multiple/MultipleRegistry2S2RTest.java | 30 +++++----- .../remoting/codec/ExchangeCodecTest.java | 28 ++++----- .../handler/ConnectChannelHandlerTest.java | 2 +- .../handler/HeaderExchangeHandlerTest.java | 2 +- .../remoting/transport/AbstractCodecTest.java | 5 +- .../remoting/etcd/jetcd/JEtcdClientTest.java | 4 +- .../support/header/HeartbeatHandlerTest.java | 4 +- .../transport/netty/ClientReconnectTest.java | 8 +-- .../transport/netty4/ClientReconnectTest.java | 8 +-- .../curator/CuratorZookeeperClientTest.java | 1 - .../CuratorZookeeperTransporterTest.java | 1 - .../org/apache/dubbo/rpc/AppResponseTest.java | 4 +- .../org/apache/dubbo/rpc/RpcContextTest.java | 8 +-- .../dubbo/rpc/filter/tps/StatItemTest.java | 4 +- .../dubbo/rpc/support/RpcUtilsTest.java | 6 +- .../dubbo/DubboInvokerAvilableTest.java | 18 +++--- .../protocol/dubbo/ImplicitCallBackTest.java | 14 ++--- .../ReferenceCountExchangeClientTest.java | 8 +-- .../telnet/CurrentTelnetHandlerTest.java | 1 - .../dubbo/rpc/validation/ValidationTest.java | 2 +- .../rpc/protocol/http/HttpProtocolTest.java | 2 +- .../DubboSwaggerApiListingResourceTest.java | 2 - .../rpc/protocol/rmi/RmiProtocolTest.java | 5 +- .../rpc/protocol/thrift/ThriftCodecTest.java | 2 +- .../base/AbstractSerializationTest.java | 8 +-- .../hessian2/Hessian2PersonOkTest.java | 1 - .../ProtostuffSerializationTest.java | 1 - .../SerializableClassRegistryTest.java | 1 - 63 files changed, 260 insertions(+), 269 deletions(-) diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java index cb2656f33b9..34148202af1 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java @@ -104,7 +104,7 @@ public void testMethodsSticky() { for (int i = 0; i < 100; i++) {//Two different methods should always use the same invoker every time. int count1 = testSticky("method1", true); int count2 = testSticky("method2", true); - Assertions.assertTrue(count1 == count2); + Assertions.assertEquals(count1, count2); } } @@ -129,7 +129,7 @@ public int testSticky(String methodName, boolean check) { int count = 0; for (int i = 0; i < runs; i++) { - Assertions.assertEquals(null, clusterinvoker.invoke(invocation)); + Assertions.assertNull(clusterinvoker.invoke(invocation)); if (invoker1 == clusterinvoker.getSelectedInvoker()) { count++; } diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest.java index 788d1af160f..f27b958299e 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest.java @@ -81,7 +81,7 @@ public void testArrayMerger() { result = MergerFactory.getMerger(Integer[].class).merge(intArray1, intArray2, intArray3, null); Assertions.assertTrue(result.getClass().isArray()); Assertions.assertEquals(7, Array.getLength(result)); - Assertions.assertTrue(Integer.class == result.getClass().getComponentType()); + Assertions.assertSame(Integer.class, result.getClass().getComponentType()); for (int i = 0; i < 7; i++) { Assertions.assertEquals(i + 1, Array.get(result, i)); } @@ -170,7 +170,7 @@ public void testDoubleArrayMerger() { Assertions.assertEquals(4, result.length); double[] mergedResult = {1.2d, 3.5d, 2d, 34d}; for (int i = 0; i < mergedResult.length; i++) { - Assertions.assertTrue(mergedResult[i] == result[i]); + Assertions.assertEquals(mergedResult[i], result[i], 0.0); } result = MergerFactory.getMerger(double[].class).merge(null); @@ -191,7 +191,7 @@ public void testFloatArrayMerger() { Assertions.assertEquals(4, result.length); double[] mergedResult = {1.2f, 3.5f, 2f, 34f}; for (int i = 0; i < mergedResult.length; i++) { - Assertions.assertTrue(mergedResult[i] == result[i]); + Assertions.assertEquals(mergedResult[i], result[i], 0.0); } result = MergerFactory.getMerger(float[].class).merge(null); @@ -212,7 +212,7 @@ public void testIntArrayMerger() { Assertions.assertEquals(4, result.length); double[] mergedResult = {1, 2, 2, 34}; for (int i = 0; i < mergedResult.length; i++) { - Assertions.assertTrue(mergedResult[i] == result[i]); + Assertions.assertEquals(mergedResult[i], result[i], 0.0); } result = MergerFactory.getMerger(int[].class).merge(null); @@ -296,7 +296,7 @@ public void testLongArrayMerger() { Assertions.assertEquals(4, result.length); double[] mergedResult = {1l, 2l, 2l, 34l}; for (int i = 0; i < mergedResult.length; i++) { - Assertions.assertTrue(mergedResult[i] == result[i]); + Assertions.assertEquals(mergedResult[i], result[i], 0.0); } result = MergerFactory.getMerger(long[].class).merge(null); @@ -352,7 +352,7 @@ public void testShortArrayMerger() { Assertions.assertEquals(4, result.length); double[] mergedResult = {1, 2, 2, 34}; for (int i = 0; i < mergedResult.length; i++) { - Assertions.assertTrue(mergedResult[i] == result[i]); + Assertions.assertEquals(mergedResult[i], result[i], 0.0); } result = MergerFactory.getMerger(short[].class).merge(null); diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java index 76ffad19cae..a88a7591610 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java @@ -58,31 +58,31 @@ public void testRoute_matchWhen() { Router router = new ConditionRouterFactory().getRouter(getRouteUrl(" => host = 1.2.3.4")); boolean matchWhen = ((ConditionRouter) router).matchWhen(URL.valueOf("consumer://1.1.1.1/com.foo.BarService"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); router = new ConditionRouterFactory().getRouter(getRouteUrl("host = 2.2.2.2,1.1.1.1,3.3.3.3 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router).matchWhen(URL.valueOf("consumer://1.1.1.1/com.foo.BarService"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); router = new ConditionRouterFactory().getRouter(getRouteUrl("host = 2.2.2.2,1.1.1.1,3.3.3.3 & host !=1.1.1.1 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router).matchWhen(URL.valueOf("consumer://1.1.1.1/com.foo.BarService"), invocation); - Assertions.assertEquals(false, matchWhen); + Assertions.assertFalse(matchWhen); router = new ConditionRouterFactory().getRouter(getRouteUrl("host !=4.4.4.4 & host = 2.2.2.2,1.1.1.1,3.3.3.3 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router).matchWhen(URL.valueOf("consumer://1.1.1.1/com.foo.BarService"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); router = new ConditionRouterFactory().getRouter(getRouteUrl("host !=4.4.4.* & host = 2.2.2.2,1.1.1.1,3.3.3.3 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router).matchWhen(URL.valueOf("consumer://1.1.1.1/com.foo.BarService"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); router = new ConditionRouterFactory().getRouter(getRouteUrl("host = 2.2.2.2,1.1.1.*,3.3.3.3 & host != 1.1.1.1 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router).matchWhen(URL.valueOf("consumer://1.1.1.1/com.foo.BarService"), invocation); - Assertions.assertEquals(false, matchWhen); + Assertions.assertFalse(matchWhen); router = new ConditionRouterFactory().getRouter(getRouteUrl("host = 2.2.2.2,1.1.1.*,3.3.3.3 & host != 1.1.1.2 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router).matchWhen(URL.valueOf("consumer://1.1.1.1/com.foo.BarService"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); } @Test @@ -143,23 +143,23 @@ public void testRoute_methodRoute() { Router router = new ConditionRouterFactory().getRouter(getRouteUrl("methods=getFoo => host = 1.2.3.4")); boolean matchWhen = ((ConditionRouter) router).matchWhen( URL.valueOf("consumer://1.1.1.1/com.foo.BarService?methods=setFoo,getFoo,findFoo"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); // Exactly one method, match matchWhen = ((ConditionRouter) router).matchWhen( URL.valueOf("consumer://1.1.1.1/com.foo.BarService?methods=getFoo"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); // Method routing and Other condition routing can work together Router router2 = new ConditionRouterFactory() .getRouter(getRouteUrl("methods=getFoo & host!=1.1.1.1 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router2).matchWhen( URL.valueOf("consumer://1.1.1.1/com.foo.BarService?methods=getFoo"), invocation); - Assertions.assertEquals(false, matchWhen); + Assertions.assertFalse(matchWhen); Router router3 = new ConditionRouterFactory() .getRouter(getRouteUrl("methods=getFoo & host=1.1.1.1 => host = 1.2.3.4")); matchWhen = ((ConditionRouter) router3).matchWhen( URL.valueOf("consumer://1.1.1.1/com.foo.BarService?methods=getFoo"), invocation); - Assertions.assertEquals(true, matchWhen); + Assertions.assertTrue(matchWhen); // Test filter condition List> invokers = new ArrayList>(); Invoker invoker1 = new MockInvoker(URL.valueOf("dubbo://10.20.3.3:20880/com.foo.BarService")); diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java index 1ec574d022a..37402d8d9ae 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java @@ -174,13 +174,13 @@ public void testSelect_Invokersize0() throws Exception { Assertions.assertNotNull(l,"cluster.initLoadBalance returns null!"); { Invoker invoker = cluster.select(l, null, null, null); - Assertions.assertEquals(null, invoker); + Assertions.assertNull(invoker); } { invokers.clear(); selectedInvokers.clear(); Invoker invoker = cluster.select(l, null, invokers, null); - Assertions.assertEquals(null, invoker); + Assertions.assertNull(invoker); } } @@ -231,7 +231,7 @@ public void testCloseAvailablecheck() { initlistsize5(); Invoker sinvoker = cluster_nocheck.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertEquals(false, sinvoker.isAvailable()); + Assertions.assertFalse(sinvoker.isAvailable()); Assertions.assertEquals(invoker1, sinvoker); } @@ -308,7 +308,7 @@ public void testSelectAgainAndCheckAvailable() { selectedInvokers.add(invoker3); selectedInvokers.add(invoker5); Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertTrue(sinvoker == invoker4); + Assertions.assertSame(sinvoker, invoker4); } { //Boundary condition test . @@ -365,7 +365,7 @@ public void testSelect_multiInvokers(String lbname) throws Exception { initlistsize5(); for (int i = 0; i < runs; i++) { Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertEquals(true, sinvoker.isAvailable()); + Assertions.assertTrue(sinvoker.isAvailable()); Mockito.clearInvocations(invoker1, invoker2, invoker3, invoker4, invoker5); } @@ -373,7 +373,7 @@ public void testSelect_multiInvokers(String lbname) throws Exception { selectedInvokers.clear(); selectedInvokers.add(invoker1); Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertEquals(true, sinvoker.isAvailable()); + Assertions.assertTrue(sinvoker.isAvailable()); Mockito.clearInvocations(invoker1, invoker2, invoker3, invoker4, invoker5); } @@ -381,7 +381,7 @@ public void testSelect_multiInvokers(String lbname) throws Exception { selectedInvokers.clear(); selectedInvokers.add(invoker2); Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertEquals(true, sinvoker.isAvailable()); + Assertions.assertTrue(sinvoker.isAvailable()); Mockito.clearInvocations(invoker1, invoker2, invoker3, invoker4, invoker5); } @@ -390,7 +390,7 @@ public void testSelect_multiInvokers(String lbname) throws Exception { selectedInvokers.add(invoker2); selectedInvokers.add(invoker4); Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertEquals(true, sinvoker.isAvailable()); + Assertions.assertTrue(sinvoker.isAvailable()); Mockito.clearInvocations(invoker1, invoker2, invoker3, invoker4, invoker5); } @@ -400,7 +400,7 @@ public void testSelect_multiInvokers(String lbname) throws Exception { selectedInvokers.add(invoker3); selectedInvokers.add(invoker5); Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertEquals(true, sinvoker.isAvailable()); + Assertions.assertTrue(sinvoker.isAvailable()); Mockito.clearInvocations(invoker1, invoker2, invoker3, invoker4, invoker5); } @@ -411,7 +411,7 @@ public void testSelect_multiInvokers(String lbname) throws Exception { selectedInvokers.add(invoker2); selectedInvokers.add(invoker3); Invoker sinvoker = cluster.select(lb, invocation, invokers, selectedInvokers); - Assertions.assertEquals(true, sinvoker.isAvailable()); + Assertions.assertTrue(sinvoker.isAvailable()); Mockito.clearInvocations(invoker1, invoker2, invoker3, invoker4, invoker5); } diff --git a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java index 9bc5686efd9..c133d353571 100644 --- a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java @@ -74,7 +74,7 @@ public void testMockInvokerInvoke_normal() { invocation = new RpcInvocation(); invocation.setMethodName("sayHello"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); } /** @@ -102,13 +102,13 @@ public void testMockInvokerInvoke_failmock() { invocation = new RpcInvocation(); invocation.setMethodName("getSomething2"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); // If no mock was configured, return null directly invocation = new RpcInvocation(); invocation.setMethodName("sayHello"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); } @@ -138,13 +138,13 @@ public void testMockInvokerInvoke_forcemock() { invocation = new RpcInvocation(); invocation.setMethodName("getSomething2"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); // If no mock was configured, return null directly invocation = new RpcInvocation(); invocation.setMethodName("sayHello"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); } @Test @@ -163,7 +163,7 @@ public void testMockInvokerInvoke_forcemock_defaultreturn() { RpcInvocation invocation = new RpcInvocation(); invocation.setMethodName("sayHello"); Result ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); } /** @@ -197,7 +197,7 @@ public void testMockInvokerFromOverride_Invoke_Fock_someMethods() { invocation = new RpcInvocation(); invocation.setMethodName("sayHello"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); } /** @@ -260,13 +260,13 @@ public void testMockInvokerFromOverride_Invoke_Fock_WithDefault() { invocation = new RpcInvocation(); invocation.setMethodName("getSomething3"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); // If no mock was configured, return null directly invocation = new RpcInvocation(); invocation.setMethodName("sayHello"); ret = cluster.invoke(invocation); - Assertions.assertEquals(null, ret.getValue()); + Assertions.assertNull(ret.getValue()); } /** @@ -481,7 +481,7 @@ public void testMockInvokerFromOverride_Invoke_check_boolean() { invocation.setMethodName("getBoolean1"); Result ret = cluster.invoke(invocation); Assertions.assertTrue(ret.getValue() instanceof Boolean, "result type must be Boolean but was : " + ret.getValue().getClass()); - Assertions.assertEquals(true, Boolean.parseBoolean(ret.getValue().toString())); + Assertions.assertTrue(Boolean.parseBoolean(ret.getValue().toString())); } @Test @@ -494,7 +494,7 @@ public void testMockInvokerFromOverride_Invoke_check_Boolean() { RpcInvocation invocation = new RpcInvocation(); invocation.setMethodName("getBoolean2"); Result ret = cluster.invoke(invocation); - Assertions.assertEquals(true, Boolean.parseBoolean(ret.getValue().toString())); + Assertions.assertTrue(Boolean.parseBoolean(ret.getValue().toString())); } @SuppressWarnings("unchecked") diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java index a74f7baa974..377bf893cca 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java @@ -72,7 +72,7 @@ public void test_valueOf_noProtocol() throws Exception { assertNull(url.getPassword()); assertEquals("10.20.130.230", url.getHost()); assertEquals(0, url.getPort()); - assertEquals(null, url.getPath()); + assertNull(url.getPath()); assertEquals(0, url.getParameters().size()); url = URL.valueOf("10.20.130.230:20880"); @@ -81,7 +81,7 @@ public void test_valueOf_noProtocol() throws Exception { assertNull(url.getPassword()); assertEquals("10.20.130.230", url.getHost()); assertEquals(20880, url.getPort()); - assertEquals(null, url.getPath()); + assertNull(url.getPath()); assertEquals(0, url.getParameters().size()); url = URL.valueOf("10.20.130.230/context/path"); @@ -190,7 +190,7 @@ public void test_valueOf_WithProtocolHost() throws Exception { assertNull(url.getPassword()); assertEquals("10.20.130.230", url.getHost()); assertEquals(0, url.getPort()); - assertEquals(null, url.getPath()); + assertNull(url.getPath()); assertEquals(0, url.getParameters().size()); url = URL.valueOf("dubbo://10.20.130.230:20880/context/path"); @@ -208,7 +208,7 @@ public void test_valueOf_WithProtocolHost() throws Exception { assertEquals("hello1234", url.getPassword()); assertEquals("10.20.130.230", url.getHost()); assertEquals(20880, url.getPort()); - assertEquals(null, url.getPath()); + assertNull(url.getPath()); assertEquals(0, url.getParameters().size()); url = URL.valueOf("dubbo://admin:hello1234@10.20.130.230:20880?version=1.0.0"); @@ -217,7 +217,7 @@ public void test_valueOf_WithProtocolHost() throws Exception { assertEquals("hello1234", url.getPassword()); assertEquals("10.20.130.230", url.getHost()); assertEquals(20880, url.getPort()); - assertEquals(null, url.getPath()); + assertNull(url.getPath()); assertEquals(1, url.getParameters().size()); assertEquals("1.0.0", url.getParameter("version")); @@ -282,7 +282,7 @@ public void test_getAddress() throws Exception { @Test public void test_getAbsolutePath() throws Exception { URL url = new URL("p1", "1.2.2.2", 33); - assertEquals(null, url.getAbsolutePath()); + assertNull(url.getAbsolutePath()); url = new URL("file", null, 90, "/home/user1/route.js"); assertEquals("/home/user1/route.js", url.getAbsolutePath()); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java index 4b3654a73d5..68c7100f32b 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java @@ -54,7 +54,7 @@ public void testSerialize_Primitive() { public void testSerialize_Primitive_NUll() { JavaBeanDescriptor descriptor; descriptor = JavaBeanSerializeUtil.serialize(null); - Assertions.assertTrue(descriptor == null); + Assertions.assertNull(descriptor); } @Test @@ -146,7 +146,7 @@ public void testGetPrimitiveProperty() { public void testDeserialize_get_and_set() { JavaBeanDescriptor descriptor = new JavaBeanDescriptor(long.class.getName(), JavaBeanDescriptor.TYPE_BEAN); descriptor.setType(JavaBeanDescriptor.TYPE_PRIMITIVE); - Assertions.assertTrue(descriptor.getType() == JavaBeanDescriptor.TYPE_PRIMITIVE); + Assertions.assertEquals(descriptor.getType(), JavaBeanDescriptor.TYPE_PRIMITIVE); descriptor.setClassName(JavaBeanDescriptor.class.getName()); Assertions.assertEquals(JavaBeanDescriptor.class.getName(), descriptor.getClassName()); } @@ -169,7 +169,7 @@ public void testSerialize_Array() { Assertions.assertEquals(integers.length, descriptor.propertySize()); for (int i = 0; i < integers.length; i++) { if (integers[i] == null) { - Assertions.assertTrue(integers[i] == descriptor.getProperty(i)); + Assertions.assertSame(integers[i], descriptor.getProperty(i)); } else { Assertions.assertEquals(integers[i], ((JavaBeanDescriptor) descriptor.getProperty(i)).getPrimitiveProperty()); } @@ -215,7 +215,7 @@ public void testConstructorArg() { Assertions.assertEquals((double) 0, JavaBeanSerializeUtil.getConstructorArg(Double.class)); Assertions.assertEquals((char) 0, JavaBeanSerializeUtil.getConstructorArg(char.class)); Assertions.assertEquals(new Character((char) 0), JavaBeanSerializeUtil.getConstructorArg(Character.class)); - Assertions.assertEquals(null, JavaBeanSerializeUtil.getConstructorArg(JavaBeanSerializeUtil.class)); + Assertions.assertNull(JavaBeanSerializeUtil.getConstructorArg(JavaBeanSerializeUtil.class)); } @Test @@ -228,7 +228,7 @@ public void testDeserialize_Array() { Object obj = JavaBeanSerializeUtil.deserialize(descriptor); Assertions.assertTrue(obj.getClass().isArray()); - Assertions.assertTrue(int.class == obj.getClass().getComponentType()); + Assertions.assertSame(int.class, obj.getClass().getComponentType()); for (int i = 0; i < len; i++) { Assertions.assertEquals(i, Array.get(obj, i)); } @@ -290,7 +290,7 @@ public void test_Circular_Reference() { assertEqualsPrimitive(parent.getEmail(), descriptor.getProperty("email")); JavaBeanDescriptor childDescriptor = (JavaBeanDescriptor) descriptor.getProperty("child"); - Assertions.assertTrue(descriptor == childDescriptor.getProperty("parent")); + Assertions.assertSame(descriptor, childDescriptor.getProperty("parent")); assertEqualsPrimitive(child.getName(), childDescriptor.getProperty("name")); assertEqualsPrimitive(child.getAge(), childDescriptor.getProperty("age")); } @@ -385,7 +385,7 @@ public void testDeserializeBean() { public void testSerializeJavaBeanDescriptor() { JavaBeanDescriptor descriptor = new JavaBeanDescriptor(); JavaBeanDescriptor result = JavaBeanSerializeUtil.serialize(descriptor); - Assertions.assertTrue(descriptor == result); + Assertions.assertSame(descriptor, result); Map map = new HashMap(); map.put("first", descriptor); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/MixinTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/MixinTest.java index 5ed7a6eff22..954ea51fdaa 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/MixinTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/MixinTest.java @@ -19,6 +19,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MixinTest { @@ -26,9 +27,9 @@ public class MixinTest { public void testMain() throws Exception { Mixin mixin = Mixin.mixin(new Class[]{I1.class, I2.class, I3.class}, new Class[]{C1.class, C2.class}); Object o = mixin.newInstance(new Object[]{new C1(), new C2()}); - assertEquals(o instanceof I1, true); - assertEquals(o instanceof I2, true); - assertEquals(o instanceof I3, true); + assertTrue(o instanceof I1); + assertTrue(o instanceof I2); + assertTrue(o instanceof I3); ((I1) o).m1(); ((I2) o).m2(); ((I3) o).m3(); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java index ab5dff43393..03e7e318aba 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java @@ -74,9 +74,9 @@ public void testHasMethod() throws Exception { @Test public void testWrapperObject() throws Exception { Wrapper w = Wrapper.getWrapper(Object.class); - Assertions.assertTrue(w.getMethodNames().length == 4); - Assertions.assertTrue(w.getPropertyNames().length == 0); - Assertions.assertEquals(null, w.getPropertyType(null)); + Assertions.assertEquals(4, w.getMethodNames().length); + Assertions.assertEquals(0, w.getPropertyNames().length); + Assertions.assertNull(w.getPropertyType(null)); } @Test @@ -102,7 +102,7 @@ public void testInvokeWrapperObject() throws Exception { Assertions.assertEquals(instance.getClass(), (Class) w.invokeMethod(instance, "getClass", null, null)); Assertions.assertEquals(instance.hashCode(), (int) w.invokeMethod(instance, "hashCode", null, null)); Assertions.assertEquals(instance.toString(), (String) w.invokeMethod(instance, "toString", null, null)); - Assertions.assertEquals(true, (boolean) w.invokeMethod(instance, "equals", null, new Object[]{instance})); + Assertions.assertTrue((boolean)w.invokeMethod(instance, "equals", null, new Object[] {instance})); } @Test diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/compiler/support/ClassUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/compiler/support/ClassUtilsTest.java index 8acf00bfeef..3f9a26bcb3d 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/compiler/support/ClassUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/compiler/support/ClassUtilsTest.java @@ -104,7 +104,7 @@ public void testBoxedAndUnboxed() { Assertions.assertEquals(Float.valueOf((float) 0), ClassUtils.boxed((float) 0)); Assertions.assertEquals(Double.valueOf((double) 0), ClassUtils.boxed((double) 0)); - Assertions.assertEquals(true, ClassUtils.unboxed(Boolean.valueOf(true))); + Assertions.assertTrue(ClassUtils.unboxed(Boolean.valueOf(true))); Assertions.assertEquals('0', ClassUtils.unboxed(Character.valueOf('0'))); Assertions.assertEquals((byte) 0, ClassUtils.unboxed(Byte.valueOf((byte) 0))); Assertions.assertEquals((short) 0, ClassUtils.unboxed(Short.valueOf((short) 0))); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java index 89312eaf32e..f04ca89168b 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/ExtensionLoaderTest.java @@ -373,14 +373,14 @@ public void testLoadActivateExtension() throws Exception { List list = ExtensionLoader.getExtensionLoader(ActivateExt1.class) .getActivateExtension(url, new String[]{}, "default_group"); Assertions.assertEquals(1, list.size()); - Assertions.assertTrue(list.get(0).getClass() == ActivateExt1Impl1.class); + Assertions.assertSame(list.get(0).getClass(), ActivateExt1Impl1.class); // test group url = url.addParameter(GROUP_KEY, "group1"); list = ExtensionLoader.getExtensionLoader(ActivateExt1.class) .getActivateExtension(url, new String[]{}, "group1"); Assertions.assertEquals(1, list.size()); - Assertions.assertTrue(list.get(0).getClass() == GroupActivateExtImpl.class); + Assertions.assertSame(list.get(0).getClass(), GroupActivateExtImpl.class); // test old @Activate group url = url.addParameter(GROUP_KEY, "old_group"); @@ -397,7 +397,7 @@ public void testLoadActivateExtension() throws Exception { list = ExtensionLoader.getExtensionLoader(ActivateExt1.class) .getActivateExtension(url, new String[]{}, "value"); Assertions.assertEquals(1, list.size()); - Assertions.assertTrue(list.get(0).getClass() == ValueActivateExtImpl.class); + Assertions.assertSame(list.get(0).getClass(), ValueActivateExtImpl.class); // test order url = URL.valueOf("test://localhost/test"); @@ -405,8 +405,8 @@ public void testLoadActivateExtension() throws Exception { list = ExtensionLoader.getExtensionLoader(ActivateExt1.class) .getActivateExtension(url, new String[]{}, "order"); Assertions.assertEquals(2, list.size()); - Assertions.assertTrue(list.get(0).getClass() == OrderActivateExtImpl1.class); - Assertions.assertTrue(list.get(1).getClass() == OrderActivateExtImpl2.class); + Assertions.assertSame(list.get(0).getClass(), OrderActivateExtImpl1.class); + Assertions.assertSame(list.get(1).getClass(), OrderActivateExtImpl2.class); } @Test @@ -416,15 +416,15 @@ public void testLoadDefaultActivateExtension() throws Exception { List list = ExtensionLoader.getExtensionLoader(ActivateExt1.class) .getActivateExtension(url, "ext", "default_group"); Assertions.assertEquals(2, list.size()); - Assertions.assertTrue(list.get(0).getClass() == OrderActivateExtImpl1.class); - Assertions.assertTrue(list.get(1).getClass() == ActivateExt1Impl1.class); + Assertions.assertSame(list.get(0).getClass(), OrderActivateExtImpl1.class); + Assertions.assertSame(list.get(1).getClass(), ActivateExt1Impl1.class); url = URL.valueOf("test://localhost/test?ext=default,order1"); list = ExtensionLoader.getExtensionLoader(ActivateExt1.class) .getActivateExtension(url, "ext", "default_group"); Assertions.assertEquals(2, list.size()); - Assertions.assertTrue(list.get(0).getClass() == ActivateExt1Impl1.class); - Assertions.assertTrue(list.get(1).getClass() == OrderActivateExtImpl1.class); + Assertions.assertSame(list.get(0).getClass(), ActivateExt1Impl1.class); + Assertions.assertSame(list.get(1).getClass(), OrderActivateExtImpl1.class); } @Test diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java index 9181766fc7f..8b9a1d6399f 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extension/support/ActivateComparatorTest.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.common.extension.support; -import org.apache.dubbo.common.extension.Activate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONTest.java index 0a7f9063f33..98c342c2500 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONTest.java @@ -28,6 +28,8 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @Deprecated public class JSONTest { @@ -121,7 +123,7 @@ public void testParse2JSONObject() throws Exception { assertEquals(jo.getString("name"), "qianlei"); assertEquals(jo.getArray("array").length(), 5); assertEquals(jo.get("$2"), Boolean.FALSE); - assertEquals(jo.get("__3"), null); + assertNull(jo.get("__3")); for (int i = 0; i < 10000; i++) JSON.parse("{\"name\":\"qianlei\",\"array\":[1,2,3,4,98.123],\"displayName\":\"钱磊\"}"); @@ -150,7 +152,7 @@ public void testParse2Class() throws Exception { assertEquals(bean.getDisplayName(), "钱磊"); assertEquals(bean.array.length, 5); assertEquals(bean.$$, 214726); - assertEquals(bean.$b, true); + assertTrue(bean.$b); for (int i = 0; i < 10000; i++) JSON.parse("{name:'qianlei',array:[1,2,3,4,98.123],displayName:'钱磊'}", Bean1.class); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java index 60067a3b737..8c63ec0aec6 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java @@ -60,26 +60,26 @@ protected Integer initialValue() throws Exception { public void testRemoveAll() throws InterruptedException { final InternalThreadLocal internalThreadLocal = new InternalThreadLocal(); internalThreadLocal.set(1); - Assertions.assertTrue(internalThreadLocal.get() == 1, "set failed"); + Assertions.assertEquals(1, (int)internalThreadLocal.get(), "set failed"); final InternalThreadLocal internalThreadLocalString = new InternalThreadLocal(); internalThreadLocalString.set("value"); - Assertions.assertTrue("value".equals(internalThreadLocalString.get()), "set failed"); + Assertions.assertEquals("value", internalThreadLocalString.get(), "set failed"); InternalThreadLocal.removeAll(); - Assertions.assertTrue(internalThreadLocal.get() == null, "removeAll failed!"); - Assertions.assertTrue(internalThreadLocalString.get() == null, "removeAll failed!"); + Assertions.assertNull(internalThreadLocal.get(), "removeAll failed!"); + Assertions.assertNull(internalThreadLocalString.get(), "removeAll failed!"); } @Test public void testSize() throws InterruptedException { final InternalThreadLocal internalThreadLocal = new InternalThreadLocal(); internalThreadLocal.set(1); - Assertions.assertTrue(InternalThreadLocal.size() == 1, "size method is wrong!"); + Assertions.assertEquals(1, InternalThreadLocal.size(), "size method is wrong!"); final InternalThreadLocal internalThreadLocalString = new InternalThreadLocal(); internalThreadLocalString.set("value"); - Assertions.assertTrue(InternalThreadLocal.size() == 2, "size method is wrong!"); + Assertions.assertEquals(2, InternalThreadLocal.size(), "size method is wrong!"); } @Test @@ -87,18 +87,17 @@ public void testSetAndGet() { final Integer testVal = 10; final InternalThreadLocal internalThreadLocal = new InternalThreadLocal(); internalThreadLocal.set(testVal); - Assertions.assertTrue( - Objects.equals(testVal, internalThreadLocal.get()), "set is not equals get"); + Assertions.assertEquals(testVal, internalThreadLocal.get(), "set is not equals get"); } @Test public void testRemove() { final InternalThreadLocal internalThreadLocal = new InternalThreadLocal(); internalThreadLocal.set(1); - Assertions.assertTrue(internalThreadLocal.get() == 1, "get method false!"); + Assertions.assertEquals(1, (int)internalThreadLocal.get(), "get method false!"); internalThreadLocal.remove(); - Assertions.assertTrue(internalThreadLocal.get() == null, "remove failed!"); + Assertions.assertNull(internalThreadLocal.get(), "remove failed!"); } @Test @@ -112,10 +111,10 @@ protected void onRemoval(Integer value) throws Exception { } }; internalThreadLocal.set(1); - Assertions.assertTrue(internalThreadLocal.get() == 1, "get method false!"); + Assertions.assertEquals(1, (int)internalThreadLocal.get(), "get method false!"); internalThreadLocal.remove(); - Assertions.assertTrue(valueToRemove[0] == 2, "onRemove method failed!"); + Assertions.assertEquals(2, (int)valueToRemove[0], "onRemove method failed!"); } @Test @@ -129,8 +128,7 @@ public void testMultiThreadSetAndGet() throws InterruptedException { public void run() { internalThreadLocal.set(testVal1); - Assertions.assertTrue( - Objects.equals(testVal1, internalThreadLocal.get()), "set is not equals get"); + Assertions.assertEquals(testVal1, internalThreadLocal.get(), "set is not equals get"); countDownLatch.countDown(); } }); @@ -140,8 +138,7 @@ public void run() { @Override public void run() { internalThreadLocal.set(testVal2); - Assertions.assertTrue( - Objects.equals(testVal2, internalThreadLocal.get()), "set is not equals get"); + Assertions.assertEquals(testVal2, internalThreadLocal.get(), "set is not equals get"); countDownLatch.countDown(); } }); diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java index 7b9619f12b2..346da3a5236 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java @@ -31,6 +31,6 @@ public void run() { } }); - Assertions.assertTrue(t.getClass().equals(InternalThread.class), "thread is not InternalThread"); + Assertions.assertEquals(t.getClass(), InternalThread.class, "thread is not InternalThread"); } } \ No newline at end of file diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java index ddbe8a0580c..c7d610f2c05 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java @@ -90,7 +90,7 @@ public void run() { } Thread.sleep(5000); // cores theads are all alive. - Assertions.assertTrue(executor.getPoolSize() == cores, "more than cores threads alive!"); + Assertions.assertEquals(executor.getPoolSize(), cores, "more than cores threads alive!"); } @Test @@ -98,9 +98,7 @@ public void testSPI() { ExecutorService executorService = (ExecutorService) ExtensionLoader.getExtensionLoader(ThreadPool.class) .getExtension("eager") .getExecutor(URL); - Assertions.assertTrue( - executorService.getClass() - .getSimpleName() - .equals("EagerThreadPoolExecutor"), "test spi fail!"); + Assertions.assertEquals("EagerThreadPoolExecutor", executorService.getClass() + .getSimpleName(), "test spi fail!"); } } \ No newline at end of file diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java index ff1ebd58cd7..30b1d44e211 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java @@ -86,7 +86,7 @@ public void testCompatibleTypeConvert() throws Exception { assertEquals(0, ((char[]) result).length); result = CompatibleTypeUtils.compatibleTypeConvert(null, char[].class); - assertEquals(null, result); + assertNull(result); } { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/MethodUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/MethodUtilsTest.java index cc15d111690..817eb2d6943 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/MethodUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/MethodUtilsTest.java @@ -32,7 +32,7 @@ public void testGetMethod() { } } Assertions.assertNotNull(getMethod); - Assertions.assertTrue(getMethod.getName().equals("getValue")); + Assertions.assertEquals("getValue", getMethod.getName()); } @Test @@ -44,7 +44,7 @@ public void testSetMethod() { } } Assertions.assertNotNull(setMethod); - Assertions.assertTrue(setMethod.getName().equals("setValue")); + Assertions.assertEquals("setValue", setMethod.getName()); } public class MethodTestClazz { diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java index dcaad275ea1..3595efb99f6 100644 --- a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java @@ -560,9 +560,9 @@ public void testMapField() throws Exception { Object obj = PojoUtils.generalize(data); Assertions.assertEquals(3, data.getChildren().size()); - assertTrue(data.getChildren().get("first").getClass() == Child.class); + assertSame(data.getChildren().get("first").getClass(), Child.class); Assertions.assertEquals(1, data.getList().size()); - assertTrue(data.getList().get(0).getClass() == Child.class); + assertSame(data.getList().get(0).getClass(), Child.class); TestData realizadData = (TestData) PojoUtils.realize(obj, TestData.class); Assertions.assertEquals(data.getChildren().size(), realizadData.getChildren().size()); @@ -620,7 +620,7 @@ public void testPojoList() throws Exception { assertTrue(realizeObject instanceof ListResult); ListResult listResult = (ListResult) realizeObject; List l = listResult.getResult(); - assertTrue(l.size() == 1); + assertEquals(1, l.size()); assertTrue(l.get(0) instanceof Parent); Parent realizeParent = (Parent) l.get(0); Assertions.assertEquals(parent.getName(), realizeParent.getName()); diff --git a/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java b/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java index 06eada996ec..9c811f5c9e6 100644 --- a/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java +++ b/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java @@ -42,6 +42,7 @@ import static org.hamcrest.Matchers.hasKey; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; public class MethodConfigTest { @@ -114,7 +115,7 @@ public void testConverMethodConfig2AsyncInfo() throws Exception{ ConsumerMethodModel.AsyncMethodInfo methodInfo = org.apache.dubbo.config.MethodConfig.convertMethodConfig2AyncInfo(methodConfig); - assertTrue(methodInfo.getOninvokeMethod().equals( Person.class.getMethod("setName", String.class))); + assertEquals(methodInfo.getOninvokeMethod(), Person.class.getMethod("setName", String.class)); } @Test diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java index d1e02636dd7..b77a33cbf56 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java @@ -133,13 +133,13 @@ public void testReferenceRetry() { public void testConstructWithReferenceAnnotation() throws NoSuchFieldException { Reference reference = getClass().getDeclaredField("innerTest").getAnnotation(Reference.class); ReferenceConfig referenceConfig = new ReferenceConfig(reference); - Assertions.assertTrue(referenceConfig.getMethods().size() == 1); + Assertions.assertEquals(1, referenceConfig.getMethods().size()); Assertions.assertEquals(((MethodConfig) referenceConfig.getMethods().get(0)).getName(), "sayHello"); - Assertions.assertTrue(((MethodConfig) referenceConfig.getMethods().get(0)).getTimeout() == 1300); - Assertions.assertTrue(((MethodConfig) referenceConfig.getMethods().get(0)).getRetries() == 4); + Assertions.assertEquals(1300, (int)((MethodConfig)referenceConfig.getMethods().get(0)).getTimeout()); + Assertions.assertEquals(4, (int)((MethodConfig)referenceConfig.getMethods().get(0)).getRetries()); Assertions.assertEquals(((MethodConfig) referenceConfig.getMethods().get(0)).getLoadbalance(), "random"); - Assertions.assertTrue(((MethodConfig) referenceConfig.getMethods().get(0)).getActives() == 3); - Assertions.assertTrue(((MethodConfig) referenceConfig.getMethods().get(0)).getExecutes() == 5); + Assertions.assertEquals(3, (int)((MethodConfig)referenceConfig.getMethods().get(0)).getActives()); + Assertions.assertEquals(5, (int)((MethodConfig)referenceConfig.getMethods().get(0)).getExecutes()); Assertions.assertTrue(((MethodConfig) referenceConfig.getMethods().get(0)).isAsync()); Assertions.assertEquals(((MethodConfig) referenceConfig.getMethods().get(0)).getOninvoke(), "i"); Assertions.assertEquals(((MethodConfig) referenceConfig.getMethods().get(0)).getOnreturn(), "r"); diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java index 5c0570e4ffc..70f3a963a3e 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java @@ -131,11 +131,11 @@ public Map convert(String[] source) { Assert.assertEquals(data, referenceBean.getParameters()); // Bean compare - Assert.assertEquals(null, referenceBean.getApplication()); - Assert.assertEquals(null, referenceBean.getModule()); - Assert.assertEquals(null, referenceBean.getConsumer()); - Assert.assertEquals(null, referenceBean.getMonitor()); - Assert.assertEquals(null, referenceBean.getRegistry()); + Assert.assertNull(referenceBean.getApplication()); + Assert.assertNull(referenceBean.getModule()); + Assert.assertNull(referenceBean.getConsumer()); + Assert.assertNull(referenceBean.getMonitor()); + Assert.assertNull(referenceBean.getRegistry()); } diff --git a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java index 069de915a67..13f1e00a2c8 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceBeanBuilderTest.java @@ -82,7 +82,7 @@ public void testBuild() throws Exception { Assert.assertEquals(true, referenceBean.isGeneric()); Assert.assertNull(referenceBean.isInjvm()); Assert.assertEquals(false, referenceBean.isCheck()); - Assert.assertEquals(null, referenceBean.isInit()); + Assert.assertNull(referenceBean.isInit()); Assert.assertEquals(true, referenceBean.getLazy()); Assert.assertEquals(true, referenceBean.getStubevent()); Assert.assertEquals("reconnect", referenceBean.getReconnect()); diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java index 217919f1d6f..332683358cc 100644 --- a/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java +++ b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java @@ -131,7 +131,7 @@ public void testNull(String cacheType, CacheFactory cacheFactory) { cacheFilter.invoke(invoker4, invocation); Result result1 = cacheFilter.invoke(invoker1, invocation); Result result2 = cacheFilter.invoke(invoker2, invocation); - Assertions.assertEquals(result1.getValue(), null); - Assertions.assertEquals(result2.getValue(), null); + Assertions.assertNull(result1.getValue()); + Assertions.assertNull(result2.getValue()); } } diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java index 4531efd0fd9..fbace3f21bd 100644 --- a/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java +++ b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test; import javax.validation.ValidationException; -import java.io.NotSerializableException; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java index 2467571ec29..c660a34cd21 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java +++ b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/identifier/MetadataIdentifierTest.java @@ -21,7 +21,6 @@ import static org.apache.dubbo.common.constants.CommonConstants.PATH_SEPARATOR; import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE; -import static org.apache.dubbo.metadata.identifier.MetadataIdentifier.META_DATA_STORE_TAG; /** * 2019/1/7 diff --git a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/support/AbstractMetadataReportTest.java b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/support/AbstractMetadataReportTest.java index d74c7905437..8a1ff7fdf26 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/support/AbstractMetadataReportTest.java +++ b/dubbo-metadata-report/dubbo-metadata-report-api/src/test/java/org/apache/dubbo/metadata/support/AbstractMetadataReportTest.java @@ -113,7 +113,7 @@ public void testRetry() throws InterruptedException, ClassNotFoundException { retryReport.metadataReportRetry.retryPeriod = 400L; URL url = URL.valueOf("dubbo://" + NetUtils.getLocalAddress().getHostName() + ":4444/org.apache.dubbo.TestService?version=1.0.0&application=vic"); Assertions.assertNull(retryReport.metadataReportRetry.retryScheduledFuture); - Assertions.assertTrue(retryReport.metadataReportRetry.retryCounter.get() == 0); + Assertions.assertEquals(0,retryReport.metadataReportRetry.retryCounter.get()); Assertions.assertTrue(retryReport.store.isEmpty()); Assertions.assertTrue(retryReport.failedReports.isEmpty()); @@ -207,16 +207,16 @@ public void testPublishAll() throws ClassNotFoundException, InterruptedException Map tmpMapResult = (Map) abstractMetadataReport.allMetadataReports.get(consumerMetadataIdentifier); Assertions.assertEquals(tmpMapResult.get("testPKey"), "9090"); Assertions.assertEquals(tmpMapResult.get("testKey"), "value"); - Assertions.assertTrue(abstractMetadataReport.store.size() == 3); + Assertions.assertEquals(3,abstractMetadataReport.store.size()); abstractMetadataReport.store.clear(); - Assertions.assertTrue(abstractMetadataReport.store.size() == 0); + Assertions.assertEquals(0,abstractMetadataReport.store.size()); abstractMetadataReport.publishAll(); Thread.sleep(200); - Assertions.assertTrue(abstractMetadataReport.store.size() == 3); + Assertions.assertEquals(3,abstractMetadataReport.store.size()); String v = abstractMetadataReport.store.get(providerMetadataIdentifier1.getUniqueKey(MetadataIdentifier.KeyTypeEnum.UNIQUE_KEY)); Gson gson = new Gson(); diff --git a/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java b/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java index 56d372c1d2b..a24711fddaf 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java +++ b/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java @@ -133,7 +133,7 @@ public void testFilter() throws Exception { Assertions.assertEquals("aaa", lastStatistics.getParameter(MonitorService.METHOD)); Assertions.assertEquals(NetUtils.getLocalHost() + ":20880", lastStatistics.getParameter(MonitorService.PROVIDER)); Assertions.assertEquals(NetUtils.getLocalHost(), lastStatistics.getAddress()); - Assertions.assertEquals(null, lastStatistics.getParameter(MonitorService.CONSUMER)); + Assertions.assertNull(lastStatistics.getParameter(MonitorService.CONSUMER)); Assertions.assertEquals(1, lastStatistics.getParameter(MonitorService.SUCCESS, 0)); Assertions.assertEquals(0, lastStatistics.getParameter(MonitorService.FAILURE, 0)); Assertions.assertEquals(1, lastStatistics.getParameter(MonitorService.CONCURRENT, 0)); @@ -173,7 +173,7 @@ public void testGenericFilter() throws Exception { Assertions.assertEquals("xxx", lastStatistics.getParameter(MonitorService.METHOD)); Assertions.assertEquals(NetUtils.getLocalHost() + ":20880", lastStatistics.getParameter(MonitorService.PROVIDER)); Assertions.assertEquals(NetUtils.getLocalHost(), lastStatistics.getAddress()); - Assertions.assertEquals(null, lastStatistics.getParameter(MonitorService.CONSUMER)); + Assertions.assertNull(lastStatistics.getParameter(MonitorService.CONSUMER)); Assertions.assertEquals(1, lastStatistics.getParameter(MonitorService.SUCCESS, 0)); Assertions.assertEquals(0, lastStatistics.getParameter(MonitorService.FAILURE, 0)); Assertions.assertEquals(1, lastStatistics.getParameter(MonitorService.CONCURRENT, 0)); diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/util/CommandHelperTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/util/CommandHelperTest.java index c45c0f78185..8f6ebc5bb9d 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/util/CommandHelperTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/util/CommandHelperTest.java @@ -22,7 +22,6 @@ import org.apache.dubbo.qos.command.impl.Offline; import org.apache.dubbo.qos.command.impl.Online; import org.apache.dubbo.qos.command.impl.Quit; -import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; import java.util.List; diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceRegistryTest.java index a71cd39dc45..7d5b7316384 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceRegistryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceRegistryTest.java @@ -22,7 +22,6 @@ import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.dubbo.common.utils.NetUtils; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; /** diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java index 6f42a8d4fcf..8b57cba6ddc 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryTest.java @@ -550,7 +550,7 @@ public void getCacheUrlsTest() { abstractRegistry.notify(testUrl, listener, urls); Assertions.assertTrue(notifySuccess); List cacheUrl = abstractRegistry.getCacheUrls(testUrl); - Assertions.assertTrue(cacheUrl.size() == 1); + Assertions.assertEquals(1,cacheUrl.size()); URL nullUrl = URL.valueOf("http://1.2.3.4:9090/registry?check=false&file=N/A&interface=com.testa"); cacheUrl = abstractRegistry.getCacheUrls(nullUrl); Assertions.assertTrue(Objects.isNull(cacheUrl)); diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/FailbackRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/FailbackRegistryTest.java index 3e4843328a6..ddcc783ef9f 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/FailbackRegistryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/FailbackRegistryTest.java @@ -203,7 +203,7 @@ public void notify(List urls) { countDownLatch.await(); Assertions.assertEquals(0, mockRegistry.getFailedRegistered().size()); FailbackRegistry.Holder h = new FailbackRegistry.Holder(registryUrl, listener); - Assertions.assertEquals(null, mockRegistry.getFailedSubscribed().get(h)); + Assertions.assertNull(mockRegistry.getFailedSubscribed().get(h)); Assertions.assertEquals(countDownLatch.getCount(), 0); } diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java index 5b9123ff587..7bf8197bff4 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java @@ -102,7 +102,7 @@ private RegistryDirectory getRegistryDirectory(URL url) { // asert empty List invokers = registryDirectory.list(invocation); Assertions.assertEquals(0, invokers.size()); - Assertions.assertEquals(false, registryDirectory.isAvailable()); + Assertions.assertFalse(registryDirectory.isAvailable()); return registryDirectory; } @@ -164,7 +164,7 @@ public void testNotified_Normal_withRouters() { RegistryDirectory registryDirectory = getRegistryDirectory(); test_Notified1invokers(registryDirectory); test_Notified_only_routers(registryDirectory); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); Assertions.assertTrue(LogUtil.checkNoError(), "notify no invoker urls ,should not error"); LogUtil.stop(); test_Notified2invokers(registryDirectory); @@ -181,7 +181,7 @@ public void testNotified_WithError() { serviceUrls.add(SERVICEURL); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); List invokers = registryDirectory.list(invocation); Assertions.assertEquals(1, invokers.size()); } @@ -205,8 +205,8 @@ private void testforbid(RegistryDirectory registryDirectory) { List serviceUrls = new ArrayList(); serviceUrls.add(new URL(EMPTY_PROTOCOL, ANYHOST_VALUE, 0, service, CATEGORY_KEY, PROVIDERS_CATEGORY)); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(false, - registryDirectory.isAvailable(), "invokers size=0 ,then the registry directory is not available"); + Assertions.assertFalse(registryDirectory.isAvailable(), + "invokers size=0 ,then the registry directory is not available"); try { registryDirectory.list(invocation); fail("forbid must throw RpcException"); @@ -224,7 +224,7 @@ public void test_NotifiedDubbo1() { URL Dubbo1URL = URL.valueOf("dubbo://127.0.0.1:9098?lazy=true"); serviceUrls.add(Dubbo1URL.addParameter("methods", "getXXX")); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); invocation = new RpcInvocation(); @@ -250,7 +250,7 @@ private void test_Notified1invokers(RegistryDirectory registryDirectory) { List serviceUrls = new ArrayList(); serviceUrls.add(SERVICEURL.addParameter("methods", "getXXX1").addParameter(APPLICATION_KEY, "mockApplicationName"));// .addParameter("refer.autodestroy", "true") registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); invocation = new RpcInvocation(); @@ -278,7 +278,7 @@ private void test_Notified2invokers(RegistryDirectory registryDirectory) { serviceUrls.add(SERVICEURL2.addParameter("methods", "getXXX1,getXXX2")); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); invocation = new RpcInvocation(); @@ -302,7 +302,7 @@ private void test_Notified3invokers(RegistryDirectory registryDirectory) { serviceUrls.add(SERVICEURL3.addParameter("methods", "getXXX1,getXXX2,getXXX3")); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); invocation = new RpcInvocation(); @@ -348,7 +348,7 @@ public void testParametersMerge() { Invoker invoker = (Invoker) invokers.get(0); URL url = invoker.getUrl(); - Assertions.assertEquals(null, url.getParameter("key")); + Assertions.assertNull(url.getParameter("key")); } // The parameters of the provider for the inspection service need merge { @@ -389,7 +389,7 @@ public void testParametersMerge() { Invoker invoker = (Invoker) invokers.get(0); URL url = invoker.getUrl(); - Assertions.assertEquals(false, url.getParameter(Constants.CHECK_KEY, false)); + Assertions.assertFalse(url.getParameter(Constants.CHECK_KEY, false)); } { serviceUrls.clear(); @@ -406,7 +406,7 @@ public void testParametersMerge() { } //test geturl { - Assertions.assertEquals(null, registryDirectory2.getUrl().getParameter("mock")); + Assertions.assertNull(registryDirectory2.getUrl().getParameter("mock")); serviceUrls.clear(); serviceUrls.add(SERVICEURL.addParameter(MOCK_KEY, "true")); registryDirectory2.notify(serviceUrls); @@ -429,18 +429,18 @@ public void testDestroy() { registryDirectory.notify(serviceUrls); List invokers = registryDirectory.list(invocation); - Assertions.assertEquals(true, registryDirectory.isAvailable()); - Assertions.assertEquals(true, invokers.get(0).isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); + Assertions.assertTrue(invokers.get(0).isAvailable()); registryDirectory.destroy(); - Assertions.assertEquals(false, registryDirectory.isAvailable()); - Assertions.assertEquals(false, invokers.get(0).isAvailable()); + Assertions.assertFalse(registryDirectory.isAvailable()); + Assertions.assertFalse(invokers.get(0).isAvailable()); registryDirectory.destroy(); List> cachedInvokers = registryDirectory.getInvokers(); Map> urlInvokerMap = registryDirectory.getUrlInvokerMap(); - Assertions.assertTrue(cachedInvokers == null); + Assertions.assertNull(cachedInvokers); Assertions.assertEquals(0, urlInvokerMap.size()); // List urls = mockRegistry.getSubscribedUrls(); @@ -535,7 +535,7 @@ public void testEmptyNotifyCauseForbidden() { invokers = registryDirectory.list(inv); } catch (RpcException e) { Assertions.assertEquals(RpcException.FORBIDDEN_EXCEPTION, e.getCode()); - Assertions.assertEquals(false, registryDirectory.isAvailable()); + Assertions.assertFalse(registryDirectory.isAvailable()); } serviceUrls.add(SERVICEURL.addParameter("methods", "getXXX1")); @@ -545,7 +545,7 @@ public void testEmptyNotifyCauseForbidden() { registryDirectory.notify(serviceUrls); inv.setMethodName("getXXX2"); invokers = registryDirectory.list(inv); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); Assertions.assertEquals(3, invokers.size()); } @@ -598,7 +598,7 @@ public void testNotifyoverrideUrls_beforeInvoker() { overrideUrls.add(URL.valueOf("override://0.0.0.0?timeout=1&connections=5")); registryDirectory.notify(overrideUrls); //The registry is initially pushed to override only, and the dirctory state should be false because there is no invoker. - Assertions.assertEquals(false, registryDirectory.isAvailable()); + Assertions.assertFalse(registryDirectory.isAvailable()); //After pushing two provider, the directory state is restored to true List serviceUrls = new ArrayList(); @@ -606,7 +606,7 @@ public void testNotifyoverrideUrls_beforeInvoker() { serviceUrls.add(SERVICEURL2.addParameter("timeout", "1000").addParameter("connections", "10")); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); //Start validation of parameter values @@ -633,7 +633,7 @@ public void testNotifyoverrideUrls_afterInvoker() { serviceUrls.add(SERVICEURL2.addParameter("timeout", "1000").addParameter("connections", "10")); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); List overrideUrls = new ArrayList(); overrideUrls.add(URL.valueOf("override://0.0.0.0?timeout=1&connections=5")); @@ -664,7 +664,7 @@ public void testNotifyoverrideUrls_withInvoker() { durls.add(URL.valueOf("override://0.0.0.0?timeout=1&connections=5")); registryDirectory.notify(durls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); //Start validation of parameter values @@ -700,7 +700,7 @@ public void testNotifyoverrideUrls_Nouse() { durls = new ArrayList(); durls.add(URL.valueOf("override://0.0.0.0?timeout=1&connections=5")); registryDirectory.notify(durls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); invokers = registryDirectory.list(invocation); Assertions.assertEquals(2, invokers.size()); @@ -710,10 +710,12 @@ public void testNotifyoverrideUrls_Nouse() { map2.put(invokers.get(1).getUrl().getAddress(), invokers.get(1)); //The parameters are different and must be rereferenced. - Assertions.assertFalse(map.get(SERVICEURL.getAddress()) == map2.get(SERVICEURL.getAddress()), "object should not same"); + Assertions.assertNotSame(map.get(SERVICEURL.getAddress()), map2.get(SERVICEURL.getAddress()), + "object should not same"); //The parameters can not be rereferenced - Assertions.assertTrue(map.get(SERVICEURL2.getAddress()) == map2.get(SERVICEURL2.getAddress()), "object should not same"); + Assertions.assertSame(map.get(SERVICEURL2.getAddress()), map2.get(SERVICEURL2.getAddress()), + "object should not same"); } /** @@ -781,7 +783,7 @@ public void testNofityOverrideUrls_CleanOnly() { List durls = new ArrayList(); durls.add(SERVICEURL.setHost("10.20.30.140").addParameter("timeout", "1")); registryDirectory.notify(durls); - Assertions.assertEquals(null, registryDirectory.getUrl().getParameter("mock")); + Assertions.assertNull(registryDirectory.getUrl().getParameter("mock")); //override durls = new ArrayList(); @@ -801,7 +803,7 @@ public void testNofityOverrideUrls_CleanOnly() { //Need to be restored to the original providerUrl Assertions.assertEquals("1", aInvoker.getUrl().getParameter("timeout")); - Assertions.assertEquals(null, registryDirectory.getUrl().getParameter("mock")); + Assertions.assertNull(registryDirectory.getUrl().getParameter("mock")); } /** @@ -976,7 +978,7 @@ public void testNotify_MockProviderOnly() { serviceUrls.add(SERVICEURL.setProtocol(MOCK_PROTOCOL)); registryDirectory.notify(serviceUrls); - Assertions.assertEquals(true, registryDirectory.isAvailable()); + Assertions.assertTrue(registryDirectory.isAvailable()); invocation = new RpcInvocation(); List invokers = registryDirectory.list(invocation); diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java index ee4e043fd95..5e84ece0348 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java @@ -44,6 +44,9 @@ import static org.apache.dubbo.rpc.cluster.Constants.EXPORT_KEY; import static org.apache.dubbo.registry.integration.RegistryProtocol.DEFAULT_REGISTER_PROVIDER_KEYS; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * RegistryProtocolTest @@ -112,7 +115,7 @@ public void testNotifyOverride() throws Exception { urls.add(URL.valueOf("override://0.0.0.0/" + service + "?x=y")); listener.notify(urls); - assertEquals(true, exporter.getInvoker().isAvailable()); + assertTrue(exporter.getInvoker().isAvailable()); assertEquals("100", exporter.getInvoker().getUrl().getParameter("timeout")); assertEquals("y", exporter.getInvoker().getUrl().getParameter("x")); @@ -139,8 +142,8 @@ public void testNotifyOverride_notmatch() throws Exception { List urls = new ArrayList(); urls.add(URL.valueOf("override://0.0.0.0/org.apache.dubbo.registry.protocol.HackService?timeout=100")); listener.notify(urls); - assertEquals(true, exporter.getInvoker().isAvailable()); - assertEquals(null, exporter.getInvoker().getUrl().getParameter("timeout")); + assertTrue(exporter.getInvoker().isAvailable()); + assertNull(exporter.getInvoker().getUrl().getParameter("timeout")); exporter.unexport(); destroyRegistryProtocol(); } @@ -159,7 +162,7 @@ public void testDestoryRegistry() { } catch (InterruptedException e) { e.printStackTrace(); } - assertEquals(false, exporter.getInvoker().isAvailable()); + assertFalse(exporter.getInvoker().isAvailable()); } diff --git a/dubbo-registry/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdRegistryTest.java b/dubbo-registry/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdRegistryTest.java index 15427903b81..f09ff804d15 100644 --- a/dubbo-registry/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdRegistryTest.java +++ b/dubbo-registry/dubbo-registry-etcd3/src/test/java/org/apache/dubbo/registry/etcd/EtcdRegistryTest.java @@ -124,13 +124,13 @@ public void test_unregister() { registry.register(serviceUrl); Set registered = registry.getRegistered(); - Assertions.assertTrue(registered.size() == 1); + Assertions.assertEquals(1, registered.size()); Assertions.assertTrue(registered.contains(serviceUrl)); registry.unregister(serviceUrl); registered = registry.getRegistered(); - Assertions.assertTrue(registered.size() == 0); + Assertions.assertEquals(0, registered.size()); } @Test @@ -152,8 +152,8 @@ public void notify(List urls) { @Test public void test_subscribe_when_register() throws InterruptedException { - Assertions.assertTrue(registry.getRegistered().size() == 0); - Assertions.assertTrue(registry.getSubscribed().size() == 0); + Assertions.assertEquals(0, registry.getRegistered().size()); + Assertions.assertEquals(0, registry.getSubscribed().size()); CountDownLatch notNotified = new CountDownLatch(2); @@ -177,8 +177,8 @@ public void notify(List urls) { @Test public void test_subscribe_when_register0() throws InterruptedException { - Assertions.assertTrue(registry.getRegistered().size() == 0); - Assertions.assertTrue(registry.getSubscribed().size() == 0); + Assertions.assertEquals(0, registry.getRegistered().size()); + Assertions.assertEquals(0, registry.getSubscribed().size()); CountDownLatch notNotified = new CountDownLatch(3); ConcurrentHashMap notifiedUrls = new ConcurrentHashMap<>(); @@ -210,8 +210,8 @@ public void notify(List urls) { @Test public void test_subscribe_when_register1() throws InterruptedException { - Assertions.assertTrue(registry.getRegistered().size() == 0); - Assertions.assertTrue(registry.getSubscribed().size() == 0); + Assertions.assertEquals(0, registry.getRegistered().size()); + Assertions.assertEquals(0, registry.getSubscribed().size()); CountDownLatch notNotified = new CountDownLatch(2); @@ -237,8 +237,8 @@ public void notify(List urls) { @Test public void test_subscribe_when_register2() throws InterruptedException { - Assertions.assertTrue(registry.getRegistered().size() == 0); - Assertions.assertTrue(registry.getSubscribed().size() == 0); + Assertions.assertEquals(0, registry.getRegistered().size()); + Assertions.assertEquals(0, registry.getSubscribed().size()); CountDownLatch notNotified = new CountDownLatch(3); @@ -263,7 +263,7 @@ public void notify(List urls) { registry.register(serviceUrl3); Assertions.assertTrue(notNotified.await(15, TimeUnit.SECONDS)); - Assertions.assertTrue(notifiedUrls.size() == 3); + Assertions.assertEquals(3, notifiedUrls.size()); Assertions.assertTrue(notifiedUrls.containsKey(serviceUrl)); Assertions.assertTrue(notifiedUrls.containsKey(serviceUrl2)); Assertions.assertTrue(notifiedUrls.containsKey(serviceUrl3)); @@ -272,8 +272,8 @@ public void notify(List urls) { @Test public void test_unsubscribe() throws InterruptedException { - Assertions.assertTrue(registry.getRegistered().size() == 0); - Assertions.assertTrue(registry.getSubscribed().size() == 0); + Assertions.assertEquals(0, registry.getRegistered().size()); + Assertions.assertEquals(0, registry.getSubscribed().size()); CountDownLatch notNotified = new CountDownLatch(2); @@ -299,13 +299,13 @@ public void notify(List urls) { Assertions.assertFalse(notNotified.await(2, TimeUnit.SECONDS)); // expect nothing happen - Assertions.assertTrue(notifiedUrl.get() == null); + Assertions.assertNull(notifiedUrl.get()); } @BeforeEach public void setUp() { registry = (EtcdRegistry) registryFactory.getRegistry(registryUrl); - Assertions.assertTrue(registry != null); + Assertions.assertNotNull(registry); if (!registry.isAvailable()) { AbstractRegistryFactory.destroyAll(); registry = (EtcdRegistry) registryFactory.getRegistry(registryUrl); diff --git a/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java b/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java index cfc15b2df95..88e4b1fa124 100644 --- a/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java +++ b/dubbo-registry/dubbo-registry-multiple/src/test/java/org/apache/dubbo/registry/multiple/MultipleRegistry2S2RTest.java @@ -91,25 +91,25 @@ public static void tearDown() throws Exception { @Test public void testParamConfig() { - Assertions.assertTrue(multipleRegistry.origReferenceRegistryURLs.size() == 2); + Assertions.assertEquals(2, multipleRegistry.origReferenceRegistryURLs.size()); Assertions.assertTrue(multipleRegistry.origReferenceRegistryURLs.contains(zookeeperRegistryURLStr)); Assertions.assertTrue(multipleRegistry.origReferenceRegistryURLs.contains(redisRegistryURLStr)); - Assertions.assertTrue(multipleRegistry.origServiceRegistryURLs.size() == 2); + Assertions.assertEquals(2, multipleRegistry.origServiceRegistryURLs.size()); Assertions.assertTrue(multipleRegistry.origServiceRegistryURLs.contains(zookeeperRegistryURLStr)); Assertions.assertTrue(multipleRegistry.origServiceRegistryURLs.contains(redisRegistryURLStr)); - Assertions.assertTrue(multipleRegistry.effectReferenceRegistryURLs.size() == 2); + Assertions.assertEquals(2, multipleRegistry.effectReferenceRegistryURLs.size()); Assertions.assertTrue(multipleRegistry.effectReferenceRegistryURLs.contains(zookeeperRegistryURLStr)); Assertions.assertTrue(multipleRegistry.effectReferenceRegistryURLs.contains(redisRegistryURLStr)); - Assertions.assertTrue(multipleRegistry.effectServiceRegistryURLs.size() == 2); + Assertions.assertEquals(2, multipleRegistry.effectServiceRegistryURLs.size()); Assertions.assertTrue(multipleRegistry.effectServiceRegistryURLs.contains(zookeeperRegistryURLStr)); Assertions.assertTrue(multipleRegistry.effectServiceRegistryURLs.contains(redisRegistryURLStr)); Assertions.assertTrue(multipleRegistry.getServiceRegistries().containsKey(zookeeperRegistryURLStr)); Assertions.assertTrue(multipleRegistry.getServiceRegistries().containsKey(redisRegistryURLStr)); - Assertions.assertTrue(multipleRegistry.getServiceRegistries().values().size() == 2); + Assertions.assertEquals(2, multipleRegistry.getServiceRegistries().values().size()); // java.util.Iterator registryIterable = multipleRegistry.getServiceRegistries().values().iterator(); // Registry firstRegistry = registryIterable.next(); // Registry secondRegistry = registryIterable.next(); @@ -152,14 +152,14 @@ public void notify(List urls) { } }); Thread.sleep(1500); - Assertions.assertTrue(list.size() == 2); + Assertions.assertEquals(2, list.size()); multipleRegistry.unregister(serviceUrl); Thread.sleep(1500); - Assertions.assertTrue(list.size() == 1); + Assertions.assertEquals(1, list.size()); List urls = MultipleRegistryTestUtil.getProviderURLsFromNotifyURLS(list); - Assertions.assertTrue(list.size() == 1); - Assertions.assertTrue("empty".equals(list.get(0).getProtocol())); + Assertions.assertEquals(1, list.size()); + Assertions.assertEquals("empty", list.get(0).getProtocol()); } @Test @@ -185,22 +185,22 @@ public void notify(List urls) { } }); Thread.sleep(1500); - Assertions.assertTrue(list.size() == 2); + Assertions.assertEquals(2, list.size()); List serviceRegistries = new ArrayList(multipleRegistry.getServiceRegistries().values()); serviceRegistries.get(0).unregister(serviceUrl); Thread.sleep(1500); - Assertions.assertTrue(list.size() == 1); + Assertions.assertEquals(1, list.size()); List urls = MultipleRegistryTestUtil.getProviderURLsFromNotifyURLS(list); - Assertions.assertTrue(list.size() == 1); + Assertions.assertEquals(1, list.size()); Assertions.assertTrue(!"empty".equals(list.get(0).getProtocol())); serviceRegistries.get(1).unregister(serviceUrl); Thread.sleep(1500); - Assertions.assertTrue(list.size() == 1); + Assertions.assertEquals(1, list.size()); urls = MultipleRegistryTestUtil.getProviderURLsFromNotifyURLS(list); - Assertions.assertTrue(list.size() == 1); - Assertions.assertTrue("empty".equals(list.get(0).getProtocol())); + Assertions.assertEquals(1, list.size()); + Assertions.assertEquals("empty", list.get(0).getProtocol()); } } diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java index 4fe272f3830..df3ac678249 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java @@ -233,8 +233,8 @@ public void test_Decode_Return_Request_Event_Object() throws IOException { Request obj = (Request) decode(request); Assertions.assertEquals(person, obj.getData()); - Assertions.assertEquals(true, obj.isTwoWay()); - Assertions.assertEquals(true, obj.isEvent()); + Assertions.assertTrue(obj.isTwoWay()); + Assertions.assertTrue(obj.isEvent()); Assertions.assertEquals(Version.getProtocolVersion(), obj.getVersion()); System.out.println(obj); } @@ -248,8 +248,8 @@ public void test_Decode_Return_Request_Event_String() throws IOException { Request obj = (Request) decode(request); Assertions.assertEquals(event, obj.getData()); - Assertions.assertEquals(true, obj.isTwoWay()); - Assertions.assertEquals(true, obj.isEvent()); + Assertions.assertTrue(obj.isTwoWay()); + Assertions.assertTrue(obj.isEvent()); Assertions.assertEquals(Version.getProtocolVersion(), obj.getVersion()); System.out.println(obj); } @@ -260,9 +260,9 @@ public void test_Decode_Return_Request_Heartbeat_Object() throws IOException { byte[] header = new byte[]{MAGIC_HIGH, MAGIC_LOW, (byte) 0xe2, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; byte[] request = getRequestBytes(null, header); Request obj = (Request) decode(request); - Assertions.assertEquals(null, obj.getData()); - Assertions.assertEquals(true, obj.isTwoWay()); - Assertions.assertEquals(true, obj.isHeartbeat()); + Assertions.assertNull(obj.getData()); + Assertions.assertTrue(obj.isTwoWay()); + Assertions.assertTrue(obj.isHeartbeat()); Assertions.assertEquals(Version.getProtocolVersion(), obj.getVersion()); System.out.println(obj); } @@ -276,8 +276,8 @@ public void test_Decode_Return_Request_Object() throws IOException { Request obj = (Request) decode(request); Assertions.assertEquals(person, obj.getData()); - Assertions.assertEquals(true, obj.isTwoWay()); - Assertions.assertEquals(false, obj.isHeartbeat()); + Assertions.assertTrue(obj.isTwoWay()); + Assertions.assertFalse(obj.isHeartbeat()); Assertions.assertEquals(Version.getProtocolVersion(), obj.getVersion()); System.out.println(obj); } @@ -293,8 +293,8 @@ public void test_Decode_Error_Request_Object() throws IOException { System.arraycopy(badbytes, 0, request, 21, badbytes.length); Request obj = (Request) decode(request); - Assertions.assertEquals(true, obj.isBroken()); - Assertions.assertEquals(true, obj.getData() instanceof Throwable); + Assertions.assertTrue(obj.isBroken()); + Assertions.assertTrue(obj.getData() instanceof Throwable); } @Test @@ -398,7 +398,7 @@ public void test_Encode_Error_Response() throws IOException { Assertions.assertEquals(response.getStatus(), obj.getStatus()); Assertions.assertEquals(response.isHeartbeat(), obj.isHeartbeat()); Assertions.assertEquals(badString, obj.getErrorMessage()); - Assertions.assertEquals(null, obj.getResult()); + Assertions.assertNull(obj.getResult()); // Assertions.assertEquals(response.getProtocolVersion(), obj.getVersion()); } @@ -431,10 +431,10 @@ public void testMessageLengthGreaterThanMessageActualLength() throws Exception { /* request|1111...|request */ ChannelBuffer decodeBuffer = ChannelBuffers.wrappedBuffer(out.toByteArray()); Request decodedRequest = (Request) codec.decode(channel, decodeBuffer); - Assertions.assertTrue(date.equals(decodedRequest.getData())); + Assertions.assertEquals(date, decodedRequest.getData()); Assertions.assertEquals(bytes.length + padding, decodeBuffer.readerIndex()); decodedRequest = (Request) codec.decode(channel, decodeBuffer); - Assertions.assertTrue(date.equals(decodedRequest.getData())); + Assertions.assertEquals(date, decodedRequest.getData()); } @Test diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/ConnectChannelHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/ConnectChannelHandlerTest.java index b61a6004283..d3aeb5efa4a 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/ConnectChannelHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/ConnectChannelHandlerTest.java @@ -136,7 +136,7 @@ public void test_Received_Event_invoke_direct() throws RemotingException { handler.received(new MockedChannel() { @Override public void send(Object message) throws RemotingException { - Assertions.assertEquals(true, ((Response) message).isHeartbeat(), "response.heartbeat"); + Assertions.assertTrue(((Response) message).isHeartbeat(), "response.heartbeat"); count.incrementAndGet(); } }, req); diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/HeaderExchangeHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/HeaderExchangeHandlerTest.java index ca26a647f34..531c51e5550 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/HeaderExchangeHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/HeaderExchangeHandlerTest.java @@ -70,7 +70,7 @@ public void send(Object message) throws RemotingException { Assertions.assertEquals(request.getVersion(), res.getVersion()); Assertions.assertEquals(Response.OK, res.getStatus()); Assertions.assertEquals(requestdata, res.getResult()); - Assertions.assertEquals(null, res.getErrorMessage()); + Assertions.assertNull(res.getErrorMessage()); count.incrementAndGet(); } }; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/AbstractCodecTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/AbstractCodecTest.java index ec6c83d0873..44ea23338a2 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/AbstractCodecTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/AbstractCodecTest.java @@ -16,14 +16,13 @@ */ package org.apache.dubbo.remoting.transport; +import java.io.IOException; + import org.apache.dubbo.common.URL; import org.apache.dubbo.remoting.Channel; -import org.junit.jupiter.api.Assertions; import org.hamcrest.CoreMatchers; import org.mockito.internal.verification.VerificationModeFactory; -import java.io.IOException; - import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.BDDMockito.given; diff --git a/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java b/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java index 6dcf812987a..9f91a82144c 100644 --- a/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java +++ b/dubbo-remoting/dubbo-remoting-etcd3/src/test/java/org/apache/dubbo/remoting/etcd/jetcd/JEtcdClientTest.java @@ -337,12 +337,12 @@ public void test_watch_on_recoverable_connection() throws InterruptedException { switch (notified.increaseAndGet()) { case 1: { notNotified.countDown(); - Assertions.assertTrue(children.size() == 1); + Assertions.assertEquals(1, children.size()); Assertions.assertEquals(child.substring(child.lastIndexOf("/") + 1), children.get(0)); break; } case 2: { - Assertions.assertTrue(children.size() == 0); + Assertions.assertEquals(0, children.size()); Assertions.assertEquals(path, parent); break; } diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java index 27c8f718b23..04484096333 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java @@ -92,8 +92,8 @@ public void testHeartbeat() throws Exception { Thread.sleep(10000); System.err.println("++++++++++++++ disconnect count " + handler.disconnectCount); System.err.println("++++++++++++++ connect count " + handler.connectCount); - Assertions.assertTrue(handler.disconnectCount == 0); - Assertions.assertTrue(handler.connectCount == 1); + Assertions.assertEquals(0, handler.disconnectCount); + Assertions.assertEquals(1, handler.connectCount); } @Test diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientReconnectTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientReconnectTest.java index 939cd10b7c0..d328eb099d2 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientReconnectTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientReconnectTest.java @@ -45,24 +45,24 @@ public void testReconnect() throws RemotingException, InterruptedException { { int port = NetUtils.getAvailablePort(); Client client = startClient(port, 200); - Assertions.assertEquals(false, client.isConnected()); + Assertions.assertFalse(client.isConnected()); Server server = startServer(port); for (int i = 0; i < 100 && !client.isConnected(); i++) { Thread.sleep(10); } - Assertions.assertEquals(true, client.isConnected()); + Assertions.assertTrue(client.isConnected()); client.close(2000); server.close(2000); } { int port = NetUtils.getAvailablePort(); Client client = startClient(port, 20000); - Assertions.assertEquals(false, client.isConnected()); + Assertions.assertFalse(client.isConnected()); Server server = startServer(port); for (int i = 0; i < 5; i++) { Thread.sleep(200); } - Assertions.assertEquals(false, client.isConnected()); + Assertions.assertFalse(client.isConnected()); client.close(2000); server.close(2000); } diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java index 51c4907b361..9a2065a99cf 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java @@ -47,24 +47,24 @@ public void testReconnect() throws RemotingException, InterruptedException { { int port = NetUtils.getAvailablePort(); Client client = startClient(port, 200); - Assertions.assertEquals(false, client.isConnected()); + Assertions.assertFalse(client.isConnected()); Server server = startServer(port); for (int i = 0; i < 100 && !client.isConnected(); i++) { Thread.sleep(10); } - Assertions.assertEquals(true, client.isConnected()); + Assertions.assertTrue(client.isConnected()); client.close(2000); server.close(2000); } { int port = NetUtils.getAvailablePort(); Client client = startClient(port, 20000); - Assertions.assertEquals(false, client.isConnected()); + Assertions.assertFalse(client.isConnected()); Server server = startServer(port); for (int i = 0; i < 5; i++) { Thread.sleep(200); } - Assertions.assertEquals(false, client.isConnected()); + Assertions.assertFalse(client.isConnected()); client.close(2000); server.close(2000); } diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java index f1882e1c759..1732e783684 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java @@ -23,7 +23,6 @@ import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.framework.recipes.cache.TreeCacheEvent; -import org.apache.curator.framework.recipes.cache.TreeCacheListener; import org.apache.curator.retry.ExponentialBackoffRetry; import org.apache.curator.test.TestingServer; import org.apache.zookeeper.WatchedEvent; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporterTest.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporterTest.java index 2fe78745add..e051dc9602e 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporterTest.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporterTest.java @@ -16,7 +16,6 @@ */ package org.apache.dubbo.remoting.zookeeper.curator; -import org.apache.curator.test.TestingServer; import org.apache.dubbo.common.URL; import org.apache.dubbo.common.utils.NetUtils; import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/AppResponseTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/AppResponseTest.java index 2fcace07a9a..284e1df9c51 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/AppResponseTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/AppResponseTest.java @@ -44,7 +44,7 @@ public void testAppResponseWithEmptyStackTraceException() { StackTraceElement[] stackTrace = appResponse.getException().getStackTrace(); Assertions.assertNotNull(stackTrace); - Assertions.assertTrue(stackTrace.length == 0); + Assertions.assertEquals(0,stackTrace.length); } @Test @@ -72,7 +72,7 @@ public void testSetExceptionWithEmptyStackTraceException() { StackTraceElement[] stackTrace = appResponse.getException().getStackTrace(); Assertions.assertNotNull(stackTrace); - Assertions.assertTrue(stackTrace.length == 0); + Assertions.assertEquals(0,stackTrace.length); } private Throwable buildEmptyStackTraceException() { diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java index 86717ef7011..c9154d9e90b 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/RpcContextTest.java @@ -50,17 +50,17 @@ public void testGetContext() { public void testAddress() { RpcContext context = RpcContext.getContext(); context.setLocalAddress("127.0.0.1", 20880); - Assertions.assertTrue(context.getLocalAddress().getPort() == 20880); + Assertions.assertEquals(20880, context.getLocalAddress().getPort()); Assertions.assertEquals("127.0.0.1:20880", context.getLocalAddressString()); context.setRemoteAddress("127.0.0.1", 20880); - Assertions.assertTrue(context.getRemoteAddress().getPort() == 20880); + Assertions.assertEquals(20880, context.getRemoteAddress().getPort()); Assertions.assertEquals("127.0.0.1:20880", context.getRemoteAddressString()); context.setRemoteAddress("127.0.0.1", -1); context.setLocalAddress("127.0.0.1", -1); - Assertions.assertTrue(context.getRemoteAddress().getPort() == 0); - Assertions.assertTrue(context.getLocalAddress().getPort() == 0); + Assertions.assertEquals(0, context.getRemoteAddress().getPort()); + Assertions.assertEquals(0, context.getLocalAddress().getPort()); Assertions.assertEquals("127.0.0.1", context.getRemoteHostName()); Assertions.assertEquals("127.0.0.1", context.getLocalHostName()); } diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java index 86308072576..78c0c9cb0ec 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java @@ -35,9 +35,9 @@ public void tearDown() throws Exception { public void testIsAllowable() throws Exception { statItem = new StatItem("test", 5, 1000L); long lastResetTime = statItem.getLastResetTime(); - assertEquals(true, statItem.isAllowable()); + assertTrue(statItem.isAllowable()); Thread.sleep(1100L); - assertEquals(true, statItem.isAllowable()); + assertTrue(statItem.isAllowable()); assertTrue(lastResetTime != statItem.getLastResetTime()); assertEquals(4, statItem.getToken()); } diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java index a38c43777f2..6a326c295ae 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java @@ -53,7 +53,7 @@ public void testAttachInvocationIdIfAsync_normal() { long id1 = RpcUtils.getInvocationId(inv); RpcUtils.attachInvocationIdIfAsync(url, inv); long id2 = RpcUtils.getInvocationId(inv); - assertTrue(id1 == id2); // verify if it's idempotent + assertEquals(id1, id2); // verify if it's idempotent assertTrue(id1 >= 0); assertEquals("bb", attachments.get("aa")); } @@ -139,8 +139,8 @@ public void testGetReturnTypes() throws Exception { Invocation inv4 = new RpcInvocation("testReturnType4", new Class[]{String.class}, null, null, invoker); java.lang.reflect.Type[] types4 = RpcUtils.getReturnTypes(inv4); Assertions.assertEquals(2, types4.length); - Assertions.assertEquals(null, types4[0]); - Assertions.assertEquals(null, types4[1]); + Assertions.assertNull(types4[0]); + Assertions.assertNull(types4[1]); Invocation inv5 = new RpcInvocation("testReturnType5", new Class[]{String.class}, null, null, invoker); java.lang.reflect.Type[] types5 = RpcUtils.getReturnTypes(inv5); diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java index 1d8c212b99f..ec07a87b89e 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java @@ -65,9 +65,9 @@ public void test_Normal_available() { ProtocolUtils.export(new DemoServiceImpl(), IDemoService.class, url); DubboInvoker invoker = (DubboInvoker) protocol.protocolBindingRefer(IDemoService.class, url); - Assertions.assertEquals(true, invoker.isAvailable()); + Assertions.assertTrue(invoker.isAvailable()); invoker.destroy(); - Assertions.assertEquals(false, invoker.isAvailable()); + Assertions.assertFalse(invoker.isAvailable()); } @Test @@ -76,11 +76,11 @@ public void test_Normal_ChannelReadOnly() throws Exception { ProtocolUtils.export(new DemoServiceImpl(), IDemoService.class, url); DubboInvoker invoker = (DubboInvoker) protocol.protocolBindingRefer(IDemoService.class, url); - Assertions.assertEquals(true, invoker.isAvailable()); + Assertions.assertTrue(invoker.isAvailable()); getClients(invoker)[0].setAttribute(Constants.CHANNEL_ATTRIBUTE_READONLY_KEY, Boolean.TRUE); - Assertions.assertEquals(false, invoker.isAvailable()); + Assertions.assertFalse(invoker.isAvailable()); // reset status since connection is shared among invokers getClients(invoker)[0].removeAttribute(Constants.CHANNEL_ATTRIBUTE_READONLY_KEY); @@ -107,7 +107,7 @@ public void test_normal_channel_close_wait_gracefully() throws Exception { long waitTime = System.currentTimeMillis() - start; Assertions.assertTrue(waitTime >= 2000); - Assertions.assertEquals(false, invoker.isAvailable()); + Assertions.assertFalse(invoker.isAvailable()); } @Test @@ -119,7 +119,7 @@ public void test_NoInvokers() throws Exception { ExchangeClient[] clients = getClients(invoker); clients[0].close(); - Assertions.assertEquals(false, invoker.isAvailable()); + Assertions.assertFalse(invoker.isAvailable()); } @@ -129,7 +129,7 @@ public void test_Lazy_ChannelReadOnly() throws Exception { ProtocolUtils.export(new DemoServiceImpl(), IDemoService.class, url); AsyncToSyncInvoker invoker = (AsyncToSyncInvoker) protocol.refer(IDemoService.class, url); - Assertions.assertEquals(true, invoker.isAvailable()); + Assertions.assertTrue(invoker.isAvailable()); try { getClients((DubboInvoker) invoker.getInvoker())[0].setAttribute(Constants.CHANNEL_ATTRIBUTE_READONLY_KEY, Boolean.TRUE); fail(); @@ -140,9 +140,9 @@ public void test_Lazy_ChannelReadOnly() throws Exception { IDemoService service = (IDemoService) proxy.getProxy(invoker); Assertions.assertEquals("ok", service.get()); - Assertions.assertEquals(true, invoker.isAvailable()); + Assertions.assertTrue(invoker.isAvailable()); getClients((DubboInvoker) invoker.getInvoker())[0].setAttribute(Constants.CHANNEL_ATTRIBUTE_READONLY_KEY, Boolean.TRUE); - Assertions.assertEquals(false, invoker.isAvailable()); + Assertions.assertFalse(invoker.isAvailable()); } private ExchangeClient[] getClients(DubboInvoker invoker) throws Exception { diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java index 0a3a9d161b5..5085a447cf8 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java @@ -173,7 +173,7 @@ public void test_Ex_OnReturn() throws Exception { int requestId = 2; Person ret = demoProxy.get(requestId); - Assertions.assertEquals(null, ret); + Assertions.assertNull(ret); for (int i = 0; i < 10; i++) { if (!notify.errors.containsKey(requestId)) { Thread.sleep(200); @@ -193,7 +193,7 @@ public void test_Ex_OnInvoke() throws Exception { int requestId = 2; Person ret = demoProxy.get(requestId); - Assertions.assertEquals(null, ret); + Assertions.assertNull(ret); for (int i = 0; i < 10; i++) { if (!notify.inv.contains(requestId)) { Thread.sleep(200); @@ -213,7 +213,7 @@ public void test_Ex_Onthrow() throws Exception { int requestId = 2; Person ret = demoProxy.get(requestId); - Assertions.assertEquals(null, ret); + Assertions.assertNull(ret); for (int i = 0; i < 10; i++) { if (!notify.errors.containsKey(requestId)) { Thread.sleep(200); @@ -247,7 +247,7 @@ public void test_Async_Future() throws Exception { int requestId = 2; Person ret = demoProxy.get(requestId); - Assertions.assertEquals(null, ret); + Assertions.assertNull(ret); Future pFuture = RpcContext.getContext().getFuture(); ret = pFuture.get(1000 * 1000, TimeUnit.MICROSECONDS); Assertions.assertEquals(requestId, ret.getId()); @@ -261,12 +261,12 @@ public void test_Async_Future_Multi() throws Exception { int requestId1 = 1; Person ret = demoProxy.get(requestId1); - Assertions.assertEquals(null, ret); + Assertions.assertNull(ret); Future p1Future = RpcContext.getContext().getFuture(); int requestId2 = 1; Person ret2 = demoProxy.get(requestId2); - Assertions.assertEquals(null, ret2); + Assertions.assertNull(ret2); Future p2Future = RpcContext.getContext().getFuture(); ret = p1Future.get(1000 * 1000, TimeUnit.MICROSECONDS); @@ -285,7 +285,7 @@ public void test_Async_Future_Ex() throws Throwable { int requestId = 2; Person ret = demoProxy.get(requestId); - Assertions.assertEquals(null, ret); + Assertions.assertNull(ret); Future pFuture = RpcContext.getContext().getFuture(); ret = pFuture.get(1000 * 1000, TimeUnit.MICROSECONDS); Assertions.assertEquals(requestId, ret.getId()); diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java index 52972801778..70c6ec8fba8 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java @@ -123,7 +123,7 @@ public void test_mult_share_connect() { Assertions.assertEquals(shareConnectionNum, demoReferenceClientList.size()); // because helloServiceInvoker and demoServiceInvoker use share connect， so client list must be equal - Assertions.assertTrue(Objects.equals(helloReferenceClientList, demoReferenceClientList)); + Assertions.assertEquals(helloReferenceClientList, demoReferenceClientList); Assertions.assertEquals(demoClient.getLocalAddress(), helloClient.getLocalAddress()); Assertions.assertEquals(demoClient, helloClient); @@ -186,7 +186,7 @@ public void test_counter_error() { DubboAppender.doStop(); // status switch to available once invoke again - Assertions.assertEquals(true, helloServiceInvoker.isAvailable(), "client status available"); + Assertions.assertTrue(helloServiceInvoker.isAvailable(), "client status available"); /** * This is the third time to close the same client. Under normal circumstances, @@ -201,8 +201,8 @@ public void test_counter_error() { // client has been replaced with lazy client. lazy client is fetched from referenceclientmap, and since it's // been invoked once, it's close status is false - Assertions.assertEquals(false, client.isClosed(), "client status close"); - Assertions.assertEquals(false, helloServiceInvoker.isAvailable(), "client status close"); + Assertions.assertFalse(client.isClosed(), "client status close"); + Assertions.assertFalse(helloServiceInvoker.isAvailable(), "client status close"); destoy(); } diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java index 81e971bea31..50be9435bfe 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java @@ -20,7 +20,6 @@ import org.apache.dubbo.remoting.RemotingException; import org.apache.dubbo.remoting.telnet.TelnetHandler; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java index 691f925216c..06d9fa577b2 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java @@ -134,7 +134,7 @@ public void testValidation() { Assertions.fail(); } catch (ConstraintViolationException ve) { Set> violations = ve.getConstraintViolations(); - Assertions.assertTrue(violations.size() == 3); + Assertions.assertEquals(3, violations.size()); Assertions.assertNotNull(violations); } diff --git a/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpProtocolTest.java b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpProtocolTest.java index 009f01d1924..29a4b1c8ae5 100644 --- a/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpProtocolTest.java @@ -174,7 +174,7 @@ public void testTimeOut() { client.timeOut(6000); fail(); } catch (RpcException expected) { - Assertions.assertEquals(true, expected.isTimeout()); + Assertions.assertTrue(expected.isTimeout()); } finally { invoker.destroy(); exporter.unexport(); diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java index 15e685611ed..64f8b5da1cc 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java @@ -25,10 +25,8 @@ import javax.servlet.ServletContext; import javax.ws.rs.core.Application; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; import java.net.URI; -import java.net.URISyntaxException; import java.util.HashSet; import java.util.Set; diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocolTest.java b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocolTest.java index 4dcd21dfccb..3e50501b459 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocolTest.java @@ -32,6 +32,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class RmiProtocolTest { private Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension(); @@ -54,8 +55,8 @@ public void testRmiProtocolTimeout() throws Exception { try { service.throwTimeout(); } catch (RpcException e) { - assertEquals(true, e.isTimeout()); - assertEquals(true, e.getMessage().contains("Read timed out")); + assertTrue(e.isTimeout()); + assertTrue(e.getMessage().contains("Read timed out")); } } finally { rpcExporter.unexport(); diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodecTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodecTest.java index 8cdbae7f99e..a8c66a71f85 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodecTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodecTest.java @@ -183,7 +183,7 @@ public void testDecodeReplyResponse() throws Exception { Assertions.assertNotNull(obj); - Assertions.assertEquals(true, obj instanceof Response); + Assertions.assertTrue(obj instanceof Response); Response response = (Response) obj; diff --git a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java index 5ff4cb2344e..84d5edb6fe6 100644 --- a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/base/AbstractSerializationTest.java @@ -294,7 +294,7 @@ public void test_Float() throws Exception { byteArrayOutputStream.toByteArray()); ObjectInput deserialize = serialization.deserialize(url, byteArrayInputStream); - assertTrue(1.28F == deserialize.readFloat()); + assertEquals(1.28F,deserialize.readFloat()); try { deserialize.readFloat(); @@ -315,7 +315,7 @@ public void test_Double() throws Exception { byteArrayOutputStream.toByteArray()); ObjectInput deserialize = serialization.deserialize(url, byteArrayInputStream); - assertTrue(1.28 == deserialize.readDouble()); + assertEquals(1.28,deserialize.readDouble()); try { deserialize.readDouble(); @@ -1070,7 +1070,7 @@ public void test_MultiObject() throws Exception { byteArrayOutputStream.toByteArray()); ObjectInput deserialize = serialization.deserialize(url, byteArrayInputStream); - assertEquals(false, deserialize.readBool()); + assertFalse(deserialize.readBool()); assertEquals(bigPerson, deserialize.readObject()); assertEquals((byte) 23, deserialize.readByte()); assertEquals(mediaContent, deserialize.readObject()); @@ -1097,7 +1097,7 @@ public void test_MultiObject_WithType() throws Exception { byteArrayOutputStream.toByteArray()); ObjectInput deserialize = serialization.deserialize(url, byteArrayInputStream); - assertEquals(false, deserialize.readBool()); + assertFalse(deserialize.readBool()); assertEquals(bigPerson, deserialize.readObject(BigPerson.class)); assertEquals((byte) 23, deserialize.readByte()); assertEquals(mediaContent, deserialize.readObject(MediaContent.class)); diff --git a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/hessian2/Hessian2PersonOkTest.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/hessian2/Hessian2PersonOkTest.java index 8fa793c8b26..3d454b2c394 100644 --- a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/hessian2/Hessian2PersonOkTest.java +++ b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/hessian2/Hessian2PersonOkTest.java @@ -19,7 +19,6 @@ import org.apache.dubbo.common.serialize.ObjectInput; import org.apache.dubbo.common.serialize.ObjectOutput; import org.apache.dubbo.common.serialize.base.AbstractSerializationPersonOkTest; -import org.apache.dubbo.common.serialize.java.JavaSerialization; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; diff --git a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java index 02c278e00b0..07021f98eed 100644 --- a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/protostuff/ProtostuffSerializationTest.java @@ -18,7 +18,6 @@ package org.apache.dubbo.common.serialize.protostuff; import org.apache.dubbo.common.serialize.base.AbstractSerializationTest; -import org.junit.jupiter.api.Test; public class ProtostuffSerializationTest extends AbstractSerializationTest { { diff --git a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistryTest.java b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistryTest.java index 2b7c9583e6e..8f5a9de13ff 100644 --- a/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistryTest.java +++ b/dubbo-serialization/dubbo-serialization-test/src/test/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistryTest.java @@ -20,7 +20,6 @@ import org.apache.dubbo.common.serialize.model.person.Phone; import org.junit.jupiter.api.Test; -import java.io.Serializable; import java.util.Map; import static org.hamcrest.Matchers.equalTo;