diff --git a/trpc-registry/trpc-registry-api/pom.xml b/trpc-registry/trpc-registry-api/pom.xml index e8c8fd449f..22462d8a91 100644 --- a/trpc-registry/trpc-registry-api/pom.xml +++ b/trpc-registry/trpc-registry-api/pom.xml @@ -27,6 +27,11 @@ com.tencent.trpc trpc-core + + org.mockito + mockito-core + test + diff --git a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenterTest.java b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenterTest.java index 96544d7893..fbacb05c95 100644 --- a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenterTest.java +++ b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenterTest.java @@ -37,10 +37,10 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class AbstractFailedRetryRegistryCenterTest { @@ -55,7 +55,7 @@ public class AbstractFailedRetryRegistryCenterTest { private static String serverCacheFilePath = "/tmp/server_zookeeper.cache"; private static int CACHE_EXPIRE_TIME = 1; - @Before + @BeforeEach public void setUp() throws Exception { clientRegistry = buildFailedRetryRegistryCenter(); clientRegistry.setPluginConfig(initPluginConfig()); @@ -63,7 +63,7 @@ public void setUp() throws Exception { serverRegistry.setPluginConfig(initPluginConfig()); } - @After + @AfterEach public void tearDown() throws Exception { clientRegistry.destroy(); serverRegistry.destroy(); @@ -198,49 +198,49 @@ private void delCacheFile() { @Test public void testRegistry() throws InterruptedException { - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); RegisterInfo registerInfo = buildRegisterInfo(); clientRegistry.register(registerInfo); - Assert.assertEquals(1, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getFailedTasks().size()); Thread.sleep(500); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); } @Test public void testUnregistry() throws InterruptedException { this.testRegistry(); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); RegisterInfo registerInfo = buildRegisterInfo(); clientRegistry.unregister(registerInfo); - Assert.assertEquals(1, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getFailedTasks().size()); Thread.sleep(500); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); } @Test public void testSubscribe() throws InterruptedException { this.delCacheFile(); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); RegisterInfo registerInfo = buildRegisterInfo(); NotifyListener discovery = getNotifyListener(registerInfo); clientRegistry.subscribe(registerInfo, discovery); - Assert.assertEquals(1, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getFailedTasks().size()); Thread.sleep(500); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); } @Test public void testUnsubscribe() throws InterruptedException { this.testSubscribe(); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); RegisterInfo registerInfo = buildRegisterInfo(); NotifyListener discovery = getNotifyListener(registerInfo); clientRegistry.unsubscribe(registerInfo, discovery); - Assert.assertEquals(1, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getFailedTasks().size()); Thread.sleep(500); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); } @Test @@ -253,13 +253,13 @@ public void testNotify() throws InterruptedException { registerInfos.add(buildRegisterInfo("test.service2")); NotifyListener discovery = getNotifyListener(registerInfo); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); clientRegistry.notify(registerInfo, discovery, registerInfos); - Assert.assertEquals(1, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getFailedTasks().size()); Thread.sleep(500); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); - Assert.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size()); - Assert.assertEquals(10, + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size()); + Assertions.assertEquals(10, clientRegistry.getNotifiedRegisterInfos().get(registerInfo).getRegisterInfos( RegistryCenterEnum.transferFrom(DEFAULT_REGISTRY_CENTER_SERVICE_TYPE)).size()); } @@ -269,7 +269,7 @@ public void testNotify2() throws InterruptedException { RegisterInfo registerInfo = buildRegisterInfo(); NotifyListener discovery = getNotifyListener(registerInfo); clientRegistry.notify(registerInfo, discovery, Lists.newArrayList()); - Assert.assertEquals(1, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getFailedTasks().size()); } /** @@ -278,13 +278,13 @@ public void testNotify2() throws InterruptedException { @Test public void testSubscribeCache() throws InterruptedException { this.testNotify(); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); RegisterInfo registerInfo = buildRegisterInfo(); NotifyListener discovery = getNotifyListener(registerInfo); clientRegistry.subscribe(registerInfo, discovery); - Assert.assertEquals(1, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(1, clientRegistry.getFailedTasks().size()); Thread.sleep(500); - Assert.assertEquals(0, clientRegistry.getFailedTasks().size()); + Assertions.assertEquals(0, clientRegistry.getFailedTasks().size()); } @Test @@ -295,9 +295,9 @@ public void testRecover() throws NoSuchMethodException, InvocationTargetExceptio Method method = clientRegistry.getClass().getSuperclass().getSuperclass().getDeclaredMethod("recover"); method.setAccessible(true); method.invoke(clientRegistry); - Assert.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); - Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); - Assert.assertEquals(1, + Assertions.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().get(buildRegisterInfo()).getNotifyListeners().size()); } @@ -332,7 +332,7 @@ public void testNotifyListenerHolderEquals() { RegisterInfoListenerHolder registerInfoListenerHolder = new RegisterInfoListenerHolder(registerInfo, notifyListener); boolean test = registerInfoListenerHolder.equals("test"); - Assert.assertFalse(test); + Assertions.assertFalse(test); } diff --git a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java index cc92c31ecd..0d4fd60201 100644 --- a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java +++ b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java @@ -33,10 +33,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class AbstractRegistryCenterTest { @@ -49,7 +49,7 @@ public class AbstractRegistryCenterTest { private static String serverCacheFilePath = "/tmp/server_zookeeper.cache"; private static int CACHE_EXPIRE_TIME = 1; - @Before + @BeforeEach public void setUp() throws Exception { clientRegistry = new AbstractRegistryCenter() { @Override @@ -87,7 +87,7 @@ public void init() throws TRpcExtensionException { } } - @After + @AfterEach public void tearDown() throws Exception { this.delCacheFile(); clientRegistry.destroy(); @@ -160,9 +160,9 @@ public void destroy() throws TRpcExtensionException { @Test public void testRegistry() { RegisterInfo registerInfo = buildRegisterInfo(); - Assert.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size()); clientRegistry.register(registerInfo); - Assert.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); } @@ -171,7 +171,7 @@ public void testUnregistry() { this.testRegistry(); RegisterInfo registerInfo = buildRegisterInfo(); clientRegistry.unregister(registerInfo); - Assert.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size()); } @Test @@ -179,10 +179,10 @@ public void testSubscribe() { RegisterInfo registerInfo = buildRegisterInfo(); NotifyListener discovery = getNotifyListener(registerInfo); - Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); clientRegistry.subscribe(registerInfo, discovery); - Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); - Assert.assertEquals(1, + Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().get(registerInfo).getNotifyListeners().size()); } @@ -192,7 +192,7 @@ public void testUnsubscribe() { RegisterInfo registerInfo = buildRegisterInfo(); NotifyListener discovery = getNotifyListener(registerInfo); clientRegistry.unsubscribe(registerInfo, discovery); - Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); } @Test @@ -205,10 +205,10 @@ public void testNotify() { registerInfos.add(buildRegisterInfo("test.service2")); NotifyListener discovery = getNotifyListener(registerInfo); - Assert.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size()); clientRegistry.notify(registerInfo, discovery, registerInfos); - Assert.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size()); - Assert.assertEquals(10, + Assertions.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size()); + Assertions.assertEquals(10, clientRegistry.getNotifiedRegisterInfos().get(registerInfo).getRegisterInfos( RegistryCenterEnum.transferFrom(DEFAULT_REGISTRY_CENTER_SERVICE_TYPE)).size()); } @@ -217,10 +217,10 @@ public void testNotify() { public void testNotify01() { RegisterInfo registerInfo = buildRegisterInfo(); NotifyListener discovery = getNotifyListener(registerInfo); - Assert.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size()); clientRegistry.notify(registerInfo, discovery, Lists.newArrayList()); - Assert.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size()); - Assert.assertEquals(0, + Assertions.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().get(registerInfo).getRegisterInfos( RegistryCenterEnum.transferFrom(DEFAULT_REGISTRY_CENTER_SERVICE_TYPE)).size()); } @@ -233,8 +233,8 @@ public void testDestroy() { NotifyListener discovery = getNotifyListener(registerInfo); clientRegistry.subscribe(registerInfo, discovery); clientRegistry.destroy(); - Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); - Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); } @Test @@ -244,7 +244,7 @@ public void testGetCache() { RegisterInfo registerInfo = buildRegisterInfo(); List registerInfos = clientRegistry.cache .getRegisterInfos(registerInfo.getServiceName()); - Assert.assertEquals(10, registerInfos.size()); + Assertions.assertEquals(10, registerInfos.size()); } @Test @@ -255,9 +255,9 @@ public void testRecover() Method method = clientRegistry.getClass().getSuperclass().getDeclaredMethod("recover"); method.setAccessible(true); method.invoke(clientRegistry); - Assert.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); - Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); - Assert.assertEquals(1, + Assertions.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().get(buildRegisterInfo()).getNotifyListeners().size()); } @@ -275,7 +275,7 @@ public void testExpireCache() Thread.sleep((CACHE_EXPIRE_TIME + 1) * 1000); List registerInfos = clientRegistry.cache .getRegisterInfos(buildRegisterInfo().getServiceName()); - Assert.assertEquals(0, registerInfos.size()); + Assertions.assertEquals(0, registerInfos.size()); } @@ -298,7 +298,7 @@ public void testRedoExpireCache() Thread.sleep((CACHE_EXPIRE_TIME + 1) * 1000); List registerInfos = clientRegistry.cache .getRegisterInfos(buildRegisterInfo().getServiceName()); - Assert.assertEquals(10, registerInfos.size()); + Assertions.assertEquals(10, registerInfos.size()); } @Test @@ -318,7 +318,7 @@ public void testInvalidSyncFile() initPluginConfig("0.0.0.0", 2181, false, false, "/xxxx/" + serverCacheFilePath, CACHE_EXPIRE_TIME)); } catch (Exception e) { - Assert.assertTrue(e instanceof IllegalArgumentException); + Assertions.assertTrue(e instanceof IllegalArgumentException); } } diff --git a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/common/ConstantsTest.java b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/common/ConstantsTest.java index d9640b9d8d..c2d8264422 100644 --- a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/common/ConstantsTest.java +++ b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/common/ConstantsTest.java @@ -13,7 +13,7 @@ import com.tencent.trpc.core.logger.Logger; import com.tencent.trpc.core.logger.LoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; diff --git a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/discovery/RegistryDiscoveryTest.java b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/discovery/RegistryDiscoveryTest.java index aff1e4e120..8bffce79dc 100644 --- a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/discovery/RegistryDiscoveryTest.java +++ b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/discovery/RegistryDiscoveryTest.java @@ -30,9 +30,9 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class RegistryDiscoveryTest { @@ -41,7 +41,7 @@ public class RegistryDiscoveryTest { private static RegistryDiscovery discovery; private static AbstractRegistryCenter clientRegistry; - @Before + @BeforeEach public void setUp() throws Exception { clientRegistry = new AbstractRegistryCenter() { @Override @@ -65,12 +65,12 @@ private RegisterInfo buildRegisterInfo(int port) { @Test public void testSelfRegistry() { - Assert.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size()); } @Test public void testSubscribe() { - Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size()); } @Test @@ -80,7 +80,7 @@ public void testNotify() { registerInfos.add(buildRegisterInfo(12000 + i)); } discovery.notify(registerInfos); - Assert.assertEquals(10, discovery.getServiceInstances().size()); + Assertions.assertEquals(10, discovery.getServiceInstances().size()); } @Test @@ -88,9 +88,9 @@ public void testList() { this.testNotify(); ServiceId serviceId = new ServiceId(); serviceId.setServiceName("test.service1"); - Assert.assertEquals(10, discovery.list(serviceId).size()); + Assertions.assertEquals(10, discovery.list(serviceId).size()); serviceId.setServiceName("test.service2"); - Assert.assertEquals(0, discovery.list(serviceId).size()); + Assertions.assertEquals(0, discovery.list(serviceId).size()); } @@ -102,10 +102,10 @@ public void testAsyncList() throws ExecutionException, InterruptedException { Executor executor = Executors.newSingleThreadExecutor(); - Assert.assertEquals(10, discovery.asyncList(serviceId, executor).toCompletableFuture() + Assertions.assertEquals(10, discovery.asyncList(serviceId, executor).toCompletableFuture() .get().size()); serviceId.setServiceName("test.service2"); - Assert.assertEquals(0, + Assertions.assertEquals(0, discovery.asyncList(serviceId, executor).toCompletableFuture().get().size()); } diff --git a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/factory/AbstractRegistryFactoryTest.java b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/factory/AbstractRegistryFactoryTest.java index 28730d665d..c2684935c6 100644 --- a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/factory/AbstractRegistryFactoryTest.java +++ b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/factory/AbstractRegistryFactoryTest.java @@ -19,8 +19,8 @@ import com.tencent.trpc.registry.center.AbstractRegistryCenter; import com.tencent.trpc.registry.center.NotifyListener; import com.tencent.trpc.registry.center.RegistryCenter; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collection; import java.util.HashMap; @@ -195,7 +195,7 @@ public void getRegistries() { Map registriesMap = AbstractRegistryFactory.REGISTRIES; registriesMap.clear(); Collection registries = AbstractRegistryFactory.getRegistries(); - Assert.assertEquals(0, registries.size()); + Assertions.assertEquals(0, registries.size()); } @Test @@ -203,7 +203,7 @@ public void getRegistry() { Map registries = AbstractRegistryFactory.REGISTRIES; registries.put("test", null); AbstractRegistryCenter registryCenter = AbstractRegistryFactory.getRegistry("test"); - Assert.assertNull(registryCenter); + Assertions.assertNull(registryCenter); } @Test @@ -213,7 +213,7 @@ public void connect04() { extMap.put("addresses", "127.0.0.1:8500"); protocolConfig.setExtMap(extMap); RegistryCenter registryCenter = registryFactory.connect(protocolConfig); - Assert.assertNotNull(registryCenter); + Assertions.assertNotNull(registryCenter); AbstractRegistryFactory.clearRegistryNotDestroy(); } @@ -224,18 +224,18 @@ public void connect() { extMap.put("addresses", "127.0.0.1:8500"); protocolConfig.setExtMap(extMap); RegistryCenter registryCenter = registryFactory.connect(protocolConfig); - Assert.assertNotNull(registryCenter); + Assertions.assertNotNull(registryCenter); AbstractRegistryFactory.destroyAll(); AbstractRegistryCenter registryCenterT = registryFactory.connect(protocolConfig); - Assert.assertNotNull(registryCenterT); + Assertions.assertNotNull(registryCenterT); registryCenterT.unsubscribe(null, null); registryCenterT.subscribe(null, null); registryCenterT.register(null); registryCenterT.unregister(null); registryCenterT.destroy(); boolean available = registryCenterT.isAvailable(); - Assert.assertFalse(available); + Assertions.assertFalse(available); } @Test @@ -262,7 +262,7 @@ public void connect02() { registries.put("127.0.0.1:8500", registryCenter); RegistryCenter registryCenter = registryFactory02.connect(protocolConfig); - Assert.assertNotNull(registryCenter); + Assertions.assertNotNull(registryCenter); } @@ -304,4 +304,4 @@ public void createRegistry() { public void removeDestroyedRegistry() { } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/task/AbstractRetryTaskTest.java b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/task/AbstractRetryTaskTest.java index 8968f78145..ec7d10cb9b 100644 --- a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/task/AbstractRetryTaskTest.java +++ b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/task/AbstractRetryTaskTest.java @@ -24,8 +24,8 @@ import com.tencent.trpc.registry.center.NotifyListener; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** @@ -70,7 +70,7 @@ public boolean cancel() { * * @throws Exception */ - @Before + @BeforeEach public void setUp() throws Exception { Map properties = new HashMap<>(); properties.put("test", "test"); @@ -175,4 +175,4 @@ public boolean cancel() { } } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/util/RegistryCenterCacheTest.java b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/util/RegistryCenterCacheTest.java index 2c5f1a8791..5c46ba723e 100644 --- a/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/util/RegistryCenterCacheTest.java +++ b/trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/util/RegistryCenterCacheTest.java @@ -23,34 +23,27 @@ import com.tencent.trpc.registry.common.RegistryCenterConfig; import com.tencent.trpc.registry.common.RegistryCenterData; import com.tencent.trpc.registry.common.RegistryCenterEnum; -import java.io.File; +import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.junit.runner.RunWith; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; /** * Test class for registry cache. */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({RegistryCenterCache.class}) public class RegistryCenterCacheTest { private static final Logger LOGGER = LoggerFactory.getLogger(RegistryCenterCacheTest.class); - @Rule - public TemporaryFolder folder = new TemporaryFolder(); + @TempDir + Path tempDir; @Test public void testNormal() { try { - PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(folder.newFile("testfile1.txt")); - RegistryCenterConfig registryCenterConfig = new RegistryCenterConfig(initPluginConfig()); + String cachePath = tempDir.resolve("cache").toString(); + RegistryCenterConfig registryCenterConfig = new RegistryCenterConfig(initPluginConfig(cachePath)); RegisterInfo registerInfo = new RegisterInfo("trpc", "0.0.0.0", 12001, "test.service1"); RegistryCenterData registryCenterData = new RegistryCenterData(); @@ -67,11 +60,10 @@ public void testNormal() { @Test public void testRetry() { try { - PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(folder.newFile("testfile1.txt")); - RegistryCenterConfig registryCenterConfig = new RegistryCenterConfig(initPluginConfig()); + String cachePath = tempDir.resolve("cache").toString(); + RegistryCenterConfig registryCenterConfig = new RegistryCenterConfig(initPluginConfig(cachePath)); RegistryCenterCache cache = new RegistryCenterCache(registryCenterConfig); - PowerMockito.when(cache, "syncToDisk").thenThrow(new IllegalArgumentException("error")); RegisterInfo registerInfo = new RegisterInfo("trpc", "0.0.0.0", 12001, "test.service1"); RegistryCenterData registryCenterData = new RegistryCenterData(); @@ -84,13 +76,13 @@ public void testRetry() { } } - private PluginConfig initPluginConfig() { + private PluginConfig initPluginConfig(String cachePath) { Map properties = new HashMap<>(); properties.put("ip", "0.0.0.0"); properties.put("port", 2181); properties.put(REGISTRY_CENTER_SAVE_CACHE_KEY, true); properties.put(REGISTRY_CENTER_SYNCED_SAVE_CACHE_KEY, true); - properties.put(REGISTRY_CENTER_CACHE_FILE_PATH_KEY, "/tmp/cache"); + properties.put(REGISTRY_CENTER_CACHE_FILE_PATH_KEY, cachePath); PluginConfig pluginConfig = new PluginConfig("zookeeper", AbstractRegistryCenter.class, properties); return pluginConfig; diff --git a/trpc-registry/trpc-registry-consul/pom.xml b/trpc-registry/trpc-registry-consul/pom.xml index 7c7f402d91..91c84174f1 100644 --- a/trpc-registry/trpc-registry-consul/pom.xml +++ b/trpc-registry/trpc-registry-consul/pom.xml @@ -47,5 +47,10 @@ cn.hutool hutool-all + + org.mockito + mockito-core + test + diff --git a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/consul/ConsulRegistryTest.java b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/consul/ConsulRegistryTest.java index 520bd5a241..50fcaf6300 100644 --- a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/consul/ConsulRegistryTest.java +++ b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/consul/ConsulRegistryTest.java @@ -23,17 +23,17 @@ import com.tencent.trpc.core.worker.support.thread.ThreadWorkerPool; import com.tencent.trpc.registry.center.NotifyListener; import com.tencent.trpc.support.ConsulInstanceManager; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@TestMethodOrder(MethodOrderer.MethodName.class) public class ConsulRegistryTest { NotifyListener notifyListener = new NotifyListener() { @@ -160,7 +160,7 @@ public void testDoSubscribe() { ConsulClient consulClient = Mockito.mock(ConsulClient.class); List healthServices = new ArrayList<>(); Response> response = new Response<>(healthServices, 10L, true, 2L); - PowerMockito.when(consulClient.getHealthServices(Mockito.anyString(), Mockito.any(HealthServicesRequest.class))) + Mockito.when(consulClient.getHealthServices(Mockito.anyString(), Mockito.any(HealthServicesRequest.class))) .thenReturn(response); ConsulInstanceManager consulInstanceManager = new ConsulInstanceManager(protocolConfig); @@ -177,7 +177,7 @@ public void testDoSubscribe() { ConsulClient consulClient01 = Mockito.mock(ConsulClient.class); Map> healthServices01 = new HashMap<>(); Response>> response01 = new Response<>(healthServices01, 10L, true, 2L); - PowerMockito.when(consulClient01.getCatalogServices(Mockito.any(CatalogServicesRequest.class))) + Mockito.when(consulClient01.getCatalogServices(Mockito.any(CatalogServicesRequest.class))) .thenReturn(response01); ConsulInstanceManager consulInstanceManager01 = new ConsulInstanceManager(protocolConfig); consulInstanceManager01.resetClient(consulClient01); @@ -208,7 +208,7 @@ public void testDoUnsubscribe() { ConsulClient consulClient = Mockito.mock(ConsulClient.class); List healthServices = new ArrayList<>(); Response> response = new Response<>(healthServices, 1L, true, 2L); - PowerMockito.when(consulClient.getHealthServices(Mockito.anyString(), Mockito.any(HealthServicesRequest.class))) + Mockito.when(consulClient.getHealthServices(Mockito.anyString(), Mockito.any(HealthServicesRequest.class))) .thenReturn(response); ConsulInstanceManager consulInstanceManager = new ConsulInstanceManager(protocolConfig); @@ -269,7 +269,7 @@ public void testZDestroy() { List healthServices = new ArrayList<>(); Response> response = new Response<>(healthServices, 1L, true, 2L); - PowerMockito.when(consulClient.getHealthServices(Mockito.anyString(), Mockito.any(HealthServicesRequest.class))) + Mockito.when(consulClient.getHealthServices(Mockito.anyString(), Mockito.any(HealthServicesRequest.class))) .thenReturn(response); ProtocolConfig protocolConfig = new ProtocolConfig(); @@ -284,4 +284,4 @@ public void testZDestroy() { consulRegistry.destroy(); } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/scheduler/TtlSchedulerTest.java b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/scheduler/TtlSchedulerTest.java index f504d24b0e..54275362cd 100644 --- a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/scheduler/TtlSchedulerTest.java +++ b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/registry/scheduler/TtlSchedulerTest.java @@ -14,8 +14,8 @@ import com.ecwid.consul.v1.ConsulClient; import com.tencent.trpc.core.common.config.ProtocolConfig; import com.tencent.trpc.support.ConsulInstanceManager; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.HashMap; import java.util.Map; @@ -26,7 +26,7 @@ public class TtlSchedulerTest { private TtlScheduler ttlScheduler; private String serviceId = "trpc.test.testName"; - @Before + @BeforeEach public void setUp() { Map extMap = new HashMap<>(); @@ -57,4 +57,4 @@ public void add() { ttlScheduler.stop(); } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/constant/ConsulConstantTest.java b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/constant/ConsulConstantTest.java index 90d5afcd5e..7fcd6fb3e7 100644 --- a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/constant/ConsulConstantTest.java +++ b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/constant/ConsulConstantTest.java @@ -13,7 +13,7 @@ import com.tencent.trpc.core.logger.Logger; import com.tencent.trpc.core.logger.LoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; public class ConsulConstantTest { @@ -31,4 +31,4 @@ public void testCkvConstant() { LOGGER.warn("newInstance warn {}", e); } } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulClientProxyTest.java b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulClientProxyTest.java index 89a1da3662..5fa59a1bf0 100644 --- a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulClientProxyTest.java +++ b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulClientProxyTest.java @@ -13,7 +13,7 @@ import com.ecwid.consul.v1.ConsulClient; import com.tencent.trpc.support.ConsulInstanceManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** @@ -29,4 +29,4 @@ public void getProxy() { consulClientProxy.resetConsulClient(consulClient); } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulExceptionProcessHandlerTest.java b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulExceptionProcessHandlerTest.java index 693091b911..b0d6933c91 100644 --- a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulExceptionProcessHandlerTest.java +++ b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/proxy/ConsulExceptionProcessHandlerTest.java @@ -14,7 +14,7 @@ import com.tencent.trpc.core.logger.Logger; import com.tencent.trpc.core.logger.LoggerFactory; import com.tencent.trpc.support.ConsulInstanceManager; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.concurrent.Callable; @@ -68,4 +68,4 @@ public void intercept02() throws Exception { } } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/util/ConsulNewServiceUtilsTest.java b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/util/ConsulNewServiceUtilsTest.java index a94b520950..824d0498d9 100644 --- a/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/util/ConsulNewServiceUtilsTest.java +++ b/trpc-registry/trpc-registry-consul/src/test/java/com/tencent/trpc/support/util/ConsulNewServiceUtilsTest.java @@ -14,8 +14,8 @@ import com.ecwid.consul.v1.health.model.HealthService; import com.google.common.collect.Lists; import com.tencent.trpc.core.registry.RegisterInfo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; @@ -42,6 +42,6 @@ public void convert() { healthService.setService(service); List convertList = ConsulServiceUtils.convert(Lists.newArrayList(healthService), registerInfo); - Assert.assertEquals(1, convertList.size()); + Assertions.assertEquals(1, convertList.size()); } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-nacos/pom.xml b/trpc-registry/trpc-registry-nacos/pom.xml index 4b49bac7dc..dc06d80094 100644 --- a/trpc-registry/trpc-registry-nacos/pom.xml +++ b/trpc-registry/trpc-registry-nacos/pom.xml @@ -47,5 +47,10 @@ com.alibaba.nacos nacos-api + + org.mockito + mockito-core + test + diff --git a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/NacosRegistryCenterTest.java b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/NacosRegistryCenterTest.java similarity index 85% rename from trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/NacosRegistryCenterTest.java rename to trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/NacosRegistryCenterTest.java index bd4ef3ef09..10e35e75c9 100644 --- a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/NacosRegistryCenterTest.java +++ b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/NacosRegistryCenterTest.java @@ -16,13 +16,15 @@ import com.tencent.trpc.core.exception.TRpcExtensionException; import com.tencent.trpc.core.registry.RegisterInfo; import com.tencent.trpc.registry.center.NotifyListener; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.List; import java.util.Map; import static org.mockito.Mockito.mock; +import org.junit.jupiter.api.Assertions; + public class NacosRegistryCenterTest { @@ -36,15 +38,16 @@ public void setPluginConfig() { nacosRegistryCenter.setPluginConfig(pluginConfig); } - @Test(expected = IllegalStateException.class) - public void init() { - Map properties = new HashMap<>(); - properties.put("username", "testUserName"); - PluginConfig pluginConfig = new PluginConfig("nacos", NacosRegistryCenter.class, properties); - - NacosRegistryCenter nacosRegistryCenter = new NacosRegistryCenter(); - nacosRegistryCenter.setPluginConfig(pluginConfig); - nacosRegistryCenter.init(); + @Test + void init() { + Assertions.assertThrows(IllegalStateException.class, () -> { + Map properties = new HashMap<>(); + properties.put("username", "testUserName"); + PluginConfig pluginConfig = new PluginConfig("nacos", NacosRegistryCenter.class, properties); + NacosRegistryCenter nacosRegistryCenter = new NacosRegistryCenter(); + nacosRegistryCenter.setPluginConfig(pluginConfig); + nacosRegistryCenter.init(); + }); } @Test @@ -107,4 +110,4 @@ public void isAvailable() { nacosRegistryCenter.isAvailable(); } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/config/NacosRegistryCenterConfigTest.java b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/config/NacosRegistryCenterConfigTest.java similarity index 71% rename from trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/config/NacosRegistryCenterConfigTest.java rename to trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/config/NacosRegistryCenterConfigTest.java index ae11950616..f68d91b7eb 100644 --- a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/config/NacosRegistryCenterConfigTest.java +++ b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/config/NacosRegistryCenterConfigTest.java @@ -14,28 +14,29 @@ import java.util.HashMap; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.alibaba.nacos.api.PropertyKeyConst; import com.tencent.trpc.core.common.config.PluginConfig; import com.tencent.trpc.registry.nacos.NacosRegistryCenter; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; import static com.tencent.trpc.registry.nacos.util.StringConstantFieldValuePredicateUtils.of; public class NacosRegistryCenterConfigTest { - @Test(expected = IllegalArgumentException.class) - public void getParametersParamException() { - PluginConfig pluginConfig = new PluginConfig("nacos", - NacosRegistryCenter.class, (Map) null); - NacosRegistryCenterConfig config = new NacosRegistryCenterConfig(pluginConfig); - - Map parameters = config.getParameters(); - Assert.assertNull(parameters); + @Test + void getParametersParamException() { + Assertions.assertThrows(IllegalArgumentException.class, () -> { + PluginConfig pluginConfig = new PluginConfig("nacos", + NacosRegistryCenter.class, (Map) null); + NacosRegistryCenterConfig config = new NacosRegistryCenterConfig(pluginConfig); + Map parameters = config.getParameters(); + Assertions.assertNull(parameters); + }); } @Test @@ -60,4 +61,4 @@ public void testGetParameters() { assertEquals("testUserName", parameters.get("username")); assertNull(parameters.get("namespace")); } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/util/NacosNamingServiceUtilsTest.java b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/util/NacosNamingServiceUtilsTest.java similarity index 67% rename from trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/util/NacosNamingServiceUtilsTest.java rename to trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/util/NacosNamingServiceUtilsTest.java index a3420a59f2..0b58ef6302 100644 --- a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/util/NacosNamingServiceUtilsTest.java +++ b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/util/NacosNamingServiceUtilsTest.java @@ -16,8 +16,8 @@ import java.util.List; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.pojo.Instance; @@ -47,26 +47,27 @@ public void convert() { "trpc.TestApp.TestServer.Greeter1Naming"); List registerInfos = NacosNamingServiceUtils.convert(instances, registerInfo); - Assert.assertNotNull(registerInfos); - Assert.assertEquals(registerInfos.get(0).getPort(), 12345); + Assertions.assertNotNull(registerInfos); + Assertions.assertEquals(registerInfos.get(0).getPort(), 12345); // Instance为空的 List emptyInstances = new ArrayList<>(); List emptyRegisterInfos = NacosNamingServiceUtils.convert(emptyInstances, registerInfo); - Assert.assertNotNull(emptyRegisterInfos); - Assert.assertEquals(emptyRegisterInfos.get(0).getPort(), 0); + Assertions.assertNotNull(emptyRegisterInfos); + Assertions.assertEquals(emptyRegisterInfos.get(0).getPort(), 0); } - @Test(expected = IllegalStateException.class) - public void createNamingService() { - Map properties = new HashMap<>(); - properties.put("addresses", "127.0.0.1:8844"); - properties.put("username", "testUserName"); - PluginConfig pluginConfig = new PluginConfig("nacos", NacosRegistryCenter.class, properties); - NacosRegistryCenterConfig config = new NacosRegistryCenterConfig(pluginConfig); - - NamingService namingService = NacosNamingServiceUtils.createNamingService(config); - Assert.assertNull(namingService); + @Test + void createNamingService() { + Assertions.assertThrows(IllegalStateException.class, () -> { + Map properties = new HashMap<>(); + properties.put("addresses", "127.0.0.1:8844"); + properties.put("username", "testUserName"); + PluginConfig pluginConfig = new PluginConfig("nacos", NacosRegistryCenter.class, properties); + NacosRegistryCenterConfig config = new NacosRegistryCenterConfig(pluginConfig); + NamingService namingService = NacosNamingServiceUtils.createNamingService(config); + Assertions.assertNull(namingService); + }); } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/util/StringConstantFieldValuePredicateUtilsTest.java b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/util/StringConstantFieldValuePredicateUtilsTest.java similarity index 75% rename from trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/util/StringConstantFieldValuePredicateUtilsTest.java rename to trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/util/StringConstantFieldValuePredicateUtilsTest.java index a4d5609be6..5cdfa0f1c8 100644 --- a/trpc-registry/trpc-registry-nacos/src/test/com/tencent/trpc/registry/nacos/util/StringConstantFieldValuePredicateUtilsTest.java +++ b/trpc-registry/trpc-registry-nacos/src/test/java/com/tencent/trpc/registry/nacos/util/StringConstantFieldValuePredicateUtilsTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.registry.nacos.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; @@ -22,10 +22,10 @@ public class StringConstantFieldValuePredicateUtilsTest { @Test public void of() { Predicate of = StringConstantFieldValuePredicateUtils.of(TestConstant.class); - Assert.assertFalse(of.test("group")); - Assert.assertTrue(of.test("endpoint")); - Assert.assertTrue(of.test("isUseEndpointParsingRule")); - Assert.assertTrue(of.test("isUseCloudNamespaceParsing")); + Assertions.assertFalse(of.test("group")); + Assertions.assertTrue(of.test("endpoint")); + Assertions.assertTrue(of.test("isUseEndpointParsingRule")); + Assertions.assertTrue(of.test("isUseCloudNamespaceParsing")); } public static class TestConstant { @@ -34,4 +34,4 @@ public static class TestConstant { public static final String IS_USE_ENDPOINT_PARSING_RULE = "isUseEndpointParsingRule"; public static final String ENDPOINT = "endpoint"; } -} \ No newline at end of file +} diff --git a/trpc-registry/trpc-registry-open-polaris/pom.xml b/trpc-registry/trpc-registry-open-polaris/pom.xml index b1b9cf2ec3..4a843ad182 100644 --- a/trpc-registry/trpc-registry-open-polaris/pom.xml +++ b/trpc-registry/trpc-registry-open-polaris/pom.xml @@ -40,5 +40,17 @@ org.slf4j slf4j-simple + + + org.mockito + mockito-core + test + + + + org.mockito + mockito-junit-jupiter + test + diff --git a/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/polaris/common/PolarisTransTest.java b/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/polaris/common/PolarisTransTest.java index afacd7b88f..cec6fc4314 100644 --- a/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/polaris/common/PolarisTransTest.java +++ b/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/polaris/common/PolarisTransTest.java @@ -22,8 +22,8 @@ import com.tencent.polaris.factory.config.global.ServerConnectorConfigImpl; import java.util.HashMap; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class PolarisTransTest { @@ -32,19 +32,19 @@ public void testTrans2StringMap() { Map map = new HashMap<>(); map.put("test", "test"); Map strMap = PolarisRegisterUtil.trans2StringMap(map); - Assert.assertEquals("test", strMap.get("test")); + Assertions.assertEquals("test", strMap.get("test")); map = new HashMap<>(); map.put("test", 1L); strMap = PolarisRegisterUtil.trans2StringMap(map); - Assert.assertEquals("1", strMap.get("test")); + Assertions.assertEquals("1", strMap.get("test")); map = new HashMap<>(); Map notString = new HashMap<>(); notString.put("test", 2); map.put("test", notString); strMap = PolarisRegisterUtil.trans2StringMap(map); - Assert.assertEquals("{\"test\":2}", strMap.get("test")); + Assertions.assertEquals("{\"test\":2}", strMap.get("test")); } @Test @@ -56,8 +56,8 @@ public void testTrans2ApiConfig() { configuration.setDefault(); APIConfigImpl apiConfig = configuration.getGlobal().getAPI(); PolarisRegisterUtil.overrideApiConfig(apiConfig, extMap); - Assert.assertEquals(10, apiConfig.getMaxRetryTimes()); - Assert.assertEquals("if", apiConfig.getBindIf()); + Assertions.assertEquals(10, apiConfig.getMaxRetryTimes()); + Assertions.assertEquals("if", apiConfig.getBindIf()); } @Test @@ -70,7 +70,7 @@ public void testTrans2ServerConnectorConfig() { configuration.setDefault(); ServerConnectorConfigImpl serverConnectorConfig = configuration.getGlobal().getServerConnector(); PolarisRegisterUtil.overrideServerConnectorConfig(serverConnectorConfig, extMap); - Assert.assertEquals("10.0.0.1:1239", serverConnectorConfig.getAddresses().get(0)); - Assert.assertEquals("http", serverConnectorConfig.getProtocol()); + Assertions.assertEquals("10.0.0.1:1239", serverConnectorConfig.getAddresses().get(0)); + Assertions.assertEquals("http", serverConnectorConfig.getProtocol()); } } diff --git a/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/registry/polaris/PolarisRegistryTest.java b/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/registry/polaris/PolarisRegistryTest.java index 765d2fdd49..8e97bda62a 100644 --- a/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/registry/polaris/PolarisRegistryTest.java +++ b/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/registry/polaris/PolarisRegistryTest.java @@ -13,7 +13,7 @@ import static com.tencent.trpc.polaris.common.PolarisRegistryConstant.PRIORITY_PARAM_KEY; import static com.tencent.trpc.polaris.common.PolarisRegistryConstant.WEIGHT_PARAM_KEY; -import static org.mockito.Matchers.anyObject; +import static org.mockito.ArgumentMatchers.any; import com.tencent.polaris.api.core.ProviderAPI; import com.tencent.polaris.api.exception.PolarisException; @@ -33,35 +33,51 @@ import com.tencent.trpc.support.HeartBeatManager; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Captor; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(PowerMockRunner.class) -@PrepareForTest({APIFactory.class, HeartBeatManager.class}) -@PowerMockIgnore({"javax.management.*"}) -public class PolarisRegistryTest extends TestCase { +@ExtendWith(MockitoExtension.class) +public class PolarisRegistryTest { + + private MockedStatic mockedAPIFactory; + private MockedStatic mockedHeartBeatManager; + private AutoCloseable mockitoCloseable; @Captor private ArgumentCaptor intervalCaptor; + @BeforeEach protected void setUp() { - MockitoAnnotations.initMocks(this); - PowerMockito.mockStatic(APIFactory.class); - PowerMockito.mockStatic(HeartBeatManager.class); + mockitoCloseable = MockitoAnnotations.openMocks(this); + mockedAPIFactory = Mockito.mockStatic(APIFactory.class); + mockedHeartBeatManager = Mockito.mockStatic(HeartBeatManager.class); + } + + @AfterEach + protected void tearDown() throws Exception { + if (mockedAPIFactory != null) { + mockedAPIFactory.close(); + } + if (mockedHeartBeatManager != null) { + mockedHeartBeatManager.close(); + } + if (mockitoCloseable != null) { + mockitoCloseable.close(); + } } @Test public void testRegistry() throws PolarisException { - PowerMockito.when(APIFactory.createProviderAPIByConfig(anyObject())) + mockedAPIFactory.when(() -> APIFactory.createProviderAPIByConfig(any())) .thenReturn(new ProviderAPI() { @Override public InstanceRegisterResponse registerInstance(InstanceRegisterRequest instanceRegisterRequest) @@ -72,20 +88,20 @@ public InstanceRegisterResponse registerInstance(InstanceRegisterRequest instanc @Override public InstanceRegisterResponse register( InstanceRegisterRequest instanceRegisterRequest) { - Assert.assertEquals(2000, instanceRegisterRequest.getTtl().intValue()); + Assertions.assertEquals(2000, instanceRegisterRequest.getTtl().intValue()); return new InstanceRegisterResponse("101", true); } @Override public void deRegister(InstanceDeregisterRequest instanceDeRegisterRequest) throws PolarisException { - Assert.assertEquals("101", instanceDeRegisterRequest.getInstanceID()); + Assertions.assertEquals("101", instanceDeRegisterRequest.getInstanceID()); } @Override public void heartbeat(InstanceHeartbeatRequest instanceHeartbeatRequest) throws PolarisException { - Assert.assertEquals("101", instanceHeartbeatRequest.getInstanceID()); + Assertions.assertEquals("101", instanceHeartbeatRequest.getInstanceID()); } @Override @@ -132,10 +148,10 @@ public void close() { .getExtensionLoader(Registry.class) .getExtension("polaris"); registry.register(registerInfo); - PowerMockito.verifyStatic(); - HeartBeatManager.init(intervalCaptor.capture()); - Assert.assertEquals(3000, intervalCaptor.getValue().longValue()); + // 验证 HeartBeatManager.init 被调用 + mockedHeartBeatManager.verify(() -> HeartBeatManager.init(intervalCaptor.capture())); + Assertions.assertEquals(3000, intervalCaptor.getValue().longValue()); registry.heartbeat(registerInfo); registry.heartbeat(registerInfo); diff --git a/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/support/HeatBeatManagerTest.java b/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/support/HeatBeatManagerTest.java index b16a811771..542378683e 100644 --- a/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/support/HeatBeatManagerTest.java +++ b/trpc-registry/trpc-registry-open-polaris/src/test/java/com/tencent/trpc/support/HeatBeatManagerTest.java @@ -17,25 +17,22 @@ import com.tencent.trpc.registry.polaris.PolarisRegistry; import java.util.HashMap; import java.util.Map; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.MockedStatic; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(PowerMockRunner.class) -@PrepareForTest(APIFactory.class) -@PowerMockIgnore({"javax.management.*"}) +@ExtendWith(MockitoExtension.class) public class HeatBeatManagerTest { + private MockedStatic mockedAPIFactory; - @Before + @BeforeEach public void setUp() { try { - PowerMockito.mockStatic(APIFactory.class); + mockedAPIFactory = Mockito.mockStatic(APIFactory.class); HeartBeatManager.init(200); } catch (Throwable e) { //To prevent exceptions from occurring when tasks are submitted after the UT is completed @@ -44,7 +41,6 @@ public void setUp() { } } - @Test public void startHeartBeatTest() throws PolarisException { PolarisRegistry registry = Mockito.mock(PolarisRegistry.class); @@ -61,8 +57,12 @@ public void startHeartBeatTest() throws PolarisException { Mockito.verify(registry, Mockito.atLeast(1)).heartbeat(registerInfo); } - @After + @AfterEach public void destroy() throws PolarisException { + if (mockedAPIFactory != null) { + mockedAPIFactory.close(); + } + HeartBeatManager.destroy(); } } diff --git a/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClientTest.java b/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClientTest.java index 6637aaf6ce..4ef3d81f0c 100644 --- a/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClientTest.java +++ b/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/transporter/curator/CuratorZookeeperClientTest.java @@ -27,11 +27,11 @@ import org.apache.curator.framework.recipes.cache.ChildData; import org.apache.curator.test.TestingServer; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.powermock.reflect.Whitebox; +import java.lang.reflect.Method; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class CuratorZookeeperClientTest { @@ -52,15 +52,19 @@ public class CuratorZookeeperClientTest { private static String testNodeName = "providers"; private static String testNodeFullPath = String.format("%s/%s", testServicePath, testNodeName); - @Before + @BeforeEach public void setUp() throws Exception { - zkServer = new TestingServer(PORT, new File("/tmp/zk/curator")); + File tempDir = new File(System.getProperty("java.io.tmpdir"), "zk/curator"); + if (!tempDir.exists()) { + tempDir.mkdirs(); + } + zkServer = new TestingServer(PORT, tempDir); zkServer.start(); curatorZookeeperFactory = new CuratorZookeeperFactory(); client = curatorZookeeperFactory.connect(buildConfig()); } - @After + @AfterEach public void tearDown() throws Exception { if (client.isConnected()) { List children = client.getChildren(testNodeFullPath); @@ -91,34 +95,34 @@ private RegistryCenterConfig buildConfig() { @Test public void testIsConnected() { client.getChildren(testRootPath); - Assert.assertTrue(client.isConnected()); + Assertions.assertTrue(client.isConnected()); } @Test public void testOperate() { List children = client.getChildren(testRootPath); - Assert.assertNull(children); + Assertions.assertNull(children); client.create(testNodeFullPath, true); client.create(testNodeFullPath, true); children = client.getChildren("/"); - Assert.assertNotNull(children); - Assert.assertTrue(children.size() > 0); + Assertions.assertNotNull(children); + Assertions.assertTrue(children.size() > 0); children = client.getChildren(testRootPath); - Assert.assertNotNull(children); - Assert.assertEquals(1, children.size()); - Assert.assertEquals(testServiceName, children.get(0)); + Assertions.assertNotNull(children); + Assertions.assertEquals(1, children.size()); + Assertions.assertEquals(testServiceName, children.get(0)); children = client.getChildren(testServicePath); - Assert.assertNotNull(children); - Assert.assertEquals(1, children.size()); - Assert.assertEquals(testNodeName, children.get(0)); + Assertions.assertNotNull(children); + Assertions.assertEquals(1, children.size()); + Assertions.assertEquals(testNodeName, children.get(0)); children = client.getChildren(testNodeFullPath); - Assert.assertNotNull(children); - Assert.assertEquals(0, children.size()); + Assertions.assertNotNull(children); + Assertions.assertEquals(0, children.size()); this.testDelete(); } @@ -137,14 +141,14 @@ public void testDelete() { client.delete(testRootPath); children = client.getChildren(testRootPath); - Assert.assertNull(children); + Assertions.assertNull(children); } @Test public void testChildListener() throws InterruptedException { this.testDelete(); List children = client.getChildren(testRootPath); - Assert.assertNull(children); + Assertions.assertNull(children); final Map assertCache = new HashMap<>(); ChildListener childListener = new ChildListener() { @@ -160,9 +164,9 @@ public void childChanged(String path, List children) { client.create(testNodeFullPath, false); children = client.getChildren(testServicePath); - Assert.assertNotNull(children); - Assert.assertEquals(1, children.size()); - Assert.assertEquals(testNodeName, children.get(0)); + Assertions.assertNotNull(children); + Assertions.assertEquals(1, children.size()); + Assertions.assertEquals(testNodeName, children.get(0)); // 正常添加 client.addChildListener(testNodeFullPath, childListener); @@ -171,12 +175,12 @@ public void childChanged(String path, List children) { client.create(providerPath, true); children = client.getChildren(testNodeFullPath); - Assert.assertNotNull(children); - Assert.assertEquals(1, children.size()); + Assertions.assertNotNull(children); + Assertions.assertEquals(1, children.size()); Thread.sleep(1000); - Assert.assertTrue(assertCache.containsKey(testNodeFullPath)); - Assert.assertEquals(1, assertCache.get(testNodeFullPath).size()); - Assert.assertEquals("provider1", assertCache.get(testNodeFullPath).get(0)); + Assertions.assertTrue(assertCache.containsKey(testNodeFullPath)); + Assertions.assertEquals(1, assertCache.get(testNodeFullPath).size()); + Assertions.assertEquals("provider1", assertCache.get(testNodeFullPath).get(0)); client.removeChildListener(testNodeFullPath, childListener); @@ -186,13 +190,13 @@ public void childChanged(String path, List children) { public void testDataListener() throws InterruptedException { this.testDelete(); List children = client.getChildren(testRootPath); - Assert.assertNull(children); + Assertions.assertNull(children); client.create(testNodeFullPath, false); children = client.getChildren(testServicePath); - Assert.assertNotNull(children); - Assert.assertEquals(1, children.size()); - Assert.assertEquals(testNodeName, children.get(0)); + Assertions.assertNotNull(children); + Assertions.assertEquals(1, children.size()); + Assertions.assertEquals(testNodeName, children.get(0)); final Map> assertCache = new HashMap<>(); @@ -207,31 +211,31 @@ public void testDataListener() throws InterruptedException { client.create(providerPath, "aaaa", true); children = client.getChildren(testNodeFullPath); - Assert.assertNotNull(children); - Assert.assertEquals(1, children.size()); + Assertions.assertNotNull(children); + Assertions.assertEquals(1, children.size()); Thread.sleep(1000); - Assert.assertTrue(assertCache.containsKey(providerPath)); - Assert.assertEquals(2, assertCache.get(providerPath).size()); - Assert.assertEquals("aaaa", new String(assertCache.get(providerPath).get(1).getData())); + Assertions.assertTrue(assertCache.containsKey(providerPath)); + Assertions.assertEquals(2, assertCache.get(providerPath).size()); + Assertions.assertEquals("aaaa", new String(assertCache.get(providerPath).get(1).getData())); client.create(providerPath, "bbbb", true); Thread.sleep(1000); - Assert.assertTrue(assertCache.containsKey(providerPath)); - Assert.assertEquals(2, assertCache.get(providerPath).size()); - Assert.assertEquals("aaaa", new String(assertCache.get(providerPath).get(0).getData())); - Assert.assertEquals("bbbb", new String(assertCache.get(providerPath).get(1).getData())); + Assertions.assertTrue(assertCache.containsKey(providerPath)); + Assertions.assertEquals(2, assertCache.get(providerPath).size()); + Assertions.assertEquals("aaaa", new String(assertCache.get(providerPath).get(0).getData())); + Assertions.assertEquals("bbbb", new String(assertCache.get(providerPath).get(1).getData())); client.create(providerPath, "cccc", false); Thread.sleep(1000); - Assert.assertTrue(assertCache.containsKey(providerPath)); - Assert.assertEquals(2, assertCache.get(providerPath).size()); - Assert.assertEquals(null, assertCache.get(providerPath).get(0)); - Assert.assertEquals("cccc", new String(assertCache.get(providerPath).get(1).getData())); + Assertions.assertTrue(assertCache.containsKey(providerPath)); + Assertions.assertEquals(2, assertCache.get(providerPath).size()); + Assertions.assertEquals(null, assertCache.get(providerPath).get(0)); + Assertions.assertEquals("cccc", new String(assertCache.get(providerPath).get(1).getData())); client.removeDataListener(providerPath, dataListener); @@ -283,8 +287,9 @@ public void testCreateEphemeralError() { final String providerPath = testNodeFullPath + "/provider3"; try { - Whitebox.invokeMethod(client, "createEphemeral", providerPath); - + Method method = CuratorZookeeperClient.class.getDeclaredMethod("createEphemeral", String.class); + method.setAccessible(true); + method.invoke(client, providerPath); } catch (Exception e) { LOGGER.info("testCreateError success"); } @@ -298,8 +303,9 @@ public void testCreateEphemeralDataError() { final String providerPath = testNodeFullPath + "/provider3"; try { - Whitebox.invokeMethod(client, "createEphemeral", providerPath, "aaa"); - + Method method = CuratorZookeeperClient.class.getDeclaredMethod("createEphemeral", String.class, String.class); + method.setAccessible(true); + method.invoke(client, providerPath, "aaa"); } catch (Exception e) { LOGGER.info("testCreateError success"); } @@ -313,8 +319,9 @@ public void testCreatePersistent0Error() { final String providerPath = testNodeFullPath + "/provider3"; try { - Whitebox.invokeMethod(client, "createPersistent", providerPath, "aaa"); - + Method method = CuratorZookeeperClient.class.getDeclaredMethod("createPersistent", String.class, String.class); + method.setAccessible(true); + method.invoke(client, providerPath, "aaa"); } catch (Exception e) { LOGGER.info("testCreatePersistent0Error success"); } @@ -386,7 +393,9 @@ public void testCreatePersistentError() { try { client.create(providerPath, false); - Whitebox.invokeMethod(client, "createPersistent", providerPath, "aaa"); + Method method = CuratorZookeeperClient.class.getDeclaredMethod("createPersistent", String.class, String.class); + method.setAccessible(true); + method.invoke(client, providerPath, "aaa"); } catch (Exception e) { LOGGER.info("testCloseError success"); } diff --git a/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/zookeeper/ZookeeperRegistryTest.java b/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/zookeeper/ZookeeperRegistryTest.java index 01f01578ee..92f53dfdff 100644 --- a/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/zookeeper/ZookeeperRegistryTest.java +++ b/trpc-registry/trpc-registry-zookeeper/src/test/java/com/tencent/trpc/registry/zookeeper/ZookeeperRegistryTest.java @@ -39,10 +39,10 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.curator.test.TestingServer; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import tests.service.GreeterJsonService; import tests.service.GreeterService; import tests.service.impl1.GreeterJsonServiceImpl1; @@ -95,7 +95,7 @@ private static ServiceConfig getServiceConfig(ProviderConfig gspc, String name, /** * Initialize and start the test service */ - @Before + @BeforeEach public void setUp() throws Exception { zkServer = new TestingServer(2182, new File("/tmp/zk")); zkServer.start(); @@ -163,7 +163,7 @@ private void delete(String path) { } } children = client.getChildren(path); - Assert.assertTrue(CollectionUtils.isEmpty(children)); + Assertions.assertTrue(CollectionUtils.isEmpty(children)); } private RegisterInfo buildRegisterInfo(String ip, int port, String serviceName) { @@ -184,7 +184,7 @@ private RegistryCenterConfig buildConfig() { return config; } - @After + @AfterEach public void tearDown() throws Exception { ConfigManager.stopTest(); if (serverConfig != null) { @@ -205,18 +205,18 @@ private void assertNodeContainsChild(String path, String childPath) { return; } } - Assert.fail(); + Assertions.fail(); } private void assertNodeChildSize(String path, int size) { List children = client.getChildren(path); - Assert.assertEquals(size, children.size()); + Assertions.assertEquals(size, children.size()); } @Test public void testRegistry() { serverConfig.register(); - Assert.assertEquals(2, serverRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(2, serverRegistry.getRegisteredRegisterInfos().size()); assertNodeContainsChild(rootPath, SERVICE_NAME1); assertNodeContainsChild(rootPath, SERVICE_NAME2); @@ -233,7 +233,7 @@ public void testRegistry() { public void testUnregistry() { this.testRegistry(); serverConfig.unregister(); - Assert.assertEquals(0, serverRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(0, serverRegistry.getRegisteredRegisterInfos().size()); assertNodeChildSize(rootPath + "/" + SERVICE_NAME1 + "/" + "providers", 0); assertNodeChildSize(rootPath + "/" + SERVICE_NAME2 + "/" + "providers", 0); } @@ -252,8 +252,8 @@ public void testSubscribe() { RegistryDiscovery discovery2 = new RegistryDiscovery(serviceId, clientRegistry); subscribeMap.put(registerInfo2, discovery2); - Assert.assertEquals(2, clientRegistry.getRegisteredRegisterInfos().size()); - Assert.assertEquals(2, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(2, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(2, clientRegistry.getSubscribedRegisterInfos().size()); assertNodeContainsChild(rootPath + "/" + SERVICE_NAME1, "consumers"); assertNodeContainsChild(rootPath + "/" + SERVICE_NAME2, "consumers"); @@ -277,17 +277,17 @@ public void testSubscribe() { } serviceId.setServiceName(SERVICE_NAME1); - Assert.assertEquals(1, discovery1.getServiceInstances().size()); - Assert.assertEquals(1, discovery1.list(serviceId).size()); - Assert.assertEquals(LOCAL_IP, discovery1.list(serviceId).get(0).getHost()); - Assert.assertEquals(18080, discovery1.list(serviceId).get(0).getPort()); + Assertions.assertEquals(1, discovery1.getServiceInstances().size()); + Assertions.assertEquals(1, discovery1.list(serviceId).size()); + Assertions.assertEquals(LOCAL_IP, discovery1.list(serviceId).get(0).getHost()); + Assertions.assertEquals(18080, discovery1.list(serviceId).get(0).getPort()); ServiceId serviceId2 = new ServiceId(); serviceId2.setServiceName(SERVICE_NAME2); - Assert.assertEquals(1, discovery2.getServiceInstances().size()); - Assert.assertEquals(1, discovery2.list(serviceId2).size()); - Assert.assertEquals(LOCAL_IP, discovery2.list(serviceId2).get(0).getHost()); - Assert.assertEquals(18081, discovery2.list(serviceId2).get(0).getPort()); + Assertions.assertEquals(1, discovery2.getServiceInstances().size()); + Assertions.assertEquals(1, discovery2.list(serviceId2).size()); + Assertions.assertEquals(LOCAL_IP, discovery2.list(serviceId2).get(0).getHost()); + Assertions.assertEquals(18081, discovery2.list(serviceId2).get(0).getPort()); } @@ -299,23 +299,23 @@ public void testUnsubscribe() { clientRegistry.unsubscribe(entry.getKey(), entry.getValue()); ServiceId serviceId = new ServiceId(); serviceId.setServiceName(entry.getKey().getServiceName()); - Assert.assertEquals(0, entry.getValue().getServiceInstances().size()); - Assert.assertEquals(0, entry.getValue().list(serviceId).size()); + Assertions.assertEquals(0, entry.getValue().getServiceInstances().size()); + Assertions.assertEquals(0, entry.getValue().list(serviceId).size()); } - Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); } @Test public void testDestroy() { this.testUnsubscribe(); clientRegistry.destroy(); - Assert.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size()); - Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size()); assertNodeChildSize(rootPath + "/" + SERVICE_NAME1 + "/" + "consumers", 0); assertNodeChildSize(rootPath + "/" + SERVICE_NAME2 + "/" + "consumers", 0); serverRegistry.destroy(); - Assert.assertEquals(0, serverRegistry.getRegisteredRegisterInfos().size()); + Assertions.assertEquals(0, serverRegistry.getRegisteredRegisterInfos().size()); assertNodeChildSize(rootPath + "/" + SERVICE_NAME1 + "/" + "providers", 0); assertNodeChildSize(rootPath + "/" + SERVICE_NAME2 + "/" + "providers", 0); }