SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility in feign-based tests.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2020-01-08 15:13:01 +01:00
parent b76d3bfa0c
commit 199ebb69d0
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java
View File

@@ -113,7 +113,8 @@ public class FeignRetriesTests {
return Response.builder().status(200).reason("OK")
.headers(new HashMap<>()).body("OK", Charset.defaultCharset())
.request(Request.create(Request.HttpMethod.POST, "/foo",
new HashMap<>(), Request.Body.empty(), new RequestTemplate()))
new HashMap<>(), Request.Body.empty(),
new RequestTemplate()))
.build();
}
};

3
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java
View File

@@ -25,6 +25,7 @@ import brave.Tracing;
import brave.sampler.Sampler;
import feign.Client;
import feign.Request;
import feign.RequestTemplate;
import feign.Response;
import org.junit.Before;
import org.junit.Test;
@@ -125,7 +126,7 @@ class MyClient implements Client {
this.wasCalled = true;
return Response.builder().body("foo", Charset.forName("UTF-8"))
.request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(),
Request.Body.empty()))
Request.Body.empty(), new RequestTemplate()))
.headers(new HashMap<>()).status(200).build();
}

3
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java
View File

@@ -25,6 +25,7 @@ import brave.Tracing;
import brave.sampler.Sampler;
import feign.Client;
import feign.Request;
import feign.RequestTemplate;
import feign.Response;
import org.junit.Before;
import org.junit.Test;
@@ -157,7 +158,7 @@ class MyDelegateClient implements Client {
this.wasCalled = true;
return Response.builder().body("foo", Charset.forName("UTF-8"))
.request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(),
Request.Body.empty()))
Request.Body.empty(), new RequestTemplate()))
.headers(new HashMap<>()).status(200).build();
}

3
tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java
View File

@@ -27,6 +27,7 @@ import feign.Client;
import feign.Contract;
import feign.Feign;
import feign.Request;
import feign.RequestTemplate;
import feign.Response;
import feign.Target.HardCodedTarget;
import feign.codec.Decoder;
@@ -183,7 +184,7 @@ class MyDelegateClient implements Client {
this.wasCalled = true;
return Response.builder().body("foo", Charset.forName("UTF-8"))
.request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(),
Request.Body.empty()))
Request.Body.empty(), new RequestTemplate()))
.headers(new HashMap<>()).status(200).build();
}