Skip to content

Commit ad88b38

Browse files
drow931drow931
authored
trpc-registry: migrate tests from JUnit 4 + PowerMock to JUnit 5 + Mockito (#121)
* trpc-admin: migrate junit4 to junit5 and upgrade resteasy * feat(admin): Upgrade Jakarta EE dependencies for RESTEasy 6.x compatibility * trpc-code-generator/trpc-configcenter/trpc-limiter: migrate tests to JUnit 5 for Spring Boot 3.x compatibility * chore(configcenter-nacos): remove obsolete TODO comment from test file * trpc-registry: migrate tests from JUnit 4 + PowerMock to JUnit 5 + Mockito
1 parent 1c7196e commit ad88b38

26 files changed

Lines changed: 354 additions & 305 deletions

File tree

‎trpc-registry/trpc-registry-api/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<groupId>com.tencent.trpc</groupId>
2828
<artifactId>trpc-core</artifactId>
2929
</dependency>
30+
<dependency>
31+
<groupId>org.mockito</groupId>
32+
<artifactId>mockito-core</artifactId>
33+
<scope>test</scope>
34+
</dependency>
3035
</dependencies>
3136

3237
</project>

‎trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractFailedRetryRegistryCenterTest.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
import java.util.Map;
3838
import java.util.concurrent.ConcurrentHashMap;
3939
import java.util.concurrent.atomic.AtomicInteger;
40-
import org.junit.After;
41-
import org.junit.Assert;
42-
import org.junit.Before;
43-
import org.junit.Test;
40+
import org.junit.jupiter.api.AfterEach;
41+
import org.junit.jupiter.api.Assertions;
42+
import org.junit.jupiter.api.BeforeEach;
43+
import org.junit.jupiter.api.Test;
4444

4545
public class AbstractFailedRetryRegistryCenterTest {
4646

@@ -55,15 +55,15 @@ public class AbstractFailedRetryRegistryCenterTest {
5555
private static String serverCacheFilePath = "/tmp/server_zookeeper.cache";
5656
private static int CACHE_EXPIRE_TIME = 1;
5757

58-
@Before
58+
@BeforeEach
5959
public void setUp() throws Exception {
6060
clientRegistry = buildFailedRetryRegistryCenter();
6161
clientRegistry.setPluginConfig(initPluginConfig());
6262
serverRegistry = buildFailedRetryRegistryCenter();
6363
serverRegistry.setPluginConfig(initPluginConfig());
6464
}
6565

66-
@After
66+
@AfterEach
6767
public void tearDown() throws Exception {
6868
clientRegistry.destroy();
6969
serverRegistry.destroy();
@@ -198,49 +198,49 @@ private void delCacheFile() {
198198

199199
@Test
200200
public void testRegistry() throws InterruptedException {
201-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
201+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
202202
RegisterInfo registerInfo = buildRegisterInfo();
203203
clientRegistry.register(registerInfo);
204-
Assert.assertEquals(1, clientRegistry.getFailedTasks().size());
204+
Assertions.assertEquals(1, clientRegistry.getFailedTasks().size());
205205
Thread.sleep(500);
206-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
206+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
207207
}
208208

209209
@Test
210210
public void testUnregistry() throws InterruptedException {
211211
this.testRegistry();
212212

213-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
213+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
214214
RegisterInfo registerInfo = buildRegisterInfo();
215215
clientRegistry.unregister(registerInfo);
216-
Assert.assertEquals(1, clientRegistry.getFailedTasks().size());
216+
Assertions.assertEquals(1, clientRegistry.getFailedTasks().size());
217217
Thread.sleep(500);
218-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
218+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
219219
}
220220

221221
@Test
222222
public void testSubscribe() throws InterruptedException {
223223
this.delCacheFile();
224-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
224+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
225225
RegisterInfo registerInfo = buildRegisterInfo();
226226
NotifyListener discovery = getNotifyListener(registerInfo);
227227
clientRegistry.subscribe(registerInfo, discovery);
228-
Assert.assertEquals(1, clientRegistry.getFailedTasks().size());
228+
Assertions.assertEquals(1, clientRegistry.getFailedTasks().size());
229229
Thread.sleep(500);
230-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
230+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
231231
}
232232

233233
@Test
234234
public void testUnsubscribe() throws InterruptedException {
235235
this.testSubscribe();
236236

237-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
237+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
238238
RegisterInfo registerInfo = buildRegisterInfo();
239239
NotifyListener discovery = getNotifyListener(registerInfo);
240240
clientRegistry.unsubscribe(registerInfo, discovery);
241-
Assert.assertEquals(1, clientRegistry.getFailedTasks().size());
241+
Assertions.assertEquals(1, clientRegistry.getFailedTasks().size());
242242
Thread.sleep(500);
243-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
243+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
244244
}
245245

246246
@Test
@@ -253,13 +253,13 @@ public void testNotify() throws InterruptedException {
253253
registerInfos.add(buildRegisterInfo("test.service2"));
254254
NotifyListener discovery = getNotifyListener(registerInfo);
255255

256-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
256+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
257257
clientRegistry.notify(registerInfo, discovery, registerInfos);
258-
Assert.assertEquals(1, clientRegistry.getFailedTasks().size());
258+
Assertions.assertEquals(1, clientRegistry.getFailedTasks().size());
259259
Thread.sleep(500);
260-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
261-
Assert.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size());
262-
Assert.assertEquals(10,
260+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
261+
Assertions.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size());
262+
Assertions.assertEquals(10,
263263
clientRegistry.getNotifiedRegisterInfos().get(registerInfo).getRegisterInfos(
264264
RegistryCenterEnum.transferFrom(DEFAULT_REGISTRY_CENTER_SERVICE_TYPE)).size());
265265
}
@@ -269,7 +269,7 @@ public void testNotify2() throws InterruptedException {
269269
RegisterInfo registerInfo = buildRegisterInfo();
270270
NotifyListener discovery = getNotifyListener(registerInfo);
271271
clientRegistry.notify(registerInfo, discovery, Lists.newArrayList());
272-
Assert.assertEquals(1, clientRegistry.getFailedTasks().size());
272+
Assertions.assertEquals(1, clientRegistry.getFailedTasks().size());
273273
}
274274

275275
/**
@@ -278,13 +278,13 @@ public void testNotify2() throws InterruptedException {
278278
@Test
279279
public void testSubscribeCache() throws InterruptedException {
280280
this.testNotify();
281-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
281+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
282282
RegisterInfo registerInfo = buildRegisterInfo();
283283
NotifyListener discovery = getNotifyListener(registerInfo);
284284
clientRegistry.subscribe(registerInfo, discovery);
285-
Assert.assertEquals(1, clientRegistry.getFailedTasks().size());
285+
Assertions.assertEquals(1, clientRegistry.getFailedTasks().size());
286286
Thread.sleep(500);
287-
Assert.assertEquals(0, clientRegistry.getFailedTasks().size());
287+
Assertions.assertEquals(0, clientRegistry.getFailedTasks().size());
288288
}
289289

290290
@Test
@@ -295,9 +295,9 @@ public void testRecover() throws NoSuchMethodException, InvocationTargetExceptio
295295
Method method = clientRegistry.getClass().getSuperclass().getSuperclass().getDeclaredMethod("recover");
296296
method.setAccessible(true);
297297
method.invoke(clientRegistry);
298-
Assert.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size());
299-
Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size());
300-
Assert.assertEquals(1,
298+
Assertions.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size());
299+
Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size());
300+
Assertions.assertEquals(1,
301301
clientRegistry.getSubscribedRegisterInfos().get(buildRegisterInfo()).getNotifyListeners().size());
302302
}
303303

@@ -332,7 +332,7 @@ public void testNotifyListenerHolderEquals() {
332332
RegisterInfoListenerHolder registerInfoListenerHolder =
333333
new RegisterInfoListenerHolder(registerInfo, notifyListener);
334334
boolean test = registerInfoListenerHolder.equals("test");
335-
Assert.assertFalse(test);
335+
Assertions.assertFalse(test);
336336
}
337337

338338

‎trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/center/AbstractRegistryCenterTest.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
import java.util.List;
3434
import java.util.Map;
3535
import java.util.concurrent.ConcurrentHashMap;
36-
import org.junit.After;
37-
import org.junit.Assert;
38-
import org.junit.Before;
39-
import org.junit.Test;
36+
import org.junit.jupiter.api.AfterEach;
37+
import org.junit.jupiter.api.Assertions;
38+
import org.junit.jupiter.api.BeforeEach;
39+
import org.junit.jupiter.api.Test;
4040

4141
public class AbstractRegistryCenterTest {
4242

@@ -49,7 +49,7 @@ public class AbstractRegistryCenterTest {
4949
private static String serverCacheFilePath = "/tmp/server_zookeeper.cache";
5050
private static int CACHE_EXPIRE_TIME = 1;
5151

52-
@Before
52+
@BeforeEach
5353
public void setUp() throws Exception {
5454
clientRegistry = new AbstractRegistryCenter() {
5555
@Override
@@ -87,7 +87,7 @@ public void init() throws TRpcExtensionException {
8787
}
8888
}
8989

90-
@After
90+
@AfterEach
9191
public void tearDown() throws Exception {
9292
this.delCacheFile();
9393
clientRegistry.destroy();
@@ -160,9 +160,9 @@ public void destroy() throws TRpcExtensionException {
160160
@Test
161161
public void testRegistry() {
162162
RegisterInfo registerInfo = buildRegisterInfo();
163-
Assert.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size());
163+
Assertions.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size());
164164
clientRegistry.register(registerInfo);
165-
Assert.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size());
165+
Assertions.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size());
166166

167167
}
168168

@@ -171,18 +171,18 @@ public void testUnregistry() {
171171
this.testRegistry();
172172
RegisterInfo registerInfo = buildRegisterInfo();
173173
clientRegistry.unregister(registerInfo);
174-
Assert.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size());
174+
Assertions.assertEquals(0, clientRegistry.getRegisteredRegisterInfos().size());
175175
}
176176

177177
@Test
178178
public void testSubscribe() {
179179

180180
RegisterInfo registerInfo = buildRegisterInfo();
181181
NotifyListener discovery = getNotifyListener(registerInfo);
182-
Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
182+
Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
183183
clientRegistry.subscribe(registerInfo, discovery);
184-
Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size());
185-
Assert.assertEquals(1,
184+
Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size());
185+
Assertions.assertEquals(1,
186186
clientRegistry.getSubscribedRegisterInfos().get(registerInfo).getNotifyListeners().size());
187187
}
188188

@@ -192,7 +192,7 @@ public void testUnsubscribe() {
192192
RegisterInfo registerInfo = buildRegisterInfo();
193193
NotifyListener discovery = getNotifyListener(registerInfo);
194194
clientRegistry.unsubscribe(registerInfo, discovery);
195-
Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
195+
Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
196196
}
197197

198198
@Test
@@ -205,10 +205,10 @@ public void testNotify() {
205205
registerInfos.add(buildRegisterInfo("test.service2"));
206206
NotifyListener discovery = getNotifyListener(registerInfo);
207207

208-
Assert.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size());
208+
Assertions.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size());
209209
clientRegistry.notify(registerInfo, discovery, registerInfos);
210-
Assert.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size());
211-
Assert.assertEquals(10,
210+
Assertions.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size());
211+
Assertions.assertEquals(10,
212212
clientRegistry.getNotifiedRegisterInfos().get(registerInfo).getRegisterInfos(
213213
RegistryCenterEnum.transferFrom(DEFAULT_REGISTRY_CENTER_SERVICE_TYPE)).size());
214214
}
@@ -217,10 +217,10 @@ public void testNotify() {
217217
public void testNotify01() {
218218
RegisterInfo registerInfo = buildRegisterInfo();
219219
NotifyListener discovery = getNotifyListener(registerInfo);
220-
Assert.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size());
220+
Assertions.assertEquals(0, clientRegistry.getNotifiedRegisterInfos().size());
221221
clientRegistry.notify(registerInfo, discovery, Lists.newArrayList());
222-
Assert.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size());
223-
Assert.assertEquals(0,
222+
Assertions.assertEquals(1, clientRegistry.getNotifiedRegisterInfos().size());
223+
Assertions.assertEquals(0,
224224
clientRegistry.getNotifiedRegisterInfos().get(registerInfo).getRegisterInfos(
225225
RegistryCenterEnum.transferFrom(DEFAULT_REGISTRY_CENTER_SERVICE_TYPE)).size());
226226
}
@@ -233,8 +233,8 @@ public void testDestroy() {
233233
NotifyListener discovery = getNotifyListener(registerInfo);
234234
clientRegistry.subscribe(registerInfo, discovery);
235235
clientRegistry.destroy();
236-
Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
237-
Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
236+
Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
237+
Assertions.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
238238
}
239239

240240
@Test
@@ -244,7 +244,7 @@ public void testGetCache() {
244244
RegisterInfo registerInfo = buildRegisterInfo();
245245
List<RegisterInfo> registerInfos = clientRegistry.cache
246246
.getRegisterInfos(registerInfo.getServiceName());
247-
Assert.assertEquals(10, registerInfos.size());
247+
Assertions.assertEquals(10, registerInfos.size());
248248
}
249249

250250
@Test
@@ -255,9 +255,9 @@ public void testRecover()
255255
Method method = clientRegistry.getClass().getSuperclass().getDeclaredMethod("recover");
256256
method.setAccessible(true);
257257
method.invoke(clientRegistry);
258-
Assert.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size());
259-
Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size());
260-
Assert.assertEquals(1,
258+
Assertions.assertEquals(1, clientRegistry.getRegisteredRegisterInfos().size());
259+
Assertions.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().size());
260+
Assertions.assertEquals(1,
261261
clientRegistry.getSubscribedRegisterInfos().get(buildRegisterInfo()).getNotifyListeners().size());
262262
}
263263

@@ -275,7 +275,7 @@ public void testExpireCache()
275275
Thread.sleep((CACHE_EXPIRE_TIME + 1) * 1000);
276276
List<RegisterInfo> registerInfos = clientRegistry.cache
277277
.getRegisterInfos(buildRegisterInfo().getServiceName());
278-
Assert.assertEquals(0, registerInfos.size());
278+
Assertions.assertEquals(0, registerInfos.size());
279279

280280
}
281281

@@ -298,7 +298,7 @@ public void testRedoExpireCache()
298298
Thread.sleep((CACHE_EXPIRE_TIME + 1) * 1000);
299299
List<RegisterInfo> registerInfos = clientRegistry.cache
300300
.getRegisterInfos(buildRegisterInfo().getServiceName());
301-
Assert.assertEquals(10, registerInfos.size());
301+
Assertions.assertEquals(10, registerInfos.size());
302302
}
303303

304304
@Test
@@ -318,7 +318,7 @@ public void testInvalidSyncFile()
318318
initPluginConfig("0.0.0.0", 2181, false, false, "/xxxx/" + serverCacheFilePath,
319319
CACHE_EXPIRE_TIME));
320320
} catch (Exception e) {
321-
Assert.assertTrue(e instanceof IllegalArgumentException);
321+
Assertions.assertTrue(e instanceof IllegalArgumentException);
322322
}
323323

324324
}

‎trpc-registry/trpc-registry-api/src/test/java/com/tencent/trpc/registry/common/ConstantsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import com.tencent.trpc.core.logger.Logger;
1515
import com.tencent.trpc.core.logger.LoggerFactory;
16-
import org.junit.Test;
16+
import org.junit.jupiter.api.Test;
1717

1818
import java.lang.reflect.Constructor;
1919

0 commit comments

Comments
 (0)