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

Minor test refactoring.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2020-01-08 15:41:56 +01:00
parent 199ebb69d0
commit 73f762285e
4 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public class FeignRetriesTests {
}
@Test
public void testRetriedWhenExceededNumberOfRetries() throws Exception {
public void testRetriedWhenExceededNumberOfRetries() {
Client client = (request, options) -> {
throw new IOException();
};
@@ -99,7 +99,7 @@ public class FeignRetriesTests {
}
@Test
public void testRetriedWhenRequestEventuallyIsSent() throws Exception {
public void testRetriedWhenRequestEventuallyIsSent() {
String url = "http://localhost:" + this.server.getPort();
final AtomicInteger atomicInteger = new AtomicInteger();
// Client to simulate a retry scenario
@@ -119,13 +119,9 @@ public class FeignRetriesTests {
}
};
TestInterface api = Feign.builder()
.client(new TracingFeignClient(this.httpTracing, new Client() {
@Override
public Response execute(Request request, Request.Options options)
throws IOException {
atomicInteger.incrementAndGet();
return client.execute(request, options);
}
.client(new TracingFeignClient(this.httpTracing, (request, options) -> {
atomicInteger.incrementAndGet();
return client.execute(request, options);
})).target(TestInterface.class, url);
then(api.decodedPost()).isEqualTo("OK");

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

@@ -16,8 +16,7 @@
package org.springframework.cloud.sleuth.instrument.feign.issues.issue502;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
@@ -122,9 +121,9 @@ class MyClient implements Client {
boolean wasCalled;
@Override
public Response execute(Request request, Request.Options options) throws IOException {
public Response execute(Request request, Request.Options options) {
this.wasCalled = true;
return Response.builder().body("foo", Charset.forName("UTF-8"))
return Response.builder().body("foo", StandardCharsets.UTF_8)
.request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(),
Request.Body.empty(), new RequestTemplate()))
.headers(new HashMap<>()).status(200).build();

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

@@ -17,7 +17,7 @@
package org.springframework.cloud.sleuth.instrument.feign.issues.issueX;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
@@ -154,18 +154,14 @@ class MyDelegateClient implements Client {
boolean wasCalled;
@Override
public Response execute(Request request, Request.Options options) throws IOException {
public Response execute(Request request, Request.Options options) {
this.wasCalled = true;
return Response.builder().body("foo", Charset.forName("UTF-8"))
return Response.builder().body("foo", StandardCharsets.UTF_8)
.request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(),
Request.Body.empty(), new RequestTemplate()))
.headers(new HashMap<>()).status(200).build();
}
boolean wasCalled() {
return this.wasCalled;
}
}
@FeignClient(name = "foo", url = "https://non.existing.url")

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

@@ -17,7 +17,7 @@
package org.springframework.cloud.sleuth.instrument.feign.issues.issueY;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List;
@@ -180,9 +180,9 @@ class MyDelegateClient implements Client {
boolean wasCalled;
@Override
public Response execute(Request request, Request.Options options) throws IOException {
public Response execute(Request request, Request.Options options) {
this.wasCalled = true;
return Response.builder().body("foo", Charset.forName("UTF-8"))
return Response.builder().body("foo", StandardCharsets.UTF_8)
.request(Request.create(Request.HttpMethod.POST, "/foo", new HashMap<>(),
Request.Body.empty(), new RequestTemplate()))
.headers(new HashMap<>()).status(200).build();