Skip to content

Jdk17/springboot3 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
drow931 wants to merge 7 commits into from
Closed

Jdk17/springboot3 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da3a954
trpc-admin: migrate junit4 to junit5 and upgrade resteasy
drow931 Jan 20, 2026
d9b5bec
feat(admin): Upgrade Jakarta EE dependencies for RESTEasy 6.x compati…
drow931 Jan 20, 2026
cebca62
trpc-code-generator/trpc-configcenter/trpc-limiter: migrate tests to …
drow931 Jan 21, 2026
0697a9a
Merge branch 'trpc-group:JDK17/Springboot3' into JDK17/Springboot3
drow931 Jan 21, 2026
511b1bf
chore(configcenter-nacos): remove obsolete TODO comment from test file
drow931 Jan 22, 2026
0b08ab1
Merge branch 'trpc-group:JDK17/Springboot3' into JDK17/Springboot3
drow931 Jan 22, 2026
6b3eefd
trpc-registry: migrate tests from JUnit 4 + PowerMock to JUnit 5 + Mo…
drow931 Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions trpc-registry/trpc-registry-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<groupId>com.tencent.trpc</groupId>
<artifactId>trpc-core</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

</project>
62 changes: 31 additions & 31 deletions ...src/test/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -55,15 +55,15 @@ 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());
serverRegistry = buildFailedRetryRegistryCenter();
serverRegistry.setPluginConfig(initPluginConfig());
}

@After
@AfterEach
public void tearDown() throws Exception {
clientRegistry.destroy();
serverRegistry.destroy();
Expand Down Expand Up @@ -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
Expand All @@ -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());
}
Expand All @@ -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());
}

/**
Expand All @@ -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
Expand All @@ -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());
}

Expand Down Expand Up @@ -332,7 +332,7 @@ public void testNotifyListenerHolderEquals() {
RegisterInfoListenerHolder registerInfoListenerHolder =
new RegisterInfoListenerHolder(registerInfo, notifyListener);
boolean test = registerInfoListenerHolder.equals("test");
Assert.assertFalse(test);
Assertions.assertFalse(test);
}


Expand Down
56 changes: 28 additions & 28 deletions ...gistry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -49,7 +49,7 @@
private static String serverCacheFilePath = "/tmp/server_zookeeper.cache";
private static int CACHE_EXPIRE_TIME = 1;

@Before
@BeforeEach

Check warning on line 52 in trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java

View workflow job for this annotation

GitHub Actions / checkstyle 

[checkstyle] reported by reviewdog 🐶
缺少 Javadoc 。

Raw Output:
/github/workspace/./trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java:52:5: info: 缺少 Javadoc 。 (com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck)

Check warning on line 52 in trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java

View workflow job for this annotation

GitHub Actions / checkstyle 

[checkstyle] reported by reviewdog 🐶
缺少 Javadoc 。

Raw Output:
/github/workspace/./trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java:52:5: info: 缺少 Javadoc 。 (com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck)
public void setUp() throws Exception {
clientRegistry = new AbstractRegistryCenter() {
@Override
Expand Down Expand Up @@ -87,7 +87,7 @@
}
}

@After
@AfterEach
public void tearDown() throws Exception {
this.delCacheFile();
clientRegistry.destroy();
Expand Down Expand Up @@ -160,9 +160,9 @@
@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());

}

Expand All @@ -171,18 +171,18 @@
this.testRegistry();
RegisterInfo registerInfo = buildRegisterInfo();
clientRegistry.unregister(registerInfo);
Assert.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size());
Assertions.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size());
}

@Test
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());
}

Expand All @@ -192,7 +192,7 @@
RegisterInfo registerInfo = buildRegisterInfo();
NotifyListener discovery = getNotifyListener(registerInfo);
clientRegistry.unsubscribe(registerInfo, discovery);
Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
}

@Test
Expand All @@ -205,10 +205,10 @@
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());
}
Expand All @@ -217,10 +217,10 @@
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());
}
Expand All @@ -233,8 +233,8 @@
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
Expand All @@ -244,7 +244,7 @@
RegisterInfo registerInfo = buildRegisterInfo();
List<RegisterInfo> registerInfos = clientRegistry.cache
.getRegisterInfos(registerInfo.getServiceName());
Assert.assertEquals(10, registerInfos.size());
Assertions.assertEquals(10, registerInfos.size());
}

@Test
Expand All @@ -255,9 +255,9 @@
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());
}

Expand All @@ -275,7 +275,7 @@
Thread.sleep((CACHE_EXPIRE_TIME + 1) * 1000);
List<RegisterInfo> registerInfos = clientRegistry.cache
.getRegisterInfos(buildRegisterInfo().getServiceName());
Assert.assertEquals(0, registerInfos.size());
Assertions.assertEquals(0, registerInfos.size());

}

Expand All @@ -298,7 +298,7 @@
Thread.sleep((CACHE_EXPIRE_TIME + 1) * 1000);
List<RegisterInfo> registerInfos = clientRegistry.cache
.getRegisterInfos(buildRegisterInfo().getServiceName());
Assert.assertEquals(10, registerInfos.size());
Assertions.assertEquals(10, registerInfos.size());
}

@Test
Expand All @@ -318,7 +318,7 @@
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);
}

}
Expand Down
2 changes: 1 addition & 1 deletion ...istry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/common/ConstantsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading
Loading