From 73f762285e4f68870a0d5e40a082f0f24d5dd26b Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 8 Jan 2020 15:41:56 +0100 Subject: [PATCH] Minor test refactoring. --- .../web/client/feign/FeignRetriesTests.java | 14 +++++--------- .../feign/issues/issue502/Issue502Tests.java | 7 +++---- .../feign/issues/issueX/IssueXTests.java | 10 +++------- .../feign/issues/issueY/IssueYTests.java | 6 +++--- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java index 1c36cbd2b..684460977 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/FeignRetriesTests.java @@ -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"); diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java index 2ec4e1b02..c4ae173d0 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issue502/Issue502Tests.java @@ -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(); diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java index 5a2bd4723..6bb43fa99 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueX/IssueXTests.java @@ -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") diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java index bbf89babc..5ca471a46 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/src/test/java/org/springframework/cloud/sleuth/instrument/feign/issues/issueY/IssueYTests.java @@ -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();