Skip to content

Commit 290084a

Browse files
committed
fix jetty-client unit test
1 parent edaa3af commit 290084a

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/client/AsyncHttpRequestSendInterceptorTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner;
3434
import org.apache.skywalking.apm.network.trace.component.ComponentsDefine;
3535
import org.eclipse.jetty.client.HttpClient;
36+
import org.eclipse.jetty.client.HttpConversation;
3637
import org.eclipse.jetty.client.HttpRequest;
3738
import org.eclipse.jetty.client.ResponseNotifier;
3839
import org.eclipse.jetty.client.api.Response;
@@ -82,8 +83,8 @@ public class AsyncHttpRequestSendInterceptorTest {
8283

8384
@Before
8485
public void setUp() throws Exception {
85-
httpRequestEnhancedInstance = new MockHttpRequest(httpClient, uri);
86-
responseNotifierEnhancedInstance = new MockResponseNotifier(httpClient);
86+
httpRequestEnhancedInstance = new MockHttpRequest(httpClient, new HttpConversation(), uri);
87+
responseNotifierEnhancedInstance = new MockResponseNotifier();
8788

8889
Result results = new Result(httpRequestEnhancedInstance, response);
8990
allArguments = new Object[]{(Response.CompleteListener) result -> { }, results};
@@ -146,8 +147,8 @@ private void assertJettySpan() {
146147
}
147148

148149
private class MockHttpRequest extends HttpRequest implements EnhancedInstance {
149-
public MockHttpRequest(HttpClient httpClient, URI uri) {
150-
super(httpClient, uri);
150+
public MockHttpRequest(HttpClient client, HttpConversation conversation, URI uri) {
151+
super(httpClient, conversation, uri);
151152
}
152153

153154
@Override
@@ -172,8 +173,8 @@ public void setSkyWalkingDynamicField(Object value) {
172173
}
173174

174175
private class MockResponseNotifier extends ResponseNotifier implements EnhancedInstance {
175-
public MockResponseNotifier(HttpClient client) {
176-
super(client);
176+
public MockResponseNotifier() {
177+
super();
177178
}
178179

179180
@Override

apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jetty/v9/client/SyncHttpRequestSendInterceptorTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.skywalking.apm.agent.test.tools.SpanAssert;
3535
import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner;
3636
import org.eclipse.jetty.client.HttpClient;
37+
import org.eclipse.jetty.client.HttpConversation;
3738
import org.eclipse.jetty.client.HttpRequest;
3839
import org.junit.Assert;
3940
import org.junit.Before;
@@ -67,7 +68,7 @@ public class SyncHttpRequestSendInterceptorTest {
6768

6869
@Before
6970
public void setUp() throws Exception {
70-
enhancedInstance = new MockHttpRequest(httpClient, uri);
71+
enhancedInstance = new MockHttpRequest(httpClient, new HttpConversation(), uri);
7172
allArguments = new Object[] {
7273
"OperationKey",
7374
"OperationValue"
@@ -123,8 +124,8 @@ public void testMethodsAroundError() throws Throwable {
123124
}
124125

125126
private class MockHttpRequest extends HttpRequest implements EnhancedInstance {
126-
public MockHttpRequest(HttpClient httpClient, URI uri) {
127-
super(httpClient, uri);
127+
public MockHttpRequest(HttpClient client, HttpConversation conversation, URI uri) {
128+
super(httpClient, conversation, uri);
128129
}
129130

130131
@Override

0 commit comments

Comments
 (0)