Skip to content

Commit 3ebabf9

Browse files
wardseptemberwardseptember
committed
feat: add test case
1 parent 2936e88 commit 3ebabf9

7 files changed

Lines changed: 96 additions & 95 deletions

File tree

‎trpc-core/src/main/java/com/tencent/trpc/core/filter/ProviderFilterInvoker.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Tencent is pleased to support the open source community by making tRPC available.
33
*
4-
* Copyright (C) 2023 Tencent.
4+
* Copyright (C) 2023 Tencent.
55
* All rights reserved.
66
*
77
* If you have downloaded a copy of the tRPC source code from Tencent,
@@ -68,7 +68,8 @@ public Class<T> getInterface() {
6868
public CompletionStage<Response> invoke(Request request) {
6969
RpcInvocation inv = request.getInvocation();
7070
if (logger.isDebugEnabled()) {
71-
logger.debug(">>>Before Invoke provider filter(service={}, rpcServiceName={}, rpcMehthodName={})",
71+
logger.debug(">>>Before Invoke provider filter(service={}, rpcServiceName={}, "
72+
+ "rpcMehthodName={})",
7273
filter.getClass(), inv.getRpcServiceName(), inv.getRpcMethodName());
7374
}
7475

‎trpc-core/src/test/java/com/tencent/trpc/core/cluster/def/DefClusterInvokerTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ public void testDoInvokeWithCompletedFuture() {
244244
try {
245245
defClusterInvoker.doInvoke(defRequest, completedInstance).toCompletableFuture().join();
246246
} catch (Exception e) {
247+
e.printStackTrace();
247248
}
248249
}
249250

‎trpc-core/src/test/java/com/tencent/trpc/core/trace/TracerClientFilterTest.java‎

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,26 @@ public void testWithParentSpan() {
180180

181181
@Test
182182
public void testWithErrorFlag() {
183+
RpcClientContext context = new RpcClientContext();
184+
Span parentSpan = NoopSpan.INSTANCE;
185+
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACE_SPAN, parentSpan);
186+
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
187+
Request request = new DefRequest();
188+
request.setContext(context);
189+
RpcInvocation invocation = new RpcInvocation();
190+
invocation.setRpcServiceName("rpcServiceName");
191+
invocation.setRpcMethodName("rpcMethodName");
192+
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
193+
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
194+
request.setInvocation(invocation);
195+
CompletableFuture<Response> future = new CompletableFuture<Response>();
196+
Response rsp = new DefResponse();
197+
Map<String, Object> attachments = new HashMap<>();
198+
attachments.put(TracerConstants.Keys.TRACE_ERROR_KEY, TracerConstants.Keys.TRACE_ERROR_VALUE);
199+
rsp.setAttachments(attachments);
200+
future.complete(rsp);
201+
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
202+
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
183203
TracerClientFilter errorFilter = new TracerClientFilter() {
184204
@Override
185205
public String getPluginName() {
@@ -213,11 +233,12 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
213233
return new HashMap<>();
214234
}
215235
};
236+
errorFilter.filter(invoker, request);
237+
}
216238

239+
@Test
240+
public void testNullTracer() {
217241
RpcClientContext context = new RpcClientContext();
218-
Span parentSpan = NoopSpan.INSTANCE;
219-
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACE_SPAN, parentSpan);
220-
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
221242
Request request = new DefRequest();
222243
request.setContext(context);
223244
RpcInvocation invocation = new RpcInvocation();
@@ -228,17 +249,9 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
228249
request.setInvocation(invocation);
229250
CompletableFuture<Response> future = new CompletableFuture<Response>();
230251
Response rsp = new DefResponse();
231-
Map<String, Object> attachments = new HashMap<>();
232-
attachments.put(TracerConstants.Keys.TRACE_ERROR_KEY, TracerConstants.Keys.TRACE_ERROR_VALUE);
233-
rsp.setAttachments(attachments);
234252
future.complete(rsp);
235253
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
236254
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
237-
errorFilter.filter(invoker, request);
238-
}
239-
240-
@Test
241-
public void testNullTracer() {
242255
TracerClientFilter nullTracerFilter = new TracerClientFilter() {
243256
@Override
244257
public String getPluginName() {
@@ -264,8 +277,13 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
264277
return new HashMap<>();
265278
}
266279
};
280+
nullTracerFilter.filter(invoker, request);
281+
}
267282

283+
@Test
284+
public void testCreateSpanException() {
268285
RpcClientContext context = new RpcClientContext();
286+
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
269287
Request request = new DefRequest();
270288
request.setContext(context);
271289
RpcInvocation invocation = new RpcInvocation();
@@ -279,11 +297,6 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
279297
future.complete(rsp);
280298
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
281299
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
282-
nullTracerFilter.filter(invoker, request);
283-
}
284-
285-
@Test
286-
public void testCreateSpanException() {
287300
TracerClientFilter exceptionFilter = new TracerClientFilter() {
288301
@Override
289302
public String getPluginName() {
@@ -309,7 +322,11 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
309322
return new HashMap<>();
310323
}
311324
};
325+
exceptionFilter.filter(invoker, request);
326+
}
312327

328+
@Test
329+
public void testFinishException() {
313330
RpcClientContext context = new RpcClientContext();
314331
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
315332
Request request = new DefRequest();
@@ -325,11 +342,6 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
325342
future.complete(rsp);
326343
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
327344
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
328-
exceptionFilter.filter(invoker, request);
329-
}
330-
331-
@Test
332-
public void testFinishException() {
333345
TracerClientFilter finishExceptionFilter = new TracerClientFilter() {
334346
@Override
335347
public String getPluginName() {
@@ -359,22 +371,6 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
359371
return new HashMap<>();
360372
}
361373
};
362-
363-
RpcClientContext context = new RpcClientContext();
364-
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
365-
Request request = new DefRequest();
366-
request.setContext(context);
367-
RpcInvocation invocation = new RpcInvocation();
368-
invocation.setRpcServiceName("rpcServiceName");
369-
invocation.setRpcMethodName("rpcMethodName");
370-
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
371-
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
372-
request.setInvocation(invocation);
373-
CompletableFuture<Response> future = new CompletableFuture<Response>();
374-
Response rsp = new DefResponse();
375-
future.complete(rsp);
376-
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
377-
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
378374
finishExceptionFilter.filter(invoker, request);
379375
}
380376

‎trpc-core/src/test/java/com/tencent/trpc/core/trace/TracerFilterTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ public void testDebugLog() {
119119
try {
120120
filter.getTracer(context, request.getMeta());
121121
} catch (Exception e) {
122+
e.printStackTrace();
122123
}
123124
}
124125

@@ -184,7 +185,8 @@ public void testUpdateSpanErrorFlagException() {
184185
@Test
185186
public void testUpdateSpanErrorFlagWithBothExceptions() {
186187
DefResponse response = new DefResponse();
187-
response.setException(com.tencent.trpc.core.exception.TRpcException.newFrameException(200, "response exception"));
188+
response.setException(
189+
com.tencent.trpc.core.exception.TRpcException.newFrameException(200, "response exception"));
188190
Span span = NoopSpan.INSTANCE;
189191
filter.updateSpanErrorFlag(response, new RuntimeException("throwable"), span);
190192
}

‎trpc-core/src/test/java/com/tencent/trpc/core/trace/TracerServerFilterTest.java‎

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ public void testExtractSpanContext() {
274274
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
275275
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
276276
request.setInvocation(invocation);
277-
277+
278278
Map<String, Object> attachments = new HashMap<>();
279279
attachments.put("trace-id", "test-trace-id".getBytes());
280280
request.getAttachments().putAll(attachments);
281-
281+
282282
CompletableFuture<Response> future = new CompletableFuture<Response>();
283283
Response rsp = new DefResponse();
284284
future.complete(rsp);
@@ -298,11 +298,11 @@ public void testSpanWithErrorFlag() {
298298
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
299299
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
300300
request.setInvocation(invocation);
301-
301+
302302
Map<String, Object> attachments = new HashMap<>();
303303
attachments.put("trace-id", "test-trace-id".getBytes());
304304
request.getAttachments().putAll(attachments);
305-
305+
306306
CompletableFuture<Response> future = new CompletableFuture<Response>();
307307
Response rsp = new DefResponse();
308308
rsp.setException(TRpcException.newBizException(100, "test error"));
@@ -314,6 +314,21 @@ public void testSpanWithErrorFlag() {
314314

315315
@Test
316316
public void testCreateSpanException() {
317+
RpcServerContext context = new RpcServerContext();
318+
Request request = new DefRequest();
319+
request.setContext(context);
320+
RpcInvocation invocation = new RpcInvocation();
321+
invocation.setRpcServiceName("rpcServiceName");
322+
invocation.setRpcMethodName("rpcMethodName");
323+
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
324+
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
325+
request.setInvocation(invocation);
326+
327+
CompletableFuture<Response> future = new CompletableFuture<Response>();
328+
Response rsp = new DefResponse();
329+
future.complete(rsp);
330+
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
331+
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
317332
TracerServerFilter exceptionFilter = new TracerServerFilter() {
318333
@Override
319334
public String getPluginName() {
@@ -339,8 +354,13 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
339354
return new HashMap<>();
340355
}
341356
};
357+
exceptionFilter.filter(invoker, request);
358+
}
342359

360+
@Test
361+
public void testFinishSpanException() {
343362
RpcServerContext context = new RpcServerContext();
363+
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
344364
Request request = new DefRequest();
345365
request.setContext(context);
346366
RpcInvocation invocation = new RpcInvocation();
@@ -349,17 +369,12 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
349369
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
350370
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
351371
request.setInvocation(invocation);
352-
372+
353373
CompletableFuture<Response> future = new CompletableFuture<Response>();
354374
Response rsp = new DefResponse();
355375
future.complete(rsp);
356376
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
357377
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
358-
exceptionFilter.filter(invoker, request);
359-
}
360-
361-
@Test
362-
public void testFinishSpanException() {
363378
TracerServerFilter exceptionFilter = new TracerServerFilter() {
364379
@Override
365380
public String getPluginName() {
@@ -389,23 +404,6 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
389404
return new HashMap<>();
390405
}
391406
};
392-
393-
RpcServerContext context = new RpcServerContext();
394-
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
395-
Request request = new DefRequest();
396-
request.setContext(context);
397-
RpcInvocation invocation = new RpcInvocation();
398-
invocation.setRpcServiceName("rpcServiceName");
399-
invocation.setRpcMethodName("rpcMethodName");
400-
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
401-
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
402-
request.setInvocation(invocation);
403-
404-
CompletableFuture<Response> future = new CompletableFuture<Response>();
405-
Response rsp = new DefResponse();
406-
future.complete(rsp);
407-
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
408-
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
409407
exceptionFilter.filter(invoker, request);
410408
}
411409

@@ -421,16 +419,17 @@ public void testWhenCompleteWithThrowable() {
421419
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
422420
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
423421
request.setInvocation(invocation);
424-
422+
425423
CompletableFuture<Response> future = new CompletableFuture<Response>();
426424
Response rsp = new DefResponse();
427425
future.completeExceptionally(new RuntimeException("test throwable"));
428426
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
429427
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
430-
428+
431429
try {
432430
filter.filter(invoker, request).toCompletableFuture().join();
433431
} catch (Exception e) {
432+
e.printStackTrace();
434433
}
435434
}
436435

@@ -445,11 +444,11 @@ public void testInjectWithErrorFlag() {
445444
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
446445
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
447446
request.setInvocation(invocation);
448-
447+
449448
Map<String, Object> attachments = new HashMap<>();
450449
attachments.put("trace-id", "test-trace-id".getBytes());
451450
request.getAttachments().putAll(attachments);
452-
451+
453452
CompletableFuture<Response> future = new CompletableFuture<Response>();
454453
Response rsp = new DefResponse();
455454
rsp.setException(new IllegalArgumentException("test error"));
@@ -461,6 +460,22 @@ public void testInjectWithErrorFlag() {
461460

462461
@Test
463462
public void testNullSpanInWhenComplete() {
463+
RpcServerContext context = new RpcServerContext();
464+
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
465+
Request request = new DefRequest();
466+
request.setContext(context);
467+
RpcInvocation invocation = new RpcInvocation();
468+
invocation.setRpcServiceName("rpcServiceName");
469+
invocation.setRpcMethodName("rpcMethodName");
470+
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
471+
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
472+
request.setInvocation(invocation);
473+
474+
CompletableFuture<Response> future = new CompletableFuture<Response>();
475+
Response rsp = new DefResponse();
476+
future.complete(rsp);
477+
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
478+
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
464479
TracerServerFilter nullSpanFilter = new TracerServerFilter() {
465480
@Override
466481
public String getPluginName() {
@@ -486,23 +501,6 @@ public Map<String, Object> inject(Tracer tracer, Span span) {
486501
return new HashMap<>();
487502
}
488503
};
489-
490-
RpcServerContext context = new RpcServerContext();
491-
RpcContextUtils.putValueMapValue(context, RpcContextValueKeys.CTX_TRACER, NoopTracerFactory.create());
492-
Request request = new DefRequest();
493-
request.setContext(context);
494-
RpcInvocation invocation = new RpcInvocation();
495-
invocation.setRpcServiceName("rpcServiceName");
496-
invocation.setRpcMethodName("rpcMethodName");
497-
request.getMeta().setRemoteAddress(InetSocketAddress.createUnresolved("127.0.0.1", 8888));
498-
request.getMeta().setLocalAddress(InetSocketAddress.createUnresolved("127.0.0.1", 9999));
499-
request.setInvocation(invocation);
500-
501-
CompletableFuture<Response> future = new CompletableFuture<Response>();
502-
Response rsp = new DefResponse();
503-
future.complete(rsp);
504-
Invoker<?> invoker = (Invoker<?>) PowerMockito.mock(Invoker.class);
505-
PowerMockito.when(invoker.invoke(request)).thenReturn(future);
506504
nullSpanFilter.filter(invoker, request);
507505
}
508506

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,8 @@ public void testInvalidSyncFile()
315315
IllegalAccessException {
316316
try {
317317
serverRegistry.setPluginConfig(
318-
initPluginConfig("0.0.0.0", 2181, false, false, "/xxxx/" + serverCacheFilePath,
318+
initPluginConfig("0.0.0.0", 2181,
319+
false, false, "/xxxx/" + serverCacheFilePath,
319320
CACHE_EXPIRE_TIME));
320321
} catch (Exception e) {
321322
Assert.assertTrue(e instanceof IllegalArgumentException);
@@ -394,9 +395,11 @@ public void destroy() throws TRpcExtensionException {
394395
};
395396
clientRegistry.subscribe(registerInfo, discovery1);
396397
clientRegistry.subscribe(registerInfo, discovery2);
397-
Assert.assertEquals(2, clientRegistry.getSubscribedRegisterInfos().get(registerInfo).getNotifyListeners().size());
398+
Assert.assertEquals(2,
399+
clientRegistry.getSubscribedRegisterInfos().get(registerInfo).getNotifyListeners().size());
398400
clientRegistry.unsubscribe(registerInfo, discovery1);
399-
Assert.assertEquals(1, clientRegistry.getSubscribedRegisterInfos().get(registerInfo).getNotifyListeners().size());
401+
Assert.assertEquals(1,
402+
clientRegistry.getSubscribedRegisterInfos().get(registerInfo).getNotifyListeners().size());
400403
clientRegistry.unsubscribe(registerInfo, discovery2);
401404
Assert.assertEquals(0, clientRegistry.getSubscribedRegisterInfos().size());
402405
}

0 commit comments

Comments
 (0)