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/2] 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/2] 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}