[#9932] Fix testcase failure

pinpoint-apm · May 24, 2023 · d643842 · d643842
1 parent 470becc
commit d643842
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 16 deletions.
diff --git a/...r/src/main/java/com/navercorp/pinpoint/common/profiler/message/DefaultResultResponse.java b/...r/src/main/java/com/navercorp/pinpoint/common/profiler/message/DefaultResultResponse.java
@@ -0,0 +1,21 @@
+package com.navercorp.pinpoint.common.profiler.message;
+
+public class DefaultResultResponse implements ResultResponse {
+    private final boolean success;
+    private final String message;
+
+    public DefaultResultResponse(boolean success, String message) {
+        this.success = success;
+        this.message = message;
+    }
+
+    @Override
+    public boolean isSuccess() {
+        return success;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}
diff --git a/profiler-test/src/main/java/com/navercorp/pinpoint/test/classloader/TestClassList.java b/profiler-test/src/main/java/com/navercorp/pinpoint/test/classloader/TestClassList.java
@@ -25,12 +25,12 @@
  */
 public class TestClassList {
 
-    private List<String> testClassList = new ArrayList<>();
+    private final List<String> testClassList = new ArrayList<>();
 
     public TestClassList() {
         add("com.navercorp.pinpoint.bootstrap.");
         add("com.navercorp.pinpoint.common.");
-        add("com.navercorp.pinpoint.thrift.");
+
         add("com.navercorp.pinpoint.profiler.context.");
 
         add("com.navercorp.pinpoint.test.MockApplicationContext");
@@ -42,7 +42,7 @@ public TestClassList() {
         add("com.navercorp.pinpoint.test.junit4.TestContext");
 
         add("com.navercorp.pinpoint.test.junit4.IsRootSpan");
-        add("org.apache.thrift.TBase");
+
         add("junit.");
         add("org.hamcrest.");
         add("org.assertj.");

diff --git a/profiler-test/src/main/java/com/navercorp/pinpoint/test/rpc/MockMessageConverter.java b/profiler-test/src/main/java/com/navercorp/pinpoint/test/rpc/MockMessageConverter.java
@@ -0,0 +1,18 @@
+package com.navercorp.pinpoint.test.rpc;
+
+import com.google.inject.Inject;
+import com.navercorp.pinpoint.common.profiler.message.DefaultResultResponse;
+import com.navercorp.pinpoint.common.profiler.message.MessageConverter;
+import com.navercorp.pinpoint.common.profiler.message.ResultResponse;
+
+public class MockMessageConverter implements MessageConverter<Object, ResultResponse> {
+
+    @Inject
+    public MockMessageConverter() {
+    }
+
+    @Override
+    public ResultResponse toMessage(Object message) {
+        return new DefaultResultResponse(true, "success by mocking");
+    }
+}
diff --git a/profiler-test/src/main/java/com/navercorp/pinpoint/test/rpc/MockRpcModule.java b/profiler-test/src/main/java/com/navercorp/pinpoint/test/rpc/MockRpcModule.java
@@ -27,7 +27,6 @@
 import com.navercorp.pinpoint.common.profiler.message.ResultResponse;
 import com.navercorp.pinpoint.io.ResponseMessage;
 import com.navercorp.pinpoint.profiler.context.SpanType;
-import com.navercorp.pinpoint.profiler.context.grpc.GrpcMessageToResultConverterProvider;
 import com.navercorp.pinpoint.profiler.context.module.AgentDataSender;
 import com.navercorp.pinpoint.profiler.context.module.MetadataDataSender;
 import com.navercorp.pinpoint.profiler.context.module.ModuleLifeCycle;
@@ -88,7 +87,7 @@ protected void configure() {
 
         TypeLiteral<MessageConverter<Object, ResultResponse>> resultMessageConverter = new TypeLiteral<MessageConverter<Object, ResultResponse>>() {};
         Key<MessageConverter<Object, ResultResponse>> resultMessageConverterKey = Key.get(resultMessageConverter, ResultConverter.class);
-        bind(resultMessageConverterKey).toProvider(GrpcMessageToResultConverterProvider.class).in(Scopes.SINGLETON);
+        bind(resultMessageConverterKey).to(MockMessageConverter.class).in(Scopes.SINGLETON);
         expose(resultMessageConverterKey);
 
 

diff --git a/.../main/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcMessageToResultConverter.java b/.../main/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcMessageToResultConverter.java
@@ -17,6 +17,7 @@
 package com.navercorp.pinpoint.profiler.context.grpc;
 
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.navercorp.pinpoint.common.profiler.message.DefaultResultResponse;
 import com.navercorp.pinpoint.common.profiler.message.MessageConverter;
 import com.navercorp.pinpoint.common.profiler.message.ResultResponse;
 import com.navercorp.pinpoint.grpc.trace.PResult;
@@ -33,17 +34,7 @@ public ResultResponse toMessage(Object object) {
             final byte[] byteMessage = responseMessage.getMessage();
             try {
                 final PResult pResult = PResult.parseFrom(byteMessage);
-                return new ResultResponse() {
-                    @Override
-                    public boolean isSuccess() {
-                        return pResult.getSuccess();
-                    }
-
-                    @Override
-                    public String getMessage() {
-                        return pResult.getMessage();
-                    }
-                };
+                return new DefaultResultResponse(pResult.getSuccess(), pResult.getMessage());
             } catch (InvalidProtocolBufferException e) {
                 throw new IllegalArgumentException("invalid message data. response message=" + responseMessage, e);
             }