Skip to content

Commit da8a482

Browse files
committed
[#9932] Fix testcase failure
1 parent 470becc commit da8a482

File tree

5 files changed

+45
-16
lines changed

5 files changed

+45
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package com.navercorp.pinpoint.common.profiler.message;
2+
3+
public class DefaultResultResponse implements ResultResponse {
4+
private final boolean success;
5+
private final String message;
6+
7+
public DefaultResultResponse(boolean success, String message) {
8+
this.success = success;
9+
this.message = message;
10+
}
11+
12+
@Override
13+
public boolean isSuccess() {
14+
return success;
15+
}
16+
17+
@Override
18+
public String getMessage() {
19+
return message;
20+
}
21+
}

profiler-test/src/main/java/com/navercorp/pinpoint/test/classloader/TestClassList.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
*/
2626
public class TestClassList {
2727

28-
private List<String> testClassList = new ArrayList<>();
28+
private final List<String> testClassList = new ArrayList<>();
2929

3030
public TestClassList() {
3131
add("com.navercorp.pinpoint.bootstrap.");
3232
add("com.navercorp.pinpoint.common.");
33-
add("com.navercorp.pinpoint.thrift.");
33+
3434
add("com.navercorp.pinpoint.profiler.context.");
3535

3636
add("com.navercorp.pinpoint.test.MockApplicationContext");
@@ -42,7 +42,7 @@ public TestClassList() {
4242
add("com.navercorp.pinpoint.test.junit4.TestContext");
4343

4444
add("com.navercorp.pinpoint.test.junit4.IsRootSpan");
45-
add("org.apache.thrift.TBase");
45+
4646
add("junit.");
4747
add("org.hamcrest.");
4848
add("org.assertj.");
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.navercorp.pinpoint.test.rpc;
2+
3+
import com.google.inject.Inject;
4+
import com.navercorp.pinpoint.common.profiler.message.DefaultResultResponse;
5+
import com.navercorp.pinpoint.common.profiler.message.MessageConverter;
6+
import com.navercorp.pinpoint.common.profiler.message.ResultResponse;
7+
8+
public class MockMessageConverter implements MessageConverter<Object, ResultResponse> {
9+
10+
@Inject
11+
public MockMessageConverter() {
12+
}
13+
14+
@Override
15+
public ResultResponse toMessage(Object message) {
16+
return new DefaultResultResponse(true, "success by mocking");
17+
}
18+
}

profiler-test/src/main/java/com/navercorp/pinpoint/test/rpc/MockRpcModule.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.navercorp.pinpoint.common.profiler.message.ResultResponse;
2828
import com.navercorp.pinpoint.io.ResponseMessage;
2929
import com.navercorp.pinpoint.profiler.context.SpanType;
30-
import com.navercorp.pinpoint.profiler.context.grpc.GrpcMessageToResultConverterProvider;
3130
import com.navercorp.pinpoint.profiler.context.module.AgentDataSender;
3231
import com.navercorp.pinpoint.profiler.context.module.MetadataDataSender;
3332
import com.navercorp.pinpoint.profiler.context.module.ModuleLifeCycle;
@@ -88,7 +87,7 @@ protected void configure() {
8887

8988
TypeLiteral<MessageConverter<Object, ResultResponse>> resultMessageConverter = new TypeLiteral<MessageConverter<Object, ResultResponse>>() {};
9089
Key<MessageConverter<Object, ResultResponse>> resultMessageConverterKey = Key.get(resultMessageConverter, ResultConverter.class);
91-
bind(resultMessageConverterKey).toProvider(GrpcMessageToResultConverterProvider.class).in(Scopes.SINGLETON);
90+
bind(resultMessageConverterKey).to(MockMessageConverter.class).in(Scopes.SINGLETON);
9291
expose(resultMessageConverterKey);
9392

9493

profiler/src/main/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcMessageToResultConverter.java

+2-11
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.navercorp.pinpoint.profiler.context.grpc;
1818

1919
import com.google.protobuf.InvalidProtocolBufferException;
20+
import com.navercorp.pinpoint.common.profiler.message.DefaultResultResponse;
2021
import com.navercorp.pinpoint.common.profiler.message.MessageConverter;
2122
import com.navercorp.pinpoint.common.profiler.message.ResultResponse;
2223
import com.navercorp.pinpoint.grpc.trace.PResult;
@@ -33,17 +34,7 @@ public ResultResponse toMessage(Object object) {
3334
final byte[] byteMessage = responseMessage.getMessage();
3435
try {
3536
final PResult pResult = PResult.parseFrom(byteMessage);
36-
return new ResultResponse() {
37-
@Override
38-
public boolean isSuccess() {
39-
return pResult.getSuccess();
40-
}
41-
42-
@Override
43-
public String getMessage() {
44-
return pResult.getMessage();
45-
}
46-
};
37+
return new DefaultResultResponse(pResult.getSuccess(), pResult.getMessage());
4738
} catch (InvalidProtocolBufferException e) {
4839
throw new IllegalArgumentException("invalid message data. response message=" + responseMessage, e);
4940
}

0 commit comments

Comments
 (0)