From da3a9541a6daa52f67907fe0ecaf8aec8ec9ac6c Mon Sep 17 00:00:00 2001 From: drow931 <632722781@qq.com> Date: Tue, 20 Jan 2026 15:42:04 +0800 Subject: [PATCH 1/5] trpc-admin: migrate junit4 to junit5 and upgrade resteasy --- trpc-admin/trpc-admin-default/pom.xml | 25 +++--- .../tencent/trpc/admin/impl/CommandAdmin.java | 8 +- .../tencent/trpc/admin/impl/ConfigAdmin.java | 8 +- .../trpc/admin/impl/FrameOverviewAdmin.java | 8 +- .../tencent/trpc/admin/impl/LoggerAdmin.java | 14 ++-- .../trpc/admin/impl/RpcStatsAdmin.java | 8 +- .../trpc/admin/impl/WorkerPoolAdmin.java | 8 +- .../service/DefaultAdminServiceImpl.java | 27 +++--- .../trpc/admin/AdminIntegrationTest.java | 56 +++++++------ .../com/tencent/trpc/admin/AdminTest.java | 12 +-- .../tencent/trpc/admin/CommandAdminTest.java | 10 +-- .../tencent/trpc/admin/ConfigAdminTest.java | 8 +- .../tencent/trpc/admin/CustomizeAdmin.java | 8 +- .../trpc/admin/FrameOverviewAdminTest.java | 8 +- .../tencent/trpc/admin/LoggerAdminTest.java | 30 +++---- .../admin/ProtocolConfigOverviewTest.java | 4 +- .../tencent/trpc/admin/RpcStatsAdminTest.java | 82 +++++++++---------- .../trpc/admin/ServerConfigOverviewTest.java | 4 +- .../trpc/admin/WorkerPoolAdminTest.java | 24 +++--- .../tencent/trpc/admin/custom/TestAdmin.java | 8 +- .../trpc/admin/dto/CommandDtoTest.java | 20 ++--- .../tencent/trpc/admin/dto/CommonDtoTest.java | 20 ++--- .../trpc/admin/dto/ConfigOverviewDtoTest.java | 16 ++-- .../trpc/admin/dto/LoggerLevelDtoTest.java | 22 ++--- .../admin/dto/LoggerLevelRevisedDtoTest.java | 24 +++--- .../trpc/admin/dto/VersionDtoTest.java | 16 ++-- .../trpc/admin/dto/WorkerPoolInfoDtoTest.java | 18 ++-- 27 files changed, 253 insertions(+), 243 deletions(-) diff --git a/trpc-admin/trpc-admin-default/pom.xml b/trpc-admin/trpc-admin-default/pom.xml index f7fdf433e5..3a05265100 100644 --- a/trpc-admin/trpc-admin-default/pom.xml +++ b/trpc-admin/trpc-admin-default/pom.xml @@ -46,22 +46,20 @@ org.jboss.resteasy - resteasy-netty4 - - - io.netty - netty-all - - - jakarta.validation - jakarta.validation-api - - + resteasy-undertow jakarta.validation jakarta.validation-api + + jakarta.activation + jakarta.activation-api + + + org.eclipse.angus + angus-activation + org.jboss.resteasy resteasy-jackson2-provider @@ -76,5 +74,10 @@ spring-test test + + org.mockito + mockito-core + test + diff --git a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/CommandAdmin.java b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/CommandAdmin.java index 278b732823..39e5a42e7f 100644 --- a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/CommandAdmin.java +++ b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/CommandAdmin.java @@ -21,10 +21,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; /** * Command Operation Management diff --git a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/ConfigAdmin.java b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/ConfigAdmin.java index f322bb2dc8..7066ee8657 100644 --- a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/ConfigAdmin.java +++ b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/ConfigAdmin.java @@ -15,10 +15,10 @@ import com.tencent.trpc.admin.dto.ConfigOverviewDto; import com.tencent.trpc.core.admin.spi.Admin; import com.tencent.trpc.core.common.ConfigManager; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/cmds") public class ConfigAdmin implements Admin { diff --git a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/FrameOverviewAdmin.java b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/FrameOverviewAdmin.java index cc3e056c7f..24aff74dbe 100644 --- a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/FrameOverviewAdmin.java +++ b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/FrameOverviewAdmin.java @@ -14,10 +14,10 @@ import com.tencent.trpc.admin.dto.VersionDto; import com.tencent.trpc.core.admin.spi.Admin; import com.tencent.trpc.core.common.Version; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/version") public class FrameOverviewAdmin implements Admin { diff --git a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/LoggerAdmin.java b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/LoggerAdmin.java index 7f4fc56944..2978b8ad09 100644 --- a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/LoggerAdmin.java +++ b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/LoggerAdmin.java @@ -20,13 +20,13 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.lang3.EnumUtils; /** diff --git a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/RpcStatsAdmin.java b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/RpcStatsAdmin.java index 0ff293e14b..3e4a3194b9 100644 --- a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/RpcStatsAdmin.java +++ b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/RpcStatsAdmin.java @@ -34,10 +34,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.collections4.CollectionUtils; /** diff --git a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/WorkerPoolAdmin.java b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/WorkerPoolAdmin.java index 86c1a993e1..ffa0102b1d 100644 --- a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/WorkerPoolAdmin.java +++ b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/impl/WorkerPoolAdmin.java @@ -18,10 +18,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/cmds/workerpool") public class WorkerPoolAdmin implements Admin { diff --git a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/service/DefaultAdminServiceImpl.java b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/service/DefaultAdminServiceImpl.java index abb5d6d822..0e81f7d064 100644 --- a/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/service/DefaultAdminServiceImpl.java +++ b/trpc-admin/trpc-admin-default/src/main/java/com/tencent/trpc/admin/service/DefaultAdminServiceImpl.java @@ -24,9 +24,10 @@ import com.tencent.trpc.core.stat.MetricStatFactory; import java.util.Collection; import java.util.List; -import javax.ws.rs.Path; +import io.undertow.Undertow; +import jakarta.ws.rs.Path; import org.jboss.resteasy.core.ResteasyDeploymentImpl; -import org.jboss.resteasy.plugins.server.netty.NettyJaxrsServer; +import org.jboss.resteasy.plugins.server.undertow.UndertowJaxrsServer; import org.jboss.resteasy.spi.Registry; /** @@ -36,9 +37,9 @@ public class DefaultAdminServiceImpl implements AdminService { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultAdminServiceImpl.class); /** - * netty jar server + * undertow jaxrs server */ - private NettyJaxrsServer adminRestServer; + private UndertowJaxrsServer adminRestServer; private ServerConfig serverConfig; /** * Lifecycle class @@ -70,19 +71,23 @@ protected class LifecycleObj extends LifecycleBase { @Override protected void initInternal() throws Exception { super.initInternal(); - adminRestServer = new NettyJaxrsServer(); - AdminConfig adminConfig = serverConfig.getAdminConfig(); - adminRestServer.setHostname(adminConfig.getAdminIp()); - adminRestServer.setPort(adminConfig.getAdminPort()); - adminRestServer.setDeployment(new ResteasyDeploymentImpl()); + adminRestServer = new UndertowJaxrsServer(); } @Override protected void startInternal() { try { super.startInternal(); - adminRestServer.start(); - Registry registry = adminRestServer.getDeployment().getRegistry(); + AdminConfig adminConfig = serverConfig.getAdminConfig(); + adminRestServer.start(Undertow.builder() + .addHttpListener(adminConfig.getAdminPort(), adminConfig.getAdminIp())); + ResteasyDeploymentImpl deployment = new ResteasyDeploymentImpl(); + deployment.start(); + adminRestServer.deploy(adminRestServer.undertowDeployment(deployment) + .setContextPath("/") + .setDeploymentName("AdminService") + .setClassLoader(DefaultAdminServiceImpl.class.getClassLoader())); + Registry registry = deployment.getRegistry(); ExtensionLoader extensionLoader = ExtensionLoader.getExtensionLoader(Admin.class); Collection> extensionClasses = extensionLoader.getAllExtensionClass(); for (ExtensionClass extensionClass : extensionClasses) { diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminIntegrationTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminIntegrationTest.java index 22471c2f69..db230e16cb 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminIntegrationTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminIntegrationTest.java @@ -25,26 +25,27 @@ import com.tencent.trpc.core.common.config.AdminConfig; import com.tencent.trpc.core.utils.JsonUtils; import java.util.List; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +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.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @ActiveProfiles("admin") @SpringBootTest(classes = TrpcServerApplication.class) public class AdminIntegrationTest { private String adminAddress; - @Before + @BeforeEach public void before() { final AdminConfig adminConfig = ConfigManager.getInstance().getServerConfig().getAdminConfig(); adminAddress = new StringBuffer(adminConfig.getAdminIp()).append(":").append(adminConfig.getAdminPort()) .toString(); + System.out.println("adminAddress:" + adminAddress); } @Test @@ -52,7 +53,7 @@ public void testVersion() { String[] cmd = {"curl", "http://" + adminAddress + "/version"}; String versionInfo = ShellUtils.execute(cmd); VersionDto versionDto = JsonUtils.fromJson(versionInfo, VersionDto.class); - Assert.assertEquals(Version.version(), versionDto.getVersion()); + Assertions.assertEquals(Version.version(), versionDto.getVersion()); } @Test @@ -61,19 +62,19 @@ public void testUpdateLoglevel() { String[] set2DebugCmd = {"curl", "-XPUT", "http://" + adminAddress + "/cmds/loglevel/ROOT", "-d", "value=DEBUG"}; String set2DebugResult = ShellUtils.execute(set2DebugCmd); - System.out.println(set2DebugResult); + System.out.println("set2DebugResult: " + set2DebugResult); final LoggerLevelRevisedDto levelDebugRevisedDto = JsonUtils.fromJson(set2DebugResult, LoggerLevelRevisedDto.class); - Assert.assertEquals(CommonDto.SUCCESS, levelDebugRevisedDto.getErrorcode()); - Assert.assertEquals("DEBUG", (levelDebugRevisedDto.getLevel())); + Assertions.assertEquals(CommonDto.SUCCESS, levelDebugRevisedDto.getErrorcode()); + Assertions.assertEquals("DEBUG", (levelDebugRevisedDto.getLevel())); //查看修改后的结果 String[] logLevelCmd = {"curl", "http://" + adminAddress + "/cmds/loglevel"}; String logLevelInfo = ShellUtils.execute(logLevelCmd); LoggerLevelDto dto = JsonUtils.fromJson(logLevelInfo, LoggerLevelDto.class); - Assert.assertEquals(CommonDto.SUCCESS, dto.getErrorcode()); - Assert.assertTrue(dto.getLogger().stream() + Assertions.assertEquals(CommonDto.SUCCESS, dto.getErrorcode()); + Assertions.assertTrue(dto.getLogger().stream() .anyMatch(log -> "ROOT".equals(log.getLoggerName()) && "DEBUG".equals(log.getLevel()))); //修改 @@ -82,17 +83,18 @@ public void testUpdateLoglevel() { LoggerLevelRevisedDto levelInfoRevisedDto = JsonUtils.fromJson(set2InfoResult, LoggerLevelRevisedDto.class); - Assert.assertEquals(CommonDto.SUCCESS, levelInfoRevisedDto.getErrorcode()); - Assert.assertEquals("INFO", levelInfoRevisedDto.getLevel()); + Assertions.assertEquals(CommonDto.SUCCESS, levelInfoRevisedDto.getErrorcode()); + Assertions.assertEquals("INFO", levelInfoRevisedDto.getLevel()); } @Test public void testLogLevel() { String[] cmd = {"curl", "http://" + adminAddress + "/cmds/loglevel"}; String logLevelInfo = ShellUtils.execute(cmd); + System.out.println(logLevelInfo); LoggerLevelDto dto = JsonUtils.fromJson(logLevelInfo, LoggerLevelDto.class); - Assert.assertEquals(CommonDto.SUCCESS, dto.getErrorcode()); - Assert.assertTrue(dto.getLogger().stream() + Assertions.assertEquals(CommonDto.SUCCESS, dto.getErrorcode()); + Assertions.assertTrue(dto.getLogger().stream() .anyMatch(log -> "ROOT".equals(log.getLoggerName()) && "INFO".equals(log.getLevel()))); } @@ -100,7 +102,7 @@ public void testLogLevel() { public void testWorkerPool() { String[] cmd = {"curl", "http://" + adminAddress + "/cmds/workerpool/info"}; String workPoolInfo = ShellUtils.execute(cmd); - Assert.assertTrue("{\"errorcode\":\"0\",\"message\":\"\",\"workerPoolInfo\":{}}".equals(workPoolInfo)); + Assertions.assertTrue("{\"errorcode\":\"0\",\"message\":\"\",\"workerPoolInfo\":{}}".equals(workPoolInfo)); } @Test @@ -108,8 +110,8 @@ public void testConfig() { String[] cmd = {"curl", "http://" + adminAddress + "/cmds/config"}; String configInfo = ShellUtils.execute(cmd); ConfigOverviewDto configOverviewDto = JsonUtils.fromJson(configInfo, ConfigOverviewDto.class); - Assert.assertEquals(CommonDto.SUCCESS, configOverviewDto.getErrorcode()); - Assert.assertEquals("integration-test-admin", configOverviewDto.getContent().getServer().getApp()); + Assertions.assertEquals(CommonDto.SUCCESS, configOverviewDto.getErrorcode()); + Assertions.assertEquals("integration-test-admin", configOverviewDto.getContent().getServer().getApp()); } @Test @@ -117,9 +119,9 @@ public void testStatRpc() { String[] cmd = {"curl", "http://" + adminAddress + "/cmds/stats/rpc"}; String rpcStats = ShellUtils.execute(cmd); RpcStatsDto rpcStatsDto = JsonUtils.fromJson(rpcStats, RpcStatsDto.class); - Assert.assertEquals(CommonDto.SUCCESS, rpcStatsDto.getErrorcode()); - Assert.assertEquals(Version.version(), rpcStatsDto.getRpcVersion()); - Assert.assertEquals(0, rpcStatsDto.getRpcServiceCount().intValue()); + Assertions.assertEquals(CommonDto.SUCCESS, rpcStatsDto.getErrorcode()); + Assertions.assertEquals(Version.version(), rpcStatsDto.getRpcVersion()); + Assertions.assertEquals(0, rpcStatsDto.getRpcServiceCount().intValue()); } @Test @@ -127,8 +129,8 @@ public void testCustomAdmin() { String[] cmd = {"curl", "http://" + adminAddress + "/cmds/test"}; String testInfo = ShellUtils.execute(cmd); TestDto rpcStatsDto = JsonUtils.fromJson(testInfo, TestDto.class); - Assert.assertEquals(CommonDto.SUCCESS, rpcStatsDto.getErrorcode()); - Assert.assertEquals("hello world!", rpcStatsDto.getTestResult()); + Assertions.assertEquals(CommonDto.SUCCESS, rpcStatsDto.getErrorcode()); + Assertions.assertEquals("hello world!", rpcStatsDto.getTestResult()); } @Test @@ -136,9 +138,9 @@ public void testCmds() { String[] cmd = {"curl", "http://" + adminAddress + "/cmds"}; String cmdResult = ShellUtils.execute(cmd); CommandDto commandDto = JsonUtils.fromJson(cmdResult, CommandDto.class); - Assert.assertEquals(CommonDto.SUCCESS, commandDto.getErrorcode()); + Assertions.assertEquals(CommonDto.SUCCESS, commandDto.getErrorcode()); List commands = commandDto.getCmds(); - Assert.assertTrue(commands.contains("/cmds/loglevel") && commands.contains("/cmds/loglevel/{logname}") + Assertions.assertTrue(commands.contains("/cmds/loglevel") && commands.contains("/cmds/loglevel/{logname}") && commands.contains("/version") && commands.contains("/cmds") && commands.contains("/cmds/config") && commands.contains("/cmds/stats/rpc") && commands.contains("/cmds/workerpool/info") && commands.contains("/cmds/test")); diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminTest.java index c6cdbbe647..4511782116 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/AdminTest.java @@ -17,10 +17,10 @@ import com.tencent.trpc.core.exception.LifecycleException; import com.tencent.trpc.core.extension.ExtensionClass; import com.tencent.trpc.core.extension.ExtensionLoader; -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 org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,7 @@ public class AdminTest { private static final String LOCAL_HOST = "127.0.0.1"; - @After + @AfterEach public void after() { ExtensionLoader.destroyAllPlugin(); } @@ -57,7 +57,7 @@ public void testStartFail() { adminService2.stop(); } } - Assert.assertTrue(exception != null && exception instanceof LifecycleException); + Assertions.assertTrue(exception != null && exception instanceof LifecycleException); } private AdminService getAdminService(String ip, int adminPort) { diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CommandAdminTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CommandAdminTest.java index e79ab3e155..9235ac00e8 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CommandAdminTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CommandAdminTest.java @@ -16,8 +16,8 @@ import com.tencent.trpc.admin.impl.CommandAdmin; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class CommandAdminTest { @@ -27,9 +27,9 @@ public void test() { CommandDto commandDto = commandAdmin.getCommands(); commandDto.toString(); commandDto.setCmds(commandDto.getCmds()); - Assert.assertTrue(CommonDto.SUCCESS.equals(commandDto.getErrorcode())); - Assert.assertTrue(StringUtils.isEmpty(commandDto.getMessage())); - Assert.assertTrue(CollectionUtils.isNotEmpty(commandDto.getCmds())); + Assertions.assertTrue(CommonDto.SUCCESS.equals(commandDto.getErrorcode())); + Assertions.assertTrue(StringUtils.isEmpty(commandDto.getMessage())); + Assertions.assertTrue(CollectionUtils.isNotEmpty(commandDto.getCmds())); } } diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ConfigAdminTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ConfigAdminTest.java index f913e2071d..4b9628c699 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ConfigAdminTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ConfigAdminTest.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ConfigAdminTest { @@ -38,8 +38,8 @@ public void test() { ConfigOverviewDto configOverviewDto = configAdmin.getServerConfigInfo(); configOverviewDto.toString(); configOverviewDto.setContent(configOverviewDto.getContent()); - Assert.assertTrue(CommonDto.SUCCESS.equals(configOverviewDto.getErrorcode())); - Assert.assertTrue(Objects.nonNull(configOverviewDto.getContent())); + Assertions.assertTrue(CommonDto.SUCCESS.equals(configOverviewDto.getErrorcode())); + Assertions.assertTrue(Objects.nonNull(configOverviewDto.getContent())); } } diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CustomizeAdmin.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CustomizeAdmin.java index 5da1dace0c..ef80b23658 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CustomizeAdmin.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/CustomizeAdmin.java @@ -13,10 +13,10 @@ import com.tencent.trpc.admin.dto.CommonDto; import com.tencent.trpc.core.admin.spi.Admin; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/demo") public class CustomizeAdmin implements Admin { diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/FrameOverviewAdminTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/FrameOverviewAdminTest.java index 3fc62fb1b7..66cee0adbd 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/FrameOverviewAdminTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/FrameOverviewAdminTest.java @@ -15,8 +15,8 @@ import com.tencent.trpc.admin.dto.VersionDto; import com.tencent.trpc.admin.impl.FrameOverviewAdmin; import org.apache.commons.lang3.StringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class FrameOverviewAdminTest { @@ -26,8 +26,8 @@ public void test() { VersionDto versionDto = frameOverviewAdmin.getFrameOverview(); versionDto.toString(); versionDto.setVersion(versionDto.getVersion()); - Assert.assertTrue(CommonDto.SUCCESS.equals(versionDto.getErrorcode())); - Assert.assertTrue(StringUtils.isNotEmpty(versionDto.getVersion())); + Assertions.assertTrue(CommonDto.SUCCESS.equals(versionDto.getErrorcode())); + Assertions.assertTrue(StringUtils.isNotEmpty(versionDto.getVersion())); } } diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/LoggerAdminTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/LoggerAdminTest.java index 3c41303b59..271f59591c 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/LoggerAdminTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/LoggerAdminTest.java @@ -16,8 +16,8 @@ import com.tencent.trpc.admin.dto.LoggerLevelRevisedDto; import com.tencent.trpc.admin.impl.LoggerAdmin; import java.util.Objects; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class LoggerAdminTest { @@ -26,8 +26,8 @@ public void testGetLoggerLevel() { LoggerAdmin loggerAdmin = new LoggerAdmin(); LoggerLevelDto loggerLevelDto = loggerAdmin.getLoggerLevelInfo(); loggerLevelDto.toString(); - Assert.assertTrue(Objects.nonNull(CommonDto.SUCCESS.equals(loggerLevelDto.getErrorcode()))); - Assert.assertTrue(Objects.nonNull(loggerLevelDto.getLogger())); + Assertions.assertTrue(Objects.nonNull(CommonDto.SUCCESS.equals(loggerLevelDto.getErrorcode()))); + Assertions.assertTrue(Objects.nonNull(loggerLevelDto.getLogger())); } @Test @@ -35,7 +35,7 @@ public void testSetLoggerLevelSuccess() { LoggerAdmin loggerAdmin = new LoggerAdmin(); LoggerLevelRevisedDto loggerLevelRevisedDto = loggerAdmin.setLoggerLevel("ROOT", "INFO"); LoggerLevelRevisedDto loggerLevelRevisedDto2 = loggerAdmin.setLoggerLevel("root", "INFO"); - Assert.assertTrue( + Assertions.assertTrue( CommonDto.SUCCESS.equals(loggerLevelRevisedDto.getErrorcode()) || CommonDto.SUCCESS .equals(loggerLevelRevisedDto2.getErrorcode())); } @@ -44,7 +44,7 @@ public void testSetLoggerLevelSuccess() { public void testSetLoggerLevelWithInvalidLevel() { LoggerAdmin loggerAdmin = new LoggerAdmin(); LoggerLevelRevisedDto loggerLevelRevisedDto = loggerAdmin.setLoggerLevel("ROOT", "1234"); - Assert.assertTrue(CommonDto.FAIL.equals(loggerLevelRevisedDto.getErrorcode())); + Assertions.assertTrue(CommonDto.FAIL.equals(loggerLevelRevisedDto.getErrorcode())); } @Test @@ -52,15 +52,15 @@ public void testSetLoggerLevelWithInvalidLogger() { LoggerAdmin loggerAdmin = new LoggerAdmin(); LoggerLevelRevisedDto loggerLevelRevisedDto = loggerAdmin.setLoggerLevel("123", "INFO"); loggerLevelRevisedDto.toString(); - Assert.assertTrue(CommonDto.FAIL.equals(loggerLevelRevisedDto.getErrorcode())); + Assertions.assertTrue(CommonDto.FAIL.equals(loggerLevelRevisedDto.getErrorcode())); } @Test public void testLoggerLevelDtoBuildFail() { String message = "error"; LoggerLevelDto loggerLevelDto = LoggerLevelDto.buildFail(message); - Assert.assertTrue(CommonDto.FAIL.equals(loggerLevelDto.getErrorcode())); - Assert.assertTrue(message.equals(loggerLevelDto.getMessage())); + Assertions.assertTrue(CommonDto.FAIL.equals(loggerLevelDto.getErrorcode())); + Assertions.assertTrue(message.equals(loggerLevelDto.getMessage())); } @Test @@ -70,8 +70,8 @@ public void testLoggerLevelDtoSet() { LoggerLevelDto loggerLevelDto = new LoggerLevelDto(); loggerLevelDto.setErrorcode(errorCode); loggerLevelDto.setMessage(message); - Assert.assertTrue(errorCode.equals(loggerLevelDto.getErrorcode())); - Assert.assertTrue(message.equals(loggerLevelDto.getMessage())); + Assertions.assertTrue(errorCode.equals(loggerLevelDto.getErrorcode())); + Assertions.assertTrue(message.equals(loggerLevelDto.getMessage())); } @Test @@ -85,10 +85,10 @@ public void testLoggerLevelRevisedDtoSet() { loggerLevelRevisedDto.setMessage(message); loggerLevelRevisedDto.setLevel(level); loggerLevelRevisedDto.setPrelevel(preLevel); - Assert.assertTrue(errorCode.equals(loggerLevelRevisedDto.getErrorcode())); - Assert.assertTrue(message.equals(loggerLevelRevisedDto.getMessage())); - Assert.assertTrue(level.equals(loggerLevelRevisedDto.getLevel())); - Assert.assertTrue(preLevel.equals(loggerLevelRevisedDto.getPrelevel())); + Assertions.assertTrue(errorCode.equals(loggerLevelRevisedDto.getErrorcode())); + Assertions.assertTrue(message.equals(loggerLevelRevisedDto.getMessage())); + Assertions.assertTrue(level.equals(loggerLevelRevisedDto.getLevel())); + Assertions.assertTrue(preLevel.equals(loggerLevelRevisedDto.getPrelevel())); } } diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ProtocolConfigOverviewTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ProtocolConfigOverviewTest.java index 5311001112..6d92faf4bd 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ProtocolConfigOverviewTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ProtocolConfigOverviewTest.java @@ -11,9 +11,9 @@ package com.tencent.trpc.admin; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ProtocolConfigOverviewTest { diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/RpcStatsAdminTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/RpcStatsAdminTest.java index 9d563246a1..4b87c1f1eb 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/RpcStatsAdminTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/RpcStatsAdminTest.java @@ -35,81 +35,82 @@ import java.util.Map; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.atomic.AtomicLong; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -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.BeforeEach; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; /** * RpcStatsAdminTest */ -@RunWith(PowerMockRunner.class) -@PrepareForTest(WorkerPoolManager.class) -@PowerMockIgnore({"javax.management.*", "javax.security.*", "javax.ws.*"}) public class RpcStatsAdminTest { + private MockedStatic mockedWorkerPoolManager; - @Before + @BeforeEach public void setUp() { - PowerMockito.mockStatic(WorkerPoolManager.class); + mockedWorkerPoolManager = Mockito.mockStatic(WorkerPoolManager.class); } + @AfterEach + void tearDown() { + if (mockedWorkerPoolManager != null) { + mockedWorkerPoolManager.close(); + } + } @Test public void testRpcStatsAdminEmptyList() { List workerPoolList = new ArrayList<>(); - WorkerPool workerPool = PowerMockito.mock(ThreadWorkerPool.class); + WorkerPool workerPool = Mockito.mock(ThreadWorkerPool.class); - ThreadPoolMXBeanImpl threadPoolMXBean = PowerMockito.mock(ThreadPoolMXBeanImpl.class); - PowerMockito.when(workerPool.report()).thenReturn(threadPoolMXBean); + ThreadPoolMXBeanImpl threadPoolMXBean = Mockito.mock(ThreadPoolMXBeanImpl.class); + Mockito.when(workerPool.report()).thenReturn(threadPoolMXBean); workerPoolList.add(workerPool); ForkJoinPool forkJoinPool = new ForkJoinPool(1, ForkJoinPool.defaultForkJoinWorkerThreadFactory, null, false); - WorkerPool forkJoinWorkerPool = PowerMockito.mock(ForkJoinWorkerPool.class); + WorkerPool forkJoinWorkerPool = Mockito.mock(ForkJoinWorkerPool.class); ForkJoinPoolMXBean forkJoinPoolMXBean = new ForkJoinPoolMXBeanImpl(forkJoinPool); - PowerMockito.when(forkJoinWorkerPool.report()).thenReturn(forkJoinPoolMXBean); + Mockito.when(forkJoinWorkerPool.report()).thenReturn(forkJoinPoolMXBean); workerPoolList.add(forkJoinWorkerPool); - PowerMockito.when(WorkerPoolManager.getAllInitializedExtension()).thenReturn(workerPoolList); + mockedWorkerPoolManager.when(() -> WorkerPoolManager.getAllInitializedExtension()).thenReturn(workerPoolList); AtomicLong atomicLong = new AtomicLong(); - PowerMockito.when(workerPool.getUncaughtExceptionHandler()) + Mockito.when(workerPool.getUncaughtExceptionHandler()) .thenReturn(new TrpcThreadExceptionHandler(atomicLong, atomicLong, atomicLong)); - ServiceConfig serviceConfig = PowerMockito.mock(ServiceConfig.class); - PowerMockito.when(serviceConfig.getWorkerPoolObj()).thenReturn(workerPool); + ServiceConfig serviceConfig = Mockito.mock(ServiceConfig.class); + Mockito.when(serviceConfig.getWorkerPoolObj()).thenReturn(workerPool); ConfigManager.getInstance().getServerConfig().getServiceMap().put("trpc_test", serviceConfig); - ClientConfig clientConfig = PowerMockito.mock(ClientConfig.class); + ClientConfig clientConfig = Mockito.mock(ClientConfig.class); Map backendConfigMap = new HashMap<>(); - BackendConfig backendConfig = PowerMockito.mock(BackendConfig.class); - PowerMockito.when(backendConfig.getWorkerPoolObj()).thenReturn(workerPool); + BackendConfig backendConfig = Mockito.mock(BackendConfig.class); + Mockito.when(backendConfig.getWorkerPoolObj()).thenReturn(workerPool); backendConfigMap.put("aaa", backendConfig); - PowerMockito.when(clientConfig.getBackendConfigMap()).thenReturn(backendConfigMap); + Mockito.when(clientConfig.getBackendConfigMap()).thenReturn(backendConfigMap); ConfigManager.getInstance().setClientConfig(clientConfig); RpcStatsAdmin rpcStatsAdmin = new RpcStatsAdmin(); RpcStatsDto rpcStats = rpcStatsAdmin.rpc(); } - @Test public void testRpcStatsAdmin() { - WorkerPool workerPool = PowerMockito.mock(ThreadWorkerPool.class); + WorkerPool workerPool = Mockito.mock(ThreadWorkerPool.class); AtomicLong atomicLong = new AtomicLong(); - PowerMockito.when(workerPool.getUncaughtExceptionHandler()) + Mockito.when(workerPool.getUncaughtExceptionHandler()) .thenReturn(new TrpcThreadExceptionHandler(atomicLong, atomicLong, atomicLong)); - ServiceConfig serviceConfig = PowerMockito.mock(ServiceConfig.class); - PowerMockito.when(serviceConfig.getWorkerPoolObj()).thenReturn(workerPool); + ServiceConfig serviceConfig = Mockito.mock(ServiceConfig.class); + Mockito.when(serviceConfig.getWorkerPoolObj()).thenReturn(workerPool); ConfigManager.getInstance().getServerConfig().getServiceMap().put("trpc_test", serviceConfig); - ClientConfig clientConfig = PowerMockito.mock(ClientConfig.class); + ClientConfig clientConfig = Mockito.mock(ClientConfig.class); Map backendConfigMap = new HashMap<>(); - BackendConfig backendConfig = PowerMockito.mock(BackendConfig.class); - PowerMockito.when(backendConfig.getWorkerPoolObj()).thenReturn(workerPool); + BackendConfig backendConfig = Mockito.mock(BackendConfig.class); + Mockito.when(backendConfig.getWorkerPoolObj()).thenReturn(workerPool); backendConfigMap.put("aaa", backendConfig); - PowerMockito.when(clientConfig.getBackendConfigMap()).thenReturn(backendConfigMap); + Mockito.when(clientConfig.getBackendConfigMap()).thenReturn(backendConfigMap); ConfigManager.getInstance().setClientConfig(clientConfig); RpcStatsAdmin rpcStatsAdmin = new RpcStatsAdmin(); RpcStatsDto rpcStats = rpcStatsAdmin.rpc(); @@ -132,12 +133,11 @@ public void testRpcStatsDto() { rpcStatsDto.getErrorcode(); } - @Test public void testRpcStatsClientDto() { - WorkerPool workerPool = PowerMockito.mock(ThreadWorkerPool.class); + WorkerPool workerPool = Mockito.mock(ThreadWorkerPool.class); AtomicLong atomicLong = new AtomicLong(); - PowerMockito.when(workerPool.getUncaughtExceptionHandler()) + Mockito.when(workerPool.getUncaughtExceptionHandler()) .thenReturn(new TrpcThreadExceptionHandler(atomicLong, atomicLong, atomicLong)); RpcStatsClientDto rpcStatsClientDto = new RpcStatsClientDto(workerPool); rpcStatsClientDto.setErrorTotal(1L); @@ -166,9 +166,9 @@ public void testRpcStatsClientDto() { @Test public void testRpcStatsServiceDto() { - WorkerPool workerPool = PowerMockito.mock(ThreadWorkerPool.class); + WorkerPool workerPool = Mockito.mock(ThreadWorkerPool.class); AtomicLong atomicLong = new AtomicLong(); - PowerMockito.when(workerPool.getUncaughtExceptionHandler()) + Mockito.when(workerPool.getUncaughtExceptionHandler()) .thenReturn(new TrpcThreadExceptionHandler(atomicLong, atomicLong, atomicLong)); RpcStatsServiceDto rpcStatsServiceDto = new RpcStatsServiceDto( workerPool); @@ -206,8 +206,8 @@ public void testRpcStatsServiceDto() { rpcStatsServiceDto.getRspTotal(); rpcStatsServiceDto.getRspAvgLen(); - WorkerPool forkJoinPool = PowerMockito.mock(ForkJoinWorkerPool.class); - PowerMockito.when(forkJoinPool.getUncaughtExceptionHandler()) + WorkerPool forkJoinPool = Mockito.mock(ForkJoinWorkerPool.class); + Mockito.when(forkJoinPool.getUncaughtExceptionHandler()) .thenReturn(new TrpcThreadExceptionHandler(atomicLong, atomicLong, atomicLong)); RpcStatsServiceDto serviceDto = new RpcStatsServiceDto( forkJoinPool); diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ServerConfigOverviewTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ServerConfigOverviewTest.java index b35273386a..fed23d22a1 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ServerConfigOverviewTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/ServerConfigOverviewTest.java @@ -11,9 +11,9 @@ package com.tencent.trpc.admin; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ServerConfigOverviewTest { diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/WorkerPoolAdminTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/WorkerPoolAdminTest.java index 7ff1ad0fc9..ba106905b0 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/WorkerPoolAdminTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/WorkerPoolAdminTest.java @@ -19,20 +19,20 @@ import com.tencent.trpc.core.worker.spi.WorkerPool; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -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 WorkerPoolAdminTest { - @Before + @BeforeEach public void setUp() { ConfigManager.stopTest(); ConfigManager.startTest(); } - @After + @AfterEach public void tearDown() { ConfigManager.stopTest(); } @@ -41,15 +41,15 @@ public void tearDown() { public void testGetWorkerPoolInfo() { WorkerPoolAdmin workerPoolAdmin = new WorkerPoolAdmin(); WorkerPoolInfoDto workerPoolInfoDto = workerPoolAdmin.report(); - Assert.assertTrue(workerPoolInfoDto.toString().contains("WorkerPoolInfoDto{")); - Assert.assertEquals(CommonDto.SUCCESS, workerPoolInfoDto.getErrorcode()); - Assert.assertTrue(StringUtils.isEmpty(workerPoolInfoDto.getMessage())); - Assert.assertTrue(MapUtils.isEmpty(workerPoolInfoDto.getWorkerPoolInfo())); + Assertions.assertTrue(workerPoolInfoDto.toString().contains("WorkerPoolInfoDto{")); + Assertions.assertEquals(CommonDto.SUCCESS, workerPoolInfoDto.getErrorcode()); + Assertions.assertTrue(StringUtils.isEmpty(workerPoolInfoDto.getMessage())); + Assertions.assertTrue(MapUtils.isEmpty(workerPoolInfoDto.getWorkerPoolInfo())); WorkerPool workerPool = WorkerPoolManager.get(WorkerPoolManager.DEF_CONSUMER_WORKER_POOL_NAME); - Assert.assertNotNull(workerPool); + Assertions.assertNotNull(workerPool); workerPoolInfoDto = workerPoolAdmin.report(); - Assert.assertTrue(MapUtils.isNotEmpty(workerPoolInfoDto.getWorkerPoolInfo())); + Assertions.assertTrue(MapUtils.isNotEmpty(workerPoolInfoDto.getWorkerPoolInfo())); } } diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/custom/TestAdmin.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/custom/TestAdmin.java index 6d91f1c5ff..c17cfb9947 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/custom/TestAdmin.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/custom/TestAdmin.java @@ -12,10 +12,10 @@ package com.tencent.trpc.admin.custom; import com.tencent.trpc.core.admin.spi.Admin; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path("/cmds") public class TestAdmin implements Admin { diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommandDtoTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommandDtoTest.java index 8c3d2ed79f..f2d38f33f2 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommandDtoTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommandDtoTest.java @@ -12,9 +12,9 @@ package com.tencent.trpc.admin.dto; import com.google.common.collect.Lists; -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; /** * Command dto test @@ -24,26 +24,26 @@ public class CommandDtoTest { private CommandDto commandDto; - @Before + @BeforeEach public void setUp() { this.commandDto = new CommandDto(Lists.newArrayList()); } @Test public void testGetCmds() { - Assert.assertTrue(commandDto.getCmds().isEmpty()); + Assertions.assertTrue(commandDto.getCmds().isEmpty()); } @Test public void testSetCmds() { commandDto.setCmds(Lists.newArrayList("1", "2")); - Assert.assertEquals(2, commandDto.getCmds().size()); - Assert.assertEquals(commandDto.getCmds().get(0), "1"); - Assert.assertEquals(commandDto.getCmds().get(1), "2"); + Assertions.assertEquals(2, commandDto.getCmds().size()); + Assertions.assertEquals(commandDto.getCmds().get(0), "1"); + Assertions.assertEquals(commandDto.getCmds().get(1), "2"); } @Test public void testToString() { - Assert.assertEquals(commandDto.toString(), "CommandDto{cmds=[]} CommonDto{errorcode='0', message=''}"); + Assertions.assertEquals(commandDto.toString(), "CommandDto{cmds=[]} CommonDto{errorcode='0', message=''}"); } -} \ No newline at end of file +} diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommonDtoTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommonDtoTest.java index a35e465c7b..e5591752d7 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommonDtoTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/CommonDtoTest.java @@ -11,9 +11,9 @@ package com.tencent.trpc.admin.dto; -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; /** * CommonDto test class @@ -32,36 +32,36 @@ public class CommonDtoTest { private CommonDto commonDto; - @Before + @BeforeEach public void setUp() { this.commonDto = new CommonDto(); } @Test public void testGetErrorcode() { - Assert.assertEquals(this.commonDto.getErrorcode(), CommonDto.SUCCESS); + Assertions.assertEquals(this.commonDto.getErrorcode(), CommonDto.SUCCESS); } @Test public void testSetErrorcode() { this.commonDto.setErrorcode(ERROR_CODE); - Assert.assertEquals(this.commonDto.getErrorcode(), ERROR_CODE); + Assertions.assertEquals(this.commonDto.getErrorcode(), ERROR_CODE); } @Test public void testGetMessage() { - Assert.assertEquals(this.commonDto.getMessage(), ""); + Assertions.assertEquals(this.commonDto.getMessage(), ""); } @Test public void testSetMessage() { this.commonDto.setMessage(MESSAGE); - Assert.assertEquals(this.commonDto.getMessage(), MESSAGE); + Assertions.assertEquals(this.commonDto.getMessage(), MESSAGE); } @Test public void testToString() { - Assert.assertEquals(this.commonDto.toString(), "CommonDto{errorcode='0', message=''}"); + Assertions.assertEquals(this.commonDto.toString(), "CommonDto{errorcode='0', message=''}"); } -} \ No newline at end of file +} diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/ConfigOverviewDtoTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/ConfigOverviewDtoTest.java index c4c8957091..ecedee19aa 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/ConfigOverviewDtoTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/ConfigOverviewDtoTest.java @@ -12,9 +12,9 @@ package com.tencent.trpc.admin.dto; import com.tencent.trpc.admin.ApplicationConfigOverview; -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; /** * Configuration view test class @@ -23,25 +23,25 @@ public class ConfigOverviewDtoTest { private ConfigOverviewDto configOverviewDto; - @Before + @BeforeEach public void setUp() { this.configOverviewDto = new ConfigOverviewDto(); } @Test public void getContent() { - Assert.assertNull(configOverviewDto.getContent()); + Assertions.assertNull(configOverviewDto.getContent()); } @Test public void setContent() { configOverviewDto.setContent(ApplicationConfigOverview.getInstance()); - Assert.assertEquals(ApplicationConfigOverview.getInstance(), configOverviewDto.getContent()); + Assertions.assertEquals(ApplicationConfigOverview.getInstance(), configOverviewDto.getContent()); } @Test public void testToString() { - Assert.assertEquals(configOverviewDto.toString(), + Assertions.assertEquals(configOverviewDto.toString(), "ConfigOverviewDto{content=null} CommonDto{errorcode='0', message=''}"); } -} \ No newline at end of file +} diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelDtoTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelDtoTest.java index 4990ac1316..8c210c56cd 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelDtoTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelDtoTest.java @@ -13,9 +13,9 @@ import com.tencent.trpc.logger.admin.LoggerLevelInfo; import java.util.ArrayList; -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; /** * Log level view test class @@ -24,7 +24,7 @@ public class LoggerLevelDtoTest { private LoggerLevelDto loggerLevelDto; - @Before + @BeforeEach public void setUp() { this.loggerLevelDto = new LoggerLevelDto(); } @@ -32,27 +32,27 @@ public void setUp() { @Test public void testBuildFail() { LoggerLevelDto fail = LoggerLevelDto.buildFail("FAIL"); - Assert.assertEquals(fail.getMessage(), "FAIL"); - Assert.assertEquals(fail.getErrorcode(), CommonDto.FAIL); + Assertions.assertEquals(fail.getMessage(), "FAIL"); + Assertions.assertEquals(fail.getErrorcode(), CommonDto.FAIL); } @Test public void testGetLogger() { - Assert.assertNull(loggerLevelDto.getLogger()); + Assertions.assertNull(loggerLevelDto.getLogger()); } @Test public void testSetLogger() { loggerLevelDto.setLogger(new ArrayList<>()); - Assert.assertEquals(loggerLevelDto.getLogger().size(), 0); + Assertions.assertEquals(loggerLevelDto.getLogger().size(), 0); loggerLevelDto.getLogger().add(new LoggerLevelInfo()); - Assert.assertEquals(loggerLevelDto.getLogger().size(), 1); + Assertions.assertEquals(loggerLevelDto.getLogger().size(), 1); } @Test public void testToString() { - Assert.assertEquals(loggerLevelDto.toString(), + Assertions.assertEquals(loggerLevelDto.toString(), "LoggerLevelDto{logger=null} CommonDto{errorcode='0', message=''}"); } -} \ No newline at end of file +} diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelRevisedDtoTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelRevisedDtoTest.java index 3c98e4e15a..7213a5c48a 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelRevisedDtoTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/LoggerLevelRevisedDtoTest.java @@ -11,9 +11,9 @@ package com.tencent.trpc.admin.dto; -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; /** * Log level modification view class @@ -22,7 +22,7 @@ public class LoggerLevelRevisedDtoTest { private LoggerLevelRevisedDto loggerLevelRevisedDto; - @Before + @BeforeEach public void setUp() { this.loggerLevelRevisedDto = new LoggerLevelRevisedDto(); } @@ -30,36 +30,36 @@ public void setUp() { @Test public void testBuildFail() { LoggerLevelDto fail = LoggerLevelDto.buildFail("FAIL"); - Assert.assertEquals(fail.getMessage(), "FAIL"); - Assert.assertEquals(fail.getErrorcode(), CommonDto.FAIL); + Assertions.assertEquals(fail.getMessage(), "FAIL"); + Assertions.assertEquals(fail.getErrorcode(), CommonDto.FAIL); } @Test public void testGetLevel() { - Assert.assertNull(loggerLevelRevisedDto.getLevel()); + Assertions.assertNull(loggerLevelRevisedDto.getLevel()); } @Test public void testSetLevel() { loggerLevelRevisedDto.setLevel("1"); - Assert.assertEquals(loggerLevelRevisedDto.getLevel(), "1"); + Assertions.assertEquals(loggerLevelRevisedDto.getLevel(), "1"); } @Test public void testGetPrelevel() { - Assert.assertNull(loggerLevelRevisedDto.getPrelevel()); + Assertions.assertNull(loggerLevelRevisedDto.getPrelevel()); } @Test public void testSetPrelevel() { loggerLevelRevisedDto.setPrelevel("2"); - Assert.assertEquals(loggerLevelRevisedDto.getPrelevel(), "2"); + Assertions.assertEquals(loggerLevelRevisedDto.getPrelevel(), "2"); } @Test public void testToString() { - Assert.assertEquals(loggerLevelRevisedDto.toString(), + Assertions.assertEquals(loggerLevelRevisedDto.toString(), "LoggerLevelRevisedDto{level='null', prelevel='null'} CommonDto{errorcode='0', message=''}"); } -} \ No newline at end of file +} diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/VersionDtoTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/VersionDtoTest.java index f0a623b1e0..8474f2a498 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/VersionDtoTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/VersionDtoTest.java @@ -11,9 +11,9 @@ package com.tencent.trpc.admin.dto; -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; /** * VersionDtoTest @@ -22,25 +22,25 @@ public class VersionDtoTest { private VersionDto versionDto; - @Before + @BeforeEach public void setUp() { this.versionDto = new VersionDto(); } @Test public void testGetVersion() { - Assert.assertNull(versionDto.getVersion()); + Assertions.assertNull(versionDto.getVersion()); } @Test public void testSetVersion() { versionDto.setVersion("a"); - Assert.assertEquals(versionDto.getVersion(), "a"); + Assertions.assertEquals(versionDto.getVersion(), "a"); } @Test public void testToString() { - Assert.assertEquals(versionDto.toString(), "VersionDto{version='null'} CommonDto{errorcode='0', message=''}"); + Assertions.assertEquals(versionDto.toString(), "VersionDto{version='null'} CommonDto{errorcode='0', message=''}"); } -} \ No newline at end of file +} diff --git a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/WorkerPoolInfoDtoTest.java b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/WorkerPoolInfoDtoTest.java index 00971526e0..f901091a26 100644 --- a/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/WorkerPoolInfoDtoTest.java +++ b/trpc-admin/trpc-admin-default/src/test/java/com/tencent/trpc/admin/dto/WorkerPoolInfoDtoTest.java @@ -14,9 +14,9 @@ import com.tencent.trpc.core.management.ForkJoinPoolMXBeanImpl; import java.util.HashMap; import java.util.concurrent.ForkJoinPool; -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; /** * WorkerPoolInfoDtoTest @@ -25,28 +25,28 @@ public class WorkerPoolInfoDtoTest { private WorkerPoolInfoDto workerPoolInfoDto; - @Before + @BeforeEach public void setUp() { this.workerPoolInfoDto = new WorkerPoolInfoDto(null); } @Test public void testGetWorkerPoolInfo() { - Assert.assertNull(workerPoolInfoDto.getWorkerPoolInfo()); + Assertions.assertNull(workerPoolInfoDto.getWorkerPoolInfo()); } @Test public void testSetWorkerPoolInfo() { workerPoolInfoDto.setWorkerPoolInfo(new HashMap<>()); - Assert.assertNotNull(workerPoolInfoDto.getWorkerPoolInfo()); + Assertions.assertNotNull(workerPoolInfoDto.getWorkerPoolInfo()); ForkJoinPoolMXBeanImpl report = new ForkJoinPoolMXBeanImpl(new ForkJoinPool()); workerPoolInfoDto.getWorkerPoolInfo().put("a", report); - Assert.assertEquals(workerPoolInfoDto.getWorkerPoolInfo().get("a"), report); + Assertions.assertEquals(workerPoolInfoDto.getWorkerPoolInfo().get("a"), report); } @Test public void testToString() { - Assert.assertEquals(workerPoolInfoDto.toString(), + Assertions.assertEquals(workerPoolInfoDto.toString(), "WorkerPoolInfoDto{workerPoolInfo=null} CommonDto{errorcode='0', message=''}"); } -} \ No newline at end of file +} From d9b5bec47542932243f1c60171e03f119e57e225 Mon Sep 17 00:00:00 2001 From: drow931 <632722781@qq.com> Date: Tue, 20 Jan 2026 15:53:41 +0800 Subject: [PATCH 2/5] feat(admin): Upgrade Jakarta EE dependencies for RESTEasy 6.x compatibility --- trpc-dependencies/trpc-dependencies-bom/pom.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/trpc-dependencies/trpc-dependencies-bom/pom.xml b/trpc-dependencies/trpc-dependencies-bom/pom.xml index f902c1824d..e839e92219 100644 --- a/trpc-dependencies/trpc-dependencies-bom/pom.xml +++ b/trpc-dependencies/trpc-dependencies-bom/pom.xml @@ -90,9 +90,10 @@ 2.15.0-rc2 6.0.0 2.1.1 - 1.2.1 + 2.1.3 + 2.0.2 3.0.2 - 2.3.2 + 4.0.2 2.1.1 2.0.1.Final 8.1.13.v20181017 @@ -132,8 +133,7 @@ 0.6.13 0.7.9 0.9.12 - 5.0.6.Final - + 6.2.15.Final 1.8.6 1.8.6 2.0.17 @@ -471,6 +471,11 @@ jakarta.activation-api ${jakarta.activation-api.version} + + org.eclipse.angus + angus-activation + ${angus-activation.version} + jakarta.validation jakarta.validation-api @@ -660,7 +665,7 @@ ${resteasy.version} - resteasy-netty4 + resteasy-undertow org.jboss.resteasy ${resteasy.version} From cebca625379a0a76823122eb9c79db276ce843d2 Mon Sep 17 00:00:00 2001 From: drow931 <632722781@qq.com> Date: Wed, 21 Jan 2026 17:29:53 +0800 Subject: [PATCH 3/5] trpc-code-generator/trpc-configcenter/trpc-limiter: migrate tests to JUnit 5 for Spring Boot 3.x compatibility --- .../trpc/codegen/CodeGenerateTest.java | 156 ++++++++-------- .../trpc/codegen/CodegenTestHelper.java | 6 +- .../protobuf/DescriptorProtoCompileTest.java | 14 +- .../trpc/codegen/protoc/ProtocTest.java | 12 +- .../trpc/codegen/template/FreeMarkerTest.java | 2 +- .../codegen/template/TemplateEngineTest.java | 6 +- .../trpc-configcenter-nacos/pom.xml | 10 + .../nacos/NacosConfigurationLoaderTest.java | 171 +++++++++--------- .../trpc-configcenter-open-polaris/pom.xml | 10 + .../polaris/PolarisConfigTest.java | 8 +- .../PolarisConfigurationLoaderTest.java | 20 +- trpc-limiter/trpc-limiter-sentinel/pom.xml | 6 +- .../limiter/sentinel/SentinelLimiterTest.java | 11 +- .../sentinel/config/SentinelConfigTest.java | 6 +- .../config/SentinelLimiterConfigTest.java | 22 +-- .../LocalFileDatasourceConfigTest.java | 10 +- .../datasource/NacosDatasourceConfigTest.java | 12 +- .../datasource/RedisDatasourceConfigTest.java | 34 ++-- .../ZookeeperDatasourceConfigTest.java | 20 +- .../DatasourceConfigFactoryMangerTest.java | 12 +- .../LocalFileDatasourceConfigFactoryTest.java | 8 +- .../NacosDatasourceConfigFactoryTest.java | 6 +- .../RedisDatasourceConfigFactoryTest.java | 8 +- .../ZookeeperDatasourceConfigFactoryTest.java | 6 +- .../filter/SentinelLimiterFilterTest.java | 10 +- 25 files changed, 301 insertions(+), 285 deletions(-) diff --git a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodeGenerateTest.java b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodeGenerateTest.java index 3882ff424c..bdd699505a 100644 --- a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodeGenerateTest.java +++ b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodeGenerateTest.java @@ -32,8 +32,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.codec.digest.DigestUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class CodeGenerateTest { @@ -50,11 +50,11 @@ public void testTRpcCase1() throws IOException { runTest(Protocol.TRPC, "TEST-1"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("6eaef685e6b986ce56e3bcc7d14e1c4c", + Assertions.assertEquals("6eaef685e6b986ce56e3bcc7d14e1c4c", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("23446b6413c80bf8a1aa6ee234c6fba9", + Assertions.assertEquals("23446b6413c80bf8a1aa6ee234c6fba9", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("9caa57d08d0b3fcb9d617ac8d8d135e5", + Assertions.assertEquals("9caa57d08d0b3fcb9d617ac8d8d135e5", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -67,11 +67,11 @@ public void testGRpcCase1() throws IOException { runTest(Protocol.GRPC, "TEST-1"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("7c9a444f814fb2881053aaff9d227db6", + Assertions.assertEquals("7c9a444f814fb2881053aaff9d227db6", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("23446b6413c80bf8a1aa6ee234c6fba9", + Assertions.assertEquals("23446b6413c80bf8a1aa6ee234c6fba9", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("9caa57d08d0b3fcb9d617ac8d8d135e5", + Assertions.assertEquals("9caa57d08d0b3fcb9d617ac8d8d135e5", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -84,13 +84,13 @@ public void testTRpcCase2() throws IOException { runTest(Protocol.TRPC, "TEST-2"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("7c9944d4b57d3c5bcf0e0e41e543322d", + Assertions.assertEquals("7c9944d4b57d3c5bcf0e0e41e543322d", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("075e5962815321ae423bc38165fdf303", + Assertions.assertEquals("075e5962815321ae423bc38165fdf303", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("285ef96d563b7b5f87472ebb218f1624", + Assertions.assertEquals("285ef96d563b7b5f87472ebb218f1624", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java")))); - Assert.assertEquals("2eb8ad08c973e8cb107cc596db1709b1", + Assertions.assertEquals("2eb8ad08c973e8cb107cc596db1709b1", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -103,13 +103,13 @@ public void testGRpcCase2() throws IOException { runTest(Protocol.GRPC, "TEST-2"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("c61eda56e21950f11615ac0a6c2d5fe8", + Assertions.assertEquals("c61eda56e21950f11615ac0a6c2d5fe8", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("075e5962815321ae423bc38165fdf303", + Assertions.assertEquals("075e5962815321ae423bc38165fdf303", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("be4038417c2098b60a7af42e73c1abf6", + Assertions.assertEquals("be4038417c2098b60a7af42e73c1abf6", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java")))); - Assert.assertEquals("2eb8ad08c973e8cb107cc596db1709b1", + Assertions.assertEquals("2eb8ad08c973e8cb107cc596db1709b1", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -122,15 +122,15 @@ public void testTRpcCase3() throws IOException { runTest(Protocol.TRPC, "TEST-3"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("c817495291050d99de03589c0b2840bf", + Assertions.assertEquals("c817495291050d99de03589c0b2840bf", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("b8cd07293d73ebb299f1997136b9cfd6", + Assertions.assertEquals("b8cd07293d73ebb299f1997136b9cfd6", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("926fcc803803125fc0910f4b7c309b26", + Assertions.assertEquals("926fcc803803125fc0910f4b7c309b26", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java")))); - Assert.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9", + Assertions.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); - Assert.assertEquals("fa93e09f70c157d59019dd62610cb4f3", + Assertions.assertEquals("fa93e09f70c157d59019dd62610cb4f3", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("msg").resolve("Hello.java")))); } @@ -143,15 +143,15 @@ public void testGRpcCase3() throws IOException { runTest(Protocol.GRPC, "TEST-3"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("a3bcaeb3ec937819eb26fe3a60219957", + Assertions.assertEquals("a3bcaeb3ec937819eb26fe3a60219957", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("b8cd07293d73ebb299f1997136b9cfd6", + Assertions.assertEquals("b8cd07293d73ebb299f1997136b9cfd6", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("e8108341efbc3d36bf3dcc9ba8ea0b41", + Assertions.assertEquals("e8108341efbc3d36bf3dcc9ba8ea0b41", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java")))); - Assert.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9", + Assertions.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); - Assert.assertEquals("fa93e09f70c157d59019dd62610cb4f3", + Assertions.assertEquals("fa93e09f70c157d59019dd62610cb4f3", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("msg").resolve("Hello.java")))); } @@ -164,19 +164,19 @@ public void testTRpcCase4() throws IOException { runTest(Protocol.TRPC, "TEST-4"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("trpc", "exp", "helloworld")); - Assert.assertEquals("b5e67d899ef1885461d791a22631e49b", + Assertions.assertEquals("b5e67d899ef1885461d791a22631e49b", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("b7640a2fe62a3464ad25d0be603d1966", + Assertions.assertEquals("b7640a2fe62a3464ad25d0be603d1966", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("608f0a195f7e542aa11be2ff5fb82199", + Assertions.assertEquals("608f0a195f7e542aa11be2ff5fb82199", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequest.java")))); - Assert.assertEquals("01e5a8f2f794ee7c81873fc62c93c31a", + Assertions.assertEquals("01e5a8f2f794ee7c81873fc62c93c31a", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequestOrBuilder.java")))); - Assert.assertEquals("d24f652118fcd17e03b65c7423b71fbf", + Assertions.assertEquals("d24f652118fcd17e03b65c7423b71fbf", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReply.java")))); - Assert.assertEquals("d0341d2cdbeaca4557c25e6f07c65458", + Assertions.assertEquals("d0341d2cdbeaca4557c25e6f07c65458", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReplyOrBuilder.java")))); - Assert.assertEquals("cbea0bc31f8ce927120b77c4b26475d5", + Assertions.assertEquals("cbea0bc31f8ce927120b77c4b26475d5", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloNext.java")))); } @@ -189,19 +189,19 @@ public void testGRpcCase4() throws IOException { runTest(Protocol.GRPC, "TEST-4"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("trpc", "exp", "helloworld")); - Assert.assertEquals("154e3b53d0f034155ff1603998a105a5", + Assertions.assertEquals("154e3b53d0f034155ff1603998a105a5", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("b7640a2fe62a3464ad25d0be603d1966", + Assertions.assertEquals("b7640a2fe62a3464ad25d0be603d1966", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("608f0a195f7e542aa11be2ff5fb82199", + Assertions.assertEquals("608f0a195f7e542aa11be2ff5fb82199", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequest.java")))); - Assert.assertEquals("01e5a8f2f794ee7c81873fc62c93c31a", + Assertions.assertEquals("01e5a8f2f794ee7c81873fc62c93c31a", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloRequestOrBuilder.java")))); - Assert.assertEquals("d24f652118fcd17e03b65c7423b71fbf", + Assertions.assertEquals("d24f652118fcd17e03b65c7423b71fbf", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReply.java")))); - Assert.assertEquals("d0341d2cdbeaca4557c25e6f07c65458", + Assertions.assertEquals("d0341d2cdbeaca4557c25e6f07c65458", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloReplyOrBuilder.java")))); - Assert.assertEquals("cbea0bc31f8ce927120b77c4b26475d5", + Assertions.assertEquals("cbea0bc31f8ce927120b77c4b26475d5", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloNext.java")))); } @@ -214,13 +214,13 @@ public void testTRpcCase5() throws IOException { runTest(Protocol.TRPC, "TEST-5"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test", "helloworld")); - Assert.assertEquals("c0ac8b85e80f949dd9674a31d2fb28c1", + Assertions.assertEquals("c0ac8b85e80f949dd9674a31d2fb28c1", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("3d0ff8da3ace15f1bd055164ec1da4b9", + Assertions.assertEquals("3d0ff8da3ace15f1bd055164ec1da4b9", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("b23d158eedf9ea3912703f084ff72ec2", + Assertions.assertEquals("b23d158eedf9ea3912703f084ff72ec2", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); - Assert.assertEquals("9277fefe3ff6af9a95062d359db14ebe", + Assertions.assertEquals("9277fefe3ff6af9a95062d359db14ebe", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceValidator.java")))); } @@ -233,13 +233,13 @@ public void testGRpcCase5() throws IOException { runTest(Protocol.GRPC, "TEST-5"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test", "helloworld")); - Assert.assertEquals("53541c1d2a78e70b8e0b7323b77721bf", + Assertions.assertEquals("53541c1d2a78e70b8e0b7323b77721bf", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("3d0ff8da3ace15f1bd055164ec1da4b9", + Assertions.assertEquals("3d0ff8da3ace15f1bd055164ec1da4b9", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("b23d158eedf9ea3912703f084ff72ec2", + Assertions.assertEquals("b23d158eedf9ea3912703f084ff72ec2", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); - Assert.assertEquals("9277fefe3ff6af9a95062d359db14ebe", + Assertions.assertEquals("9277fefe3ff6af9a95062d359db14ebe", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceValidator.java")))); } @@ -252,13 +252,13 @@ public void testTRpcCase6() throws IOException { runTest(Protocol.TRPC, "TEST-6"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("0e292fa89a93a0cbd3ecb51d3ca42b31", + Assertions.assertEquals("0e292fa89a93a0cbd3ecb51d3ca42b31", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("70abf7c48136e3f8d2a08ec15796a47e", + Assertions.assertEquals("70abf7c48136e3f8d2a08ec15796a47e", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("2f519ad1efafb3d145c5847e7831b559", + Assertions.assertEquals("2f519ad1efafb3d145c5847e7831b559", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java")))); - Assert.assertEquals("62ed6dc1ad9883094281a4bc35416c56", + Assertions.assertEquals("62ed6dc1ad9883094281a4bc35416c56", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloCamelCase.java")))); } @@ -271,13 +271,13 @@ public void testGRpcCase6() throws IOException { runTest(Protocol.GRPC, "TEST-6"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("b0bdf649fa7269a0160846d5302952be", + Assertions.assertEquals("b0bdf649fa7269a0160846d5302952be", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("70abf7c48136e3f8d2a08ec15796a47e", + Assertions.assertEquals("70abf7c48136e3f8d2a08ec15796a47e", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("651a3065ac06e2b157ef7b8ba15bce6a", + Assertions.assertEquals("651a3065ac06e2b157ef7b8ba15bce6a", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java")))); - Assert.assertEquals("62ed6dc1ad9883094281a4bc35416c56", + Assertions.assertEquals("62ed6dc1ad9883094281a4bc35416c56", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloCamelCase.java")))); } @@ -290,13 +290,13 @@ public void testTRpcCase7() throws IOException { runTest(Protocol.TRPC, "TEST-7"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("a5fe0f6823f80d27574e2051da1ed33e", + Assertions.assertEquals("a5fe0f6823f80d27574e2051da1ed33e", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceAPI.java")))); - Assert.assertEquals("33b88906768a6b7c8b665714dfda8bd1", + Assertions.assertEquals("33b88906768a6b7c8b665714dfda8bd1", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceAsyncAPI.java")))); - Assert.assertEquals("777387facf2cbc71228c30de20ed2226", + Assertions.assertEquals("777387facf2cbc71228c30de20ed2226", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceStreamAPI.java")))); - Assert.assertEquals("640d503c66e105c9776037895a406613", + Assertions.assertEquals("640d503c66e105c9776037895a406613", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -309,13 +309,13 @@ public void testGRpcCase7() throws IOException { runTest(Protocol.GRPC, "TEST-7"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("b7b0a488c9e5b4c2f3d789a7e9833e8a", + Assertions.assertEquals("b7b0a488c9e5b4c2f3d789a7e9833e8a", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceAPI.java")))); - Assert.assertEquals("33b88906768a6b7c8b665714dfda8bd1", + Assertions.assertEquals("33b88906768a6b7c8b665714dfda8bd1", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceAsyncAPI.java")))); - Assert.assertEquals("a0c28a7babedf863e31740b320857b0f", + Assertions.assertEquals("a0c28a7babedf863e31740b320857b0f", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterServiceStreamAPI.java")))); - Assert.assertEquals("640d503c66e105c9776037895a406613", + Assertions.assertEquals("640d503c66e105c9776037895a406613", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -328,13 +328,13 @@ public void testTRpcCase8() throws IOException { runTest(Protocol.TRPC, "TEST-8"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("2d9780f352044c82bfef69afebeb7da5", + Assertions.assertEquals("2d9780f352044c82bfef69afebeb7da5", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceAPI.java")))); - Assert.assertEquals("4ed1fab5faa4a31c54aa452e54664853", + Assertions.assertEquals("4ed1fab5faa4a31c54aa452e54664853", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceAsyncAPI.java")))); - Assert.assertEquals("446ff8e1c7479bb3f7da2d2c61cdf004", + Assertions.assertEquals("446ff8e1c7479bb3f7da2d2c61cdf004", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceStreamAPI.java")))); - Assert.assertEquals("639e78687054ee0ae8a88749fc3f36c3", + Assertions.assertEquals("639e78687054ee0ae8a88749fc3f36c3", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -347,13 +347,13 @@ public void testGRpcCase8() throws IOException { runTest(Protocol.GRPC, "TEST-8"); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("0cb047dba4e1726c8ac909447962e251", + Assertions.assertEquals("0cb047dba4e1726c8ac909447962e251", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceAPI.java")))); - Assert.assertEquals("4ed1fab5faa4a31c54aa452e54664853", + Assertions.assertEquals("4ed1fab5faa4a31c54aa452e54664853", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceAsyncAPI.java")))); - Assert.assertEquals("8e86f7527ddb01d27b574c6de39270d1", + Assertions.assertEquals("8e86f7527ddb01d27b574c6de39270d1", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("HelloWorldServiceStreamAPI.java")))); - Assert.assertEquals("639e78687054ee0ae8a88749fc3f36c3", + Assertions.assertEquals("639e78687054ee0ae8a88749fc3f36c3", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); } @@ -389,15 +389,15 @@ public Map getCustomVariables(List fileDescripto generator.generateCode(); Path base = getOutputBasePath(); Path java = base.resolve(Paths.get("com", "tencent", "trpc", "codegen", "test")); - Assert.assertEquals("c817495291050d99de03589c0b2840bf", + Assertions.assertEquals("c817495291050d99de03589c0b2840bf", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAPI.java")))); - Assert.assertEquals("b8cd07293d73ebb299f1997136b9cfd6", + Assertions.assertEquals("b8cd07293d73ebb299f1997136b9cfd6", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterAsyncAPI.java")))); - Assert.assertEquals("926fcc803803125fc0910f4b7c309b26", + Assertions.assertEquals("926fcc803803125fc0910f4b7c309b26", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterStreamAPI.java")))); - Assert.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9", + Assertions.assertEquals("9feac2c00a6b5fb137e0347e9d3c57a9", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("GreeterService.java")))); - Assert.assertEquals("fa93e09f70c157d59019dd62610cb4f3", + Assertions.assertEquals("fa93e09f70c157d59019dd62610cb4f3", DigestUtils.md5Hex(Files.readAllBytes(java.resolve("msg").resolve("Hello.java")))); } @@ -418,4 +418,4 @@ private void runTest(Protocol protocol, String path) { private Path getOutputBasePath() { return Paths.get("target", "generated-sources", "trpc").toAbsolutePath(); } -} \ No newline at end of file +} diff --git a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodegenTestHelper.java b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodegenTestHelper.java index 6995502e0c..42737549c7 100644 --- a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodegenTestHelper.java +++ b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/CodegenTestHelper.java @@ -15,7 +15,6 @@ import com.tencent.trpc.codegen.protoc.Protoc; import com.tencent.trpc.codegen.protoc.ProtocTest; import com.tencent.trpc.codegen.util.JarUtils; -import org.junit.Assert; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; @@ -25,6 +24,7 @@ import java.nio.file.Paths; import java.util.Iterator; import java.util.jar.JarFile; +import org.junit.jupiter.api.Assertions; public class CodegenTestHelper { public static final Path TEST_ROOT = getTestClassesRoot(); // target/test-classes @@ -34,13 +34,13 @@ public class CodegenTestHelper { private static Path getTestClassesRoot() { URL url = ProtocTest.class.getClassLoader().getResource("TEST-1/hello.proto"); - Assert.assertNotNull(url); + Assertions.assertNotNull(url); return Paths.get(url.getPath()).getParent().getParent(); } private static Path getImportRoot() { URL url = Protoc.class.getClassLoader().getResource("imports/trpc.proto"); - Assert.assertNotNull(url); + Assertions.assertNotNull(url); Path importRoot = Paths.get(url.getPath()).getParent(); try { extractCommonProtoFiles(importRoot); diff --git a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protobuf/DescriptorProtoCompileTest.java b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protobuf/DescriptorProtoCompileTest.java index 99576819a6..2edde1fb46 100644 --- a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protobuf/DescriptorProtoCompileTest.java +++ b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protobuf/DescriptorProtoCompileTest.java @@ -15,9 +15,9 @@ import com.google.protobuf.Descriptors.FileDescriptor; import com.tencent.trpc.codegen.CodegenTestHelper; import com.tencent.trpc.codegen.protoc.ProtocTest; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -26,7 +26,7 @@ public class DescriptorProtoCompileTest { private static final Path rootPath = CodegenTestHelper.TEST_ROOT; - @BeforeClass + @BeforeAll public static void prepare() { Path descriptorFile = rootPath.resolve("hello.pb"); if (!Files.exists(descriptorFile)) { @@ -39,11 +39,11 @@ public static void prepare() { public void testParseProtoDescriptorSet() throws IOException { Path descriptorFile = rootPath.resolve("hello.pb"); FileDescriptorSet set = ProtoParser.parseDescriptorSetFile(descriptorFile); - Assert.assertEquals(5, set.getFileCount()); + Assertions.assertEquals(5, set.getFileCount()); FileDescriptorsCompiler compiler = new FileDescriptorsCompiler(set.getFileList()); List fdList = compiler.compile(); - Assert.assertEquals(5, fdList.size()); + Assertions.assertEquals(5, fdList.size()); ProtoSourceInfo sourceInfo = ProtoParser.parseFileDescriptors(fdList); - Assert.assertEquals(1, sourceInfo.getServices().size()); + Assertions.assertEquals(1, sourceInfo.getServices().size()); } } diff --git a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protoc/ProtocTest.java b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protoc/ProtocTest.java index bf39b93ac2..ae355f4eed 100644 --- a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protoc/ProtocTest.java +++ b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/protoc/ProtocTest.java @@ -12,8 +12,8 @@ package com.tencent.trpc.codegen.protoc; import com.tencent.trpc.codegen.CodegenTestHelper; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -37,7 +37,7 @@ public void testGenerateDescriptorSet() { .importPaths(Collections.singletonList(importPath)) .output(rootPath.resolve("hello.pb")) .build()); - Assert.assertTrue(result.isSuccess()); + Assertions.assertTrue(result.isSuccess()); } /** @@ -52,7 +52,7 @@ public void testGenerateDescriptorSetError() { .importPaths(Collections.singletonList(importPath)) .output(rootPath.resolve("hello2.pb")) .build()); - Assert.assertFalse(result.isSuccess()); + Assertions.assertFalse(result.isSuccess()); } /** @@ -67,7 +67,7 @@ public void testGenerateDescriptorSetFailed() { .importPaths(Collections.singletonList(importPath)) .output(rootPath.resolve("non-exist.pb")) .build()); - Assert.assertFalse(result.isSuccess()); + Assertions.assertFalse(result.isSuccess()); } /** @@ -85,6 +85,6 @@ public void testGenerateStub() throws IOException { .language(Language.JAVA) .output(outPath) .build()); - Assert.assertTrue(result.isSuccess()); + Assertions.assertTrue(result.isSuccess()); } } diff --git a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/FreeMarkerTest.java b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/FreeMarkerTest.java index 6a3bfbaa55..c8a9be4a28 100644 --- a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/FreeMarkerTest.java +++ b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/FreeMarkerTest.java @@ -14,7 +14,7 @@ import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; import java.util.HashMap; diff --git a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/TemplateEngineTest.java b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/TemplateEngineTest.java index 16c17ab105..16fb81d9f5 100644 --- a/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/TemplateEngineTest.java +++ b/trpc-code-generator/src/test/java/com/tencent/trpc/codegen/template/TemplateEngineTest.java @@ -12,8 +12,8 @@ package com.tencent.trpc.codegen.template; 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 TemplateEngineTest { @@ -30,6 +30,6 @@ public void testTemplateEngine() { + " <#assign name = rtxName>\n" + "\n" + "hello ${name}!", context); - Assert.assertEquals("hello kelgonwu!", text); + Assertions.assertEquals("hello kelgonwu!", text); } } diff --git a/trpc-configcenter/trpc-configcenter-nacos/pom.xml b/trpc-configcenter/trpc-configcenter-nacos/pom.xml index b4df381545..5fdb721217 100644 --- a/trpc-configcenter/trpc-configcenter-nacos/pom.xml +++ b/trpc-configcenter/trpc-configcenter-nacos/pom.xml @@ -21,5 +21,15 @@ com.fasterxml.jackson.dataformat jackson-dataformat-properties + + org.springframework + spring-test + test + + + org.mockito + mockito-core + test + diff --git a/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java b/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java index 5cbfb7f810..e51c40c9d3 100644 --- a/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java +++ b/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.configcenter.nacos; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; @@ -33,19 +33,12 @@ import com.tencent.trpc.core.exception.ConfigCenterException; import com.tencent.trpc.core.exception.TRpcExtensionException; import com.tencent.trpc.core.extension.ExtensionLoader; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -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.Rule; // TODO: 迁移到 JUnit5 // TODO: 迁移到 JUnit5 // TODO: 迁移到 JUnit5 +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.powermock.reflect.Whitebox; import java.lang.reflect.Field; import java.util.Arrays; import java.util.Collection; @@ -54,13 +47,11 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.Executor; +import org.mockito.MockedStatic; /** * NacosConfigurationLoader Test */ -@RunWith(PowerMockRunner.class) -@PrepareForTest({NacosConfigurationLoader.class, NacosFactory.class}) -@PowerMockIgnore({"javax.management.*"}) public class NacosConfigurationLoaderTest { /** @@ -141,7 +132,7 @@ public class NacosConfigurationLoaderTest { /** * setUp */ - @Before + @BeforeEach public void setUp() { ConfigManager.stopTest(); ConfigManager.startTest(); @@ -191,7 +182,7 @@ public void setUp() { } } - @After + @AfterEach public void setDown() { ConfigManager.stopTest(); ExtensionLoader.destroyAllPlugin(); @@ -211,7 +202,7 @@ public void testNacosConfigSetMethod() { config.setDataId(DEFAULT_DATA_ID); NacosConfig.Config configOther = new NacosConfig.Config(DEFAULT_GROUP, DEFAULT_DATA_ID); boolean equals = config.equals(configOther); - Assert.assertTrue(equals); + Assertions.assertTrue(equals); } @Test @@ -220,56 +211,53 @@ public void testGetValue() throws NacosException { String key1 = "example.config.list[0].key1"; when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(YAML_EXAMPLE); - Assert.assertEquals(configYaml.getValue(key, DEFAULT_GROUP), "example"); - Assert.assertEquals(configYaml.getValue(key1, DEFAULT_GROUP), "value1"); + Assertions.assertEquals(configYaml.getValue(key, DEFAULT_GROUP), "example"); + Assertions.assertEquals(configYaml.getValue(key1, DEFAULT_GROUP), "value1"); String key2 = "example.config.list[1].key2"; when(configService.getConfig(APP_DATA_ID, APP_GROUP, TIMEOUT)).thenReturn(PROPERTIES_EXAMPLE); - Assert.assertEquals(configProperties.getValue(key, APP_GROUP), "example"); - Assert.assertEquals(configProperties.getValue(key2, APP_GROUP), "value2"); + Assertions.assertEquals(configProperties.getValue(key, APP_GROUP), "example"); + Assertions.assertEquals(configProperties.getValue(key2, APP_GROUP), "value2"); } - @Rule - public ExpectedException expectedEx = ExpectedException.none(); - @Test public void testGetValueForException() throws NacosException { - expectedEx.expect(ConfigCenterException.class); - expectedEx.expectMessage(String.format( - "Fetch config failed from Nacos, group: %s, dataId: %s", DEFAULT_GROUP, DEFAULT_DATA_ID)); String key = "example.config.name"; when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenThrow(new NacosException()); - Assert.assertNull(configYaml.getValue(key, DEFAULT_GROUP)); + ConfigCenterException exception = Assertions.assertThrows(ConfigCenterException.class, () -> { + configYaml.getValue(key, DEFAULT_GROUP); + }); + Assertions.assertTrue(exception.getMessage().contains( + String.format("Fetch config failed from Nacos, group: %s, dataId: %s", DEFAULT_GROUP, DEFAULT_DATA_ID))); } @Test @SuppressWarnings({"rawtypes", "unchecked"}) - public void testGroupDataIdCaches() throws NacosException, IllegalAccessException { + public void testGroupDataIdCaches() throws Exception { String key = "example.config.name"; when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(YAML_EXAMPLE); - Assert.assertEquals(configYaml.getValue(key, DEFAULT_GROUP), "example"); + Assertions.assertEquals(configYaml.getValue(key, DEFAULT_GROUP), "example"); - Field groupDataIdToKeysField = Whitebox - .getField(NacosConfigurationLoader.class, "groupDataIdToKeys"); + Field groupDataIdToKeysField = NacosConfigurationLoader.class.getDeclaredField("groupDataIdToKeys"); boolean groupDataIdToKeysFieldAccessible = groupDataIdToKeysField.isAccessible(); groupDataIdToKeysField.setAccessible(true); Multimap groupDataIdToKeys = (Multimap) groupDataIdToKeysField.get(configYaml); groupDataIdToKeysField.setAccessible(groupDataIdToKeysFieldAccessible); Collection keys = groupDataIdToKeys.get(String.format("%s_%s", DEFAULT_GROUP, DEFAULT_DATA_ID)); - Assert.assertEquals(keys.size(), 1); - Assert.assertTrue(keys.contains(key)); + Assertions.assertEquals(keys.size(), 1); + Assertions.assertTrue(keys.contains(key)); - Field groupDataIdToNacosListenerField = Whitebox - .getField(NacosConfigurationLoader.class, "groupDataIdToNacosListener"); + Field groupDataIdToNacosListenerField = NacosConfigurationLoader.class + .getDeclaredField("groupDataIdToNacosListener"); boolean groupDataIdToNacosListenerFieldAccessible = groupDataIdToNacosListenerField.isAccessible(); groupDataIdToNacosListenerField.setAccessible(true); Map groupDataIdToNacosListener = (Map) groupDataIdToNacosListenerField.get(configYaml); groupDataIdToNacosListenerField.setAccessible(groupDataIdToNacosListenerFieldAccessible); Object listener = groupDataIdToNacosListener.get(String.format("%s_%s", DEFAULT_GROUP, DEFAULT_DATA_ID)); - Assert.assertTrue(listener instanceof Listener); - Assert.assertTrue(listener instanceof AbstractConfigChangeListener); + Assertions.assertTrue(listener instanceof Listener); + Assertions.assertTrue(listener instanceof AbstractConfigChangeListener); // Test configuration DELETED changes ConfigChangeItem item = new ConfigChangeItem(key, "", ""); @@ -277,10 +265,10 @@ public void testGroupDataIdCaches() throws NacosException, IllegalAccessExceptio ConfigChangeEvent event = new ConfigChangeEvent(ImmutableMap.of(key, item)); ((AbstractConfigChangeListener) listener).receiveConfigChange(event); keys = groupDataIdToKeys.get(String.format("%s_%s", DEFAULT_GROUP, DEFAULT_DATA_ID)); - Assert.assertEquals(keys.size(), 0); + Assertions.assertEquals(keys.size(), 0); Executor executor = ((AbstractConfigChangeListener) listener).getExecutor(); - Assert.assertNotNull(executor); + Assertions.assertNotNull(executor); } @Test @@ -290,40 +278,48 @@ public void testGetAllValue() throws NacosException { when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(YAML_EXAMPLE); Map allYamlValue = configYaml.getAllValue(DEFAULT_GROUP); - Assert.assertEquals(allYamlValue.get(key), "example"); - Assert.assertEquals(allYamlValue.get(key1), "value1"); + Assertions.assertEquals(allYamlValue.get(key), "example"); + Assertions.assertEquals(allYamlValue.get(key1), "value1"); String key2 = "example.config.list[1].key2"; when(configService.getConfig(APP_DATA_ID, APP_GROUP, TIMEOUT)).thenReturn(PROPERTIES_EXAMPLE); Map allPropsValue1 = configProperties.getAllValue(APP_GROUP); - Assert.assertEquals(allPropsValue1.get(key), "example"); - Assert.assertEquals(allPropsValue1.get(key2), "value2"); + Assertions.assertEquals(allPropsValue1.get(key), "example"); + Assertions.assertEquals(allPropsValue1.get(key2), "value2"); } - @Test(expected = ConfigCenterException.class) - public void testGetAllValueXml() throws NacosException { - String xmlValue = ""; - when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(xmlValue); - configYaml.getAllValue(DEFAULT_GROUP); + @Test + void testGetAllValueXml() { + Assertions.assertThrows(ConfigCenterException.class, () -> { + String xmlValue = ""; + when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(xmlValue); + configYaml.getAllValue(DEFAULT_GROUP); + }); } - @Test(expected = ConfigCenterException.class) - public void testGetAllValueHtml() throws NacosException { - String htmlValue = ""; - when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(htmlValue); - configYaml.getAllValue(DEFAULT_GROUP); + @Test + void testGetAllValueHtml() { + Assertions.assertThrows(ConfigCenterException.class, () -> { + String htmlValue = ""; + when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(htmlValue); + configYaml.getAllValue(DEFAULT_GROUP); + }); } - @Test(expected = ConfigCenterException.class) - public void testGetAllValueText() throws NacosException { - String textValue = "Test text."; - when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(textValue); - configYaml.getAllValue(DEFAULT_GROUP); + @Test + void testGetAllValueText() { + Assertions.assertThrows(ConfigCenterException.class, () -> { + String textValue = "Test text."; + when(configService.getConfig(DEFAULT_DATA_ID, DEFAULT_GROUP, TIMEOUT)).thenReturn(textValue); + configYaml.getAllValue(DEFAULT_GROUP); + }); } - @Test(expected = ConfigCenterException.class) - public void testLoadConfig() { - configYaml.loadConfig("fileName"); + @Test + void testLoadConfig() { + Assertions.assertThrows(ConfigCenterException.class, () -> { + configYaml.loadConfig("fileName"); + }); } @Test @@ -345,22 +341,22 @@ public void testAddListenerError() { } configYaml.setConfigService(configService); - expectedEx.expect(ConfigCenterException.class); - ConfigurationListener listener = Mockito.mock(ConfigurationListener.class); - configYaml.addListener(listener); + Assertions.assertThrows(ConfigCenterException.class, () -> { + configYaml.addListener(listener); + }); } @SuppressWarnings({"rawtypes", "unchecked"}) @Test - public void testListenerCallback() throws IllegalAccessException { + public void testListenerCallback() throws Exception { String key = "example.config.name"; - ConfigurationListener listener = event -> Assert.assertEquals(event.getKey(), key); + ConfigurationListener listener = event -> Assertions.assertEquals(event.getKey(), key); configYaml.addListener(listener); - Field configurationListenerToNacosListener = Whitebox - .getField(NacosConfigurationLoader.class, "configurationListenerToNacosListener"); + Field configurationListenerToNacosListener = NacosConfigurationLoader.class + .getDeclaredField("configurationListenerToNacosListener"); boolean groupDataIdToKeysFieldAccessible = configurationListenerToNacosListener.isAccessible(); configurationListenerToNacosListener.setAccessible(true); Map listenerMap = (Map) configurationListenerToNacosListener.get(configYaml); @@ -368,8 +364,8 @@ public void testListenerCallback() throws IllegalAccessException { Map nacosConfigToListener = (Map) listenerMap.get(listener); Listener changeListener = nacosConfigToListener.get(new NacosConfig.Config(DEFAULT_GROUP, DEFAULT_DATA_ID)); - Assert.assertNotNull(changeListener); - Assert.assertTrue(changeListener instanceof AbstractConfigChangeListener); + Assertions.assertNotNull(changeListener); + Assertions.assertTrue(changeListener instanceof AbstractConfigChangeListener); ConfigChangeItem item = new ConfigChangeItem(key, "", ""); item.setType(PropertyChangeType.DELETED); @@ -377,14 +373,17 @@ public void testListenerCallback() throws IllegalAccessException { ((AbstractConfigChangeListener) changeListener).receiveConfigChange(event); Executor executor = changeListener.getExecutor(); - Assert.assertNotNull(executor); + Assertions.assertNotNull(executor); } @Test public void testConvertConfigurationEvent() throws Exception { ConfigChangeItem changeItem = new ConfigChangeItem("test", "123", "1234"); changeItem.setType(PropertyChangeType.MODIFIED); - Whitebox.invokeMethod(configYaml, "convertConfigurationEvent", DEFAULT_GROUP, changeItem); + java.lang.reflect.Method method = NacosConfigurationLoader.class + .getDeclaredMethod("convertConfigurationEvent", String.class, ConfigChangeItem.class); + method.setAccessible(true); + method.invoke(configYaml, DEFAULT_GROUP, changeItem); } @Test @@ -394,7 +393,6 @@ public void testDestroy() { @Test public void testDestroyError() { - expectedEx.expect(TRpcExtensionException.class); try { doAnswer(it -> { throw new NacosException(); @@ -402,20 +400,19 @@ public void testDestroyError() { } catch (NacosException e) { throw new RuntimeException(e); } - configYaml.destroy(); + Assertions.assertThrows(TRpcExtensionException.class, () -> { + configYaml.destroy(); + }); } @Test public void testInitError() { - expectedEx.expect(TRpcExtensionException.class); - - PowerMockito.mockStatic(NacosFactory.class); - try { - PowerMockito.doThrow(new NacosException()).when(NacosFactory.class, - "createConfigService", any(Properties.class)); - } catch (Exception e) { - throw new RuntimeException(e); + try (MockedStatic mockedNacosFactory = Mockito.mockStatic(NacosFactory.class)) { + mockedNacosFactory.when(() -> NacosFactory.createConfigService(any(Properties.class))) + .thenThrow(new NacosException()); + Assertions.assertThrows(TRpcExtensionException.class, () -> { + configYaml.init(); + }); } - configYaml.init(); } } diff --git a/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml b/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml index aac966b998..02a64b312a 100644 --- a/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml +++ b/trpc-configcenter/trpc-configcenter-open-polaris/pom.xml @@ -23,6 +23,16 @@ + + org.springframework + spring-test + test + + + org.mockito + mockito-core + test + \ No newline at end of file diff --git a/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigTest.java b/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigTest.java index e92fb180e3..64342a521d 100644 --- a/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigTest.java +++ b/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.configcenter.polaris; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import com.tencent.trpc.configcenter.polaris.PolarisConfig.Config; import com.tencent.trpc.core.common.config.PluginConfig; @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PolarisConfigTest { @@ -91,4 +91,4 @@ public void testConfig() { assertNotEquals(config1.hashCode(), config2.hashCode()); } -} \ No newline at end of file +} diff --git a/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigurationLoaderTest.java b/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigurationLoaderTest.java index 6a50a6d2e7..94d4fc717e 100644 --- a/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigurationLoaderTest.java +++ b/trpc-configcenter/trpc-configcenter-open-polaris/src/test/java/com/tencent/trpc/configcenter/polaris/PolarisConfigurationLoaderTest.java @@ -32,8 +32,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; public class PolarisConfigurationLoaderTest { @@ -91,10 +91,10 @@ public void testGetValue() { Mockito.when(fetcher.getConfigPropertiesFile("default", MOCK_GROUP, MOCK_FILE)).thenReturn(mockKv); String ret = loader.getValue(USER_NAME, MOCK_GROUP); - Assert.assertEquals("polaris", ret); + Assertions.assertEquals("polaris", ret); ret = loader.getValue(USER_NAME, MOCK_GROUP + "123"); - Assert.assertEquals(null, ret); + Assertions.assertEquals(null, ret); } @Test @@ -109,7 +109,7 @@ public void testGetAllValues() { Mockito.when(fetcher.getConfigPropertiesFile("default", MOCK_GROUP, MOCK_FILE)).thenReturn(mockKv); Map values = loader.getAllValue(MOCK_GROUP); - Assert.assertEquals("polaris", values.get("user.name")); + Assertions.assertEquals("polaris", values.get("user.name")); } @Test @@ -136,11 +136,11 @@ public void testAddListener() throws Exception { loader.addListener(listener); latch.await(1, TimeUnit.SECONDS); - Assert.assertNotNull(ref.get()); + Assertions.assertNotNull(ref.get()); ConfigurationEvent event = ref.get(); - Assert.assertEquals(event.getKey(), "user.name"); - Assert.assertEquals(event.getValue(), "polaris"); - Assert.assertEquals(event.getType(), ChangeType.ADDED.name()); + Assertions.assertEquals(event.getKey(), "user.name"); + Assertions.assertEquals(event.getValue(), "polaris"); + Assertions.assertEquals(event.getType(), ChangeType.ADDED.name()); } @Test @@ -308,4 +308,4 @@ public String getFileName() { } } -} \ No newline at end of file +} diff --git a/trpc-limiter/trpc-limiter-sentinel/pom.xml b/trpc-limiter/trpc-limiter-sentinel/pom.xml index 0c835793a8..1a8eb43065 100644 --- a/trpc-limiter/trpc-limiter-sentinel/pom.xml +++ b/trpc-limiter/trpc-limiter-sentinel/pom.xml @@ -127,9 +127,9 @@ - ai.grakn - redis-mock - 0.1.6 + com.github.fppt + jedis-mock + 1.1.6 test diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/SentinelLimiterTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/SentinelLimiterTest.java index 0855f3e11a..0d3db3a7f6 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/SentinelLimiterTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/SentinelLimiterTest.java @@ -21,14 +21,13 @@ import com.tencent.trpc.core.rpc.def.DefRequest; import java.util.HashMap; import java.util.Map; -import junit.framework.TestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.Assertions; /** * SentinelLimiter test class */ -public class SentinelLimiterTest extends TestCase { +public class SentinelLimiterTest { @Test public void testBlock() { @@ -56,7 +55,7 @@ public void testBlock() { limiter01.block(new TestSentinelInvoker(), requestQps).toCompletableFuture().get().getException(); } catch (Exception exception) { Throwable cause = exception.getCause(); - Assert.assertTrue( + Assertions.assertTrue( (cause instanceof LimiterBlockException) || (cause instanceof LimiterFallbackException)); break; @@ -80,7 +79,7 @@ public void testBlock() { .getException(); } catch (Exception exception) { Throwable cause = exception.getCause(); - Assert.assertTrue(cause instanceof LimiterFallbackException); + Assertions.assertTrue(cause instanceof LimiterFallbackException); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelConfigTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelConfigTest.java index bbed62f1ed..e5431d5d27 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelConfigTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelConfigTest.java @@ -15,8 +15,8 @@ import java.util.Collections; 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; /** * SentinelConfig test class @@ -32,7 +32,7 @@ public void testParse() { sentinelMap.put("datasource", datasourceMap); configMap.put("sentinel", sentinelMap); SentinelConfig sentinelConfig = SentinelConfig.parse(sentinelMap); - Assert.assertTrue(sentinelConfig.getDataSourceConfig() instanceof LocalFileDatasourceConfig); + Assertions.assertTrue(sentinelConfig.getDataSourceConfig() instanceof LocalFileDatasourceConfig); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelLimiterConfigTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelLimiterConfigTest.java index 60ab83e6e2..4311e8bcf8 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelLimiterConfigTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/SentinelLimiterConfigTest.java @@ -13,8 +13,8 @@ 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; /** * Test limit callback, downgrade configuration @@ -31,14 +31,14 @@ public void testParse() { configMap.put("limiter_config", limiterConfigMap); SentinelLimiterConfig sentinelLimiterConfig1 = SentinelLimiterConfig.parse(configMap); - Assert.assertTrue("test_handler".equals(sentinelLimiterConfig1.getBlockHandler())); - Assert.assertTrue("test_fallback".equals(sentinelLimiterConfig1.getFallback())); - Assert.assertTrue("test_resource_extractor".equals(sentinelLimiterConfig1.getResourceExtractor())); + Assertions.assertTrue("test_handler".equals(sentinelLimiterConfig1.getBlockHandler())); + Assertions.assertTrue("test_fallback".equals(sentinelLimiterConfig1.getFallback())); + Assertions.assertTrue("test_resource_extractor".equals(sentinelLimiterConfig1.getResourceExtractor())); SentinelLimiterConfig sentinelLimiterConfig2 = SentinelLimiterConfig.parse(null); - Assert.assertTrue("default".equals(sentinelLimiterConfig2.getBlockHandler())); - Assert.assertTrue("default".equals(sentinelLimiterConfig2.getFallback())); - Assert.assertTrue("default".equals(sentinelLimiterConfig2.getResourceExtractor())); + Assertions.assertTrue("default".equals(sentinelLimiterConfig2.getBlockHandler())); + Assertions.assertTrue("default".equals(sentinelLimiterConfig2.getFallback())); + Assertions.assertTrue("default".equals(sentinelLimiterConfig2.getResourceExtractor())); Map configMap3 = new HashMap<>(); Map limiterConfigMap3 = new HashMap<>(); @@ -46,9 +46,9 @@ public void testParse() { limiterConfigMap3.put("fallback", "test_fallback3"); configMap3.put("limiter_config", limiterConfigMap3); SentinelLimiterConfig sentinelLimiterConfig3 = SentinelLimiterConfig.parse(configMap3); - Assert.assertTrue("test_handler3".equals(sentinelLimiterConfig3.getBlockHandler())); - Assert.assertTrue("test_fallback3".equals(sentinelLimiterConfig3.getFallback())); - Assert.assertTrue("default".equals(sentinelLimiterConfig3.getResourceExtractor())); + Assertions.assertTrue("test_handler3".equals(sentinelLimiterConfig3.getBlockHandler())); + Assertions.assertTrue("test_fallback3".equals(sentinelLimiterConfig3.getFallback())); + Assertions.assertTrue("default".equals(sentinelLimiterConfig3.getResourceExtractor())); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/LocalFileDatasourceConfigTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/LocalFileDatasourceConfigTest.java index 23d7603992..b5c56c8fc3 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/LocalFileDatasourceConfigTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/LocalFileDatasourceConfigTest.java @@ -16,8 +16,8 @@ import com.tencent.trpc.limiter.sentinel.config.datasource.factory.DatasourceType; 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; /** * LocalFileDatasourceConfig test class @@ -43,7 +43,7 @@ public void testRegister1() { localFileDatasourceConfig.register(); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e instanceof LimiterDataSourceException); } } @@ -57,7 +57,7 @@ public void testRegister2() { localFileDatasourceConfig.register(); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e instanceof LimiterDataSourceException); } } @@ -69,7 +69,7 @@ public void testValidate() { try { localFileDatasourceConfig.validate(); } catch (Exception e) { - Assert.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e instanceof LimiterDataSourceException); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/NacosDatasourceConfigTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/NacosDatasourceConfigTest.java index b478273ab3..74a6752176 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/NacosDatasourceConfigTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/NacosDatasourceConfigTest.java @@ -16,8 +16,8 @@ import com.tencent.trpc.limiter.sentinel.config.datasource.factory.DatasourceType; 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; /** * NacosDatasourceConfig test class @@ -35,7 +35,7 @@ public void testValidate1() { nacosDatasourceConfig.validate(); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e instanceof LimiterDataSourceException); } } @@ -50,7 +50,7 @@ public void testValidate2() { localFileDatasourceConfig.register(); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e instanceof LimiterDataSourceException); } } @@ -65,7 +65,7 @@ public void testValidate3() { localFileDatasourceConfig.register(); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e instanceof LimiterDataSourceException); } } @@ -81,7 +81,7 @@ public void testRegister() { localFileDatasourceConfig.register(); } catch (Exception e) { e.printStackTrace(); - Assert.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e instanceof LimiterDataSourceException); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/RedisDatasourceConfigTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/RedisDatasourceConfigTest.java index 3977b902d4..bb99071c21 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/RedisDatasourceConfigTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/RedisDatasourceConfigTest.java @@ -11,16 +11,17 @@ package com.tencent.trpc.limiter.sentinel.config.datasource; +import com.github.fppt.jedismock.RedisServer; import com.tencent.trpc.core.exception.LimiterDataSourceException; import com.tencent.trpc.limiter.sentinel.config.datasource.factory.DatasourceConfigFactoryManger; import com.tencent.trpc.limiter.sentinel.config.datasource.factory.DatasourceType; +import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import redis.embedded.RedisServer; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * RedisDatasourceConfig test class @@ -30,12 +31,11 @@ public class RedisDatasourceConfigTest { private RedisServer redisServer; private int port = 6380; - @Before - public void setUp() { - - redisServer = RedisServer.builder().setting("maxmemory 128M").setting("bind localhost") - .port(port).build(); - redisServer.start(); + @BeforeEach + public void setUp() throws Exception { + redisServer = RedisServer + .newRedisServer(port) + .start(); } @Test @@ -61,8 +61,8 @@ public void testValidate1() { try { configWithoutRuleKey1.validate(); } catch (Exception e) { - Assert.assertTrue(e instanceof LimiterDataSourceException); - Assert.assertTrue(e.getMessage().equals("sentinel redis datasource config error, channel is empty")); + Assertions.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e.getMessage().equals("sentinel redis datasource config error, channel is empty")); } } @@ -78,13 +78,13 @@ public void testValidate2() { try { configWithoutRuleKey.validate(); } catch (Exception e) { - Assert.assertTrue(e instanceof LimiterDataSourceException); - Assert.assertTrue(e.getMessage().equals("sentinel redis datasource config error, rule key is empty")); + Assertions.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue(e.getMessage().equals("sentinel redis datasource config error, rule key is empty")); } } - @After - public void after() { + @AfterEach + public void after() throws IOException { if (redisServer != null) { redisServer.stop(); } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/ZookeeperDatasourceConfigTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/ZookeeperDatasourceConfigTest.java index f18e1497cc..eb350955a2 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/ZookeeperDatasourceConfigTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/ZookeeperDatasourceConfigTest.java @@ -18,10 +18,10 @@ import java.util.HashMap; import java.util.Map; 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; /** * ZookeeperDatasourceConfig test class @@ -31,7 +31,7 @@ public class ZookeeperDatasourceConfigTest { private ZookeeperDatasourceConfig zookeeperDatasourceConfig; private TestingServer zkServer; - @Before + @BeforeEach public void setUp() throws Exception { int port = 2183; zkServer = new TestingServer(port, new File("/tmp/sentinel")); @@ -58,8 +58,8 @@ public void testValidate1() { try { zookeeperDatasourceConfig.validate(); } catch (Exception e) { - Assert.assertTrue(e instanceof LimiterDataSourceException); - Assert.assertTrue( + Assertions.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue( "sentinel zookeeper datasource config error, remote address is empty".equals(e.getMessage())); } } @@ -73,13 +73,13 @@ public void testValidate2() { try { zookeeperDatasourceConfig.validate(); } catch (Exception e) { - Assert.assertTrue(e instanceof LimiterDataSourceException); - Assert.assertTrue( + Assertions.assertTrue(e instanceof LimiterDataSourceException); + Assertions.assertTrue( "sentinel zookeeper datasource config error, path is empty".equals(e.getMessage())); } } - @After + @AfterEach public void after() throws Exception { if (zkServer != null) { zkServer.stop(); diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/DatasourceConfigFactoryMangerTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/DatasourceConfigFactoryMangerTest.java index 2a76a2c23b..b48bda106a 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/DatasourceConfigFactoryMangerTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/DatasourceConfigFactoryMangerTest.java @@ -11,8 +11,8 @@ package com.tencent.trpc.limiter.sentinel.config.datasource.factory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * DatasourceConfigFactoryManger test class @@ -21,16 +21,16 @@ public class DatasourceConfigFactoryMangerTest { @Test public void testGetDatasourceConfigFactory() { - Assert.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( + Assertions.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( DatasourceType.LOCAL_FILE.getName()) instanceof LocalFileDatasourceConfigFactory); - Assert.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( + Assertions.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( DatasourceType.REDIS.getName()) instanceof RedisDatasourceConfigFactory); - Assert.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( + Assertions.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( DatasourceType.NACOS.getName()) instanceof NacosDatasourceConfigFactory); - Assert.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( + Assertions.assertTrue(DatasourceConfigFactoryManger.getDatasourceConfigFactory( DatasourceType.ZOOKEEPER.getName()) instanceof ZookeeperDatasourceConfigFactory); } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/LocalFileDatasourceConfigFactoryTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/LocalFileDatasourceConfigFactoryTest.java index 15e99c86b4..a8369a331a 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/LocalFileDatasourceConfigFactoryTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/LocalFileDatasourceConfigFactoryTest.java @@ -15,8 +15,8 @@ import com.tencent.trpc.limiter.sentinel.config.datasource.LocalFileDatasourceConfig; 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; /** * LocalFileDatasourceConfigFactory test class @@ -28,14 +28,14 @@ public void testCreate() { Map configs = new HashMap<>(); configs.put("path", "classpath:flow_rule.json"); DatasourceConfig datasourceConfig = new LocalFileDatasourceConfigFactory().create(configs); - Assert.assertTrue(datasourceConfig instanceof LocalFileDatasourceConfig); + Assertions.assertTrue(datasourceConfig instanceof LocalFileDatasourceConfig); } @Test public void testName() { Map configs = new HashMap<>(); configs.put("path", "classpath:flow_rule.json"); - Assert.assertTrue(DatasourceType.LOCAL_FILE.getName().equals(new LocalFileDatasourceConfigFactory().name())); + Assertions.assertTrue(DatasourceType.LOCAL_FILE.getName().equals(new LocalFileDatasourceConfigFactory().name())); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/NacosDatasourceConfigFactoryTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/NacosDatasourceConfigFactoryTest.java index d8b2d8c881..2385649237 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/NacosDatasourceConfigFactoryTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/NacosDatasourceConfigFactoryTest.java @@ -15,8 +15,8 @@ import com.tencent.trpc.limiter.sentinel.config.datasource.NacosDatasourceConfig; 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; /** * NacosDatasourceConfigFactory test class @@ -30,7 +30,7 @@ public void testCreate() { configs.put("data_id", "test_data_id"); configs.put("remote_address", "127.0.0.1"); DatasourceConfig datasourceConfig = new NacosDatasourceConfigFactory().create(configs); - Assert.assertTrue(datasourceConfig instanceof NacosDatasourceConfig); + Assertions.assertTrue(datasourceConfig instanceof NacosDatasourceConfig); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/RedisDatasourceConfigFactoryTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/RedisDatasourceConfigFactoryTest.java index 17dd639984..395fbb764c 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/RedisDatasourceConfigFactoryTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/RedisDatasourceConfigFactoryTest.java @@ -15,8 +15,8 @@ import com.tencent.trpc.limiter.sentinel.config.datasource.RedisDatasourceConfig; 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; /** * RedisDatasourceConfigFactory test class @@ -36,12 +36,12 @@ public void testCreate() { configs.put("sentinel_master_id", "sentinel_master_id"); configs.put("timeout", 5000); DatasourceConfig datasourceConfig = new RedisDatasourceConfigFactory().create(configs); - Assert.assertTrue(datasourceConfig instanceof RedisDatasourceConfig); + Assertions.assertTrue(datasourceConfig instanceof RedisDatasourceConfig); } @Test public void testName() { - Assert.assertTrue(new RedisDatasourceConfigFactory().name().equals(DatasourceType.REDIS.getName())); + Assertions.assertTrue(new RedisDatasourceConfigFactory().name().equals(DatasourceType.REDIS.getName())); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/ZookeeperDatasourceConfigFactoryTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/ZookeeperDatasourceConfigFactoryTest.java index 2fcec163e0..df5a306416 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/ZookeeperDatasourceConfigFactoryTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/config/datasource/factory/ZookeeperDatasourceConfigFactoryTest.java @@ -15,8 +15,8 @@ import com.tencent.trpc.limiter.sentinel.config.datasource.ZookeeperDatasourceConfig; 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; /** * ZookeeperDatasourceConfigFactory test class @@ -29,7 +29,7 @@ public void testCreate() { configs.put("remote_address", "127.0.0.1:2181"); configs.put("path", "/"); DatasourceConfig datasourceConfig = new ZookeeperDatasourceConfigFactory().create(configs); - Assert.assertTrue(datasourceConfig instanceof ZookeeperDatasourceConfig); + Assertions.assertTrue(datasourceConfig instanceof ZookeeperDatasourceConfig); } } diff --git a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilterTest.java b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilterTest.java index 1d7d3d4812..73290d5d10 100644 --- a/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilterTest.java +++ b/trpc-limiter/trpc-limiter-sentinel/src/test/java/com/tencent/trpc/limiter/sentinel/filter/SentinelLimiterFilterTest.java @@ -22,9 +22,9 @@ import com.tencent.trpc.limiter.sentinel.TestSentinelInvoker; import java.util.HashMap; import java.util.Map; -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; /** * SentinelLimiterFilter test class @@ -33,7 +33,7 @@ public class SentinelLimiterFilterTest { private static final Logger logger = LoggerFactory.getLogger(SentinelLimiterFilterTest.class); - @Before + @BeforeEach public void setUp() { try { Map extMap = new HashMap<>(); @@ -52,7 +52,7 @@ public void setUp() { @Test public void testFilter() { SentinelLimiterFilter sentinelLimiterFilter = new SentinelLimiterFilter(); - Assert.assertEquals(FilterOrdered.SENTINEL_LIMITER_ORDERED, sentinelLimiterFilter.getOrder()); + Assertions.assertEquals(FilterOrdered.SENTINEL_LIMITER_ORDERED, sentinelLimiterFilter.getOrder()); sentinelLimiterFilter.init(); DefRequest request = new DefRequest(); From 511b1bfc8e7931f434d44fbff112ce3ce742b7ce Mon Sep 17 00:00:00 2001 From: drow931 <632722781@qq.com> Date: Thu, 22 Jan 2026 11:12:04 +0800 Subject: [PATCH 4/5] chore(configcenter-nacos): remove obsolete TODO comment from test file --- .../trpc/configcenter/nacos/NacosConfigurationLoaderTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java b/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java index e51c40c9d3..ef4aca1608 100644 --- a/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java +++ b/trpc-configcenter/trpc-configcenter-nacos/src/test/java/com/tencent/trpc/configcenter/nacos/NacosConfigurationLoaderTest.java @@ -36,7 +36,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; -// // // import org.junit.Rule; // TODO: 迁移到 JUnit5 // TODO: 迁移到 JUnit5 // TODO: 迁移到 JUnit5 import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.lang.reflect.Field; From 6b3eefd21180bd8c57cb181fb700aafc265abf63 Mon Sep 17 00:00:00 2001 From: drow931 <632722781@qq.com> Date: Tue, 27 Jan 2026 14:59:58 +0800 Subject: [PATCH 5/5] trpc-registry: migrate tests from JUnit 4 + PowerMock to JUnit 5 + Mockito --- trpc-registry/trpc-registry-api/pom.xml | 5 + ...AbstractFailedRetryRegistryCenterTest.java | 62 +++++----- .../center/AbstractRegistryCenterTest.java | 56 ++++----- .../trpc/registry/common/ConstantsTest.java | 2 +- .../discovery/RegistryDiscoveryTest.java | 22 ++-- .../factory/AbstractRegistryFactoryTest.java | 20 +-- .../registry/task/AbstractRetryTaskTest.java | 8 +- .../util/RegistryCenterCacheTest.java | 30 ++--- trpc-registry/trpc-registry-consul/pom.xml | 5 + .../registry/consul/ConsulRegistryTest.java | 20 +-- .../registry/scheduler/TtlSchedulerTest.java | 8 +- .../support/constant/ConsulConstantTest.java | 4 +- .../support/proxy/ConsulClientProxyTest.java | 4 +- .../ConsulExceptionProcessHandlerTest.java | 4 +- .../util/ConsulNewServiceUtilsTest.java | 8 +- trpc-registry/trpc-registry-nacos/pom.xml | 5 + .../nacos/NacosRegistryCenterTest.java | 25 ++-- .../config/NacosRegistryCenterConfigTest.java | 29 ++--- .../util/NacosNamingServiceUtilsTest.java | 35 +++--- ...gConstantFieldValuePredicateUtilsTest.java | 14 +-- .../trpc-registry-open-polaris/pom.xml | 12 ++ .../trpc/polaris/common/PolarisTransTest.java | 18 +-- .../registry/polaris/PolarisRegistryTest.java | 62 ++++++---- .../trpc/support/HeatBeatManagerTest.java | 30 ++--- .../curator/CuratorZookeeperClientTest.java | 117 ++++++++++-------- .../zookeeper/ZookeeperRegistryTest.java | 54 ++++---- 26 files changed, 354 insertions(+), 305 deletions(-) rename trpc-registry/trpc-registry-nacos/src/test/{ => java}/com/tencent/trpc/registry/nacos/NacosRegistryCenterTest.java (85%) rename trpc-registry/trpc-registry-nacos/src/test/{ => java}/com/tencent/trpc/registry/nacos/config/NacosRegistryCenterConfigTest.java (71%) rename trpc-registry/trpc-registry-nacos/src/test/{ => java}/com/tencent/trpc/registry/nacos/util/NacosNamingServiceUtilsTest.java (67%) rename trpc-registry/trpc-registry-nacos/src/test/{ => java}/com/tencent/trpc/registry/nacos/util/StringConstantFieldValuePredicateUtilsTest.java (75%) 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); }