From 2519256d7d3160ab57ddd12cc45c7db807153b8d Mon Sep 17 00:00:00 2001 From: Maciej Gawinecki Date: Sun, 12 Feb 2023 11:27:52 +0100 Subject: [PATCH 1/5] Remove redundant throws and suppress depreciation warnings --- .../testing/curl/CurlRestAssuredConfigFactoryTest.java | 10 +++++----- .../testing/curl/UsingWithRestAssuredTest.java | 5 +---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java b/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java index 265f40a..29cc724 100644 --- a/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java +++ b/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java @@ -11,8 +11,6 @@ import io.restassured.config.HttpClientConfig; import io.restassured.config.RestAssuredConfig; import io.restassured.specification.RequestSpecification; -import java.io.IOException; -import org.apache.http.HttpException; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.client.HttpClient; @@ -26,6 +24,7 @@ import org.junit.jupiter.api.Test; import org.mockserver.client.MockServerClient; +@SuppressWarnings("deprecation") // AbstractHttpClient is deprecated but used by REST-assured public class CurlRestAssuredConfigFactoryTest { private static final int MOCK_PORT = 9999; @@ -141,13 +140,14 @@ protected boolean matchesSafely(AbstractHttpClient client, Description mismatchD } @Override - public void describeTo(Description description) {} + public void describeTo(Description description) { + } } private static class MyRequestInerceptor implements HttpRequestInterceptor { @Override - public void process(HttpRequest httpRequest, HttpContext httpContext) - throws HttpException, IOException {} + public void process(HttpRequest httpRequest, HttpContext httpContext) { + } } } diff --git a/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java b/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java index f55073f..01c98a7 100644 --- a/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java +++ b/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.function.Consumer; import org.apache.commons.io.FileUtils; -import org.apache.http.HttpException; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; import org.apache.http.client.HttpClient; @@ -409,9 +408,7 @@ public CurlTestingInterceptor(Consumer curlConsumer) { } @Override - public void process(HttpRequest request, HttpContext context) - throws HttpException, IOException { - + public void process(HttpRequest request, HttpContext context) { Options options = Options.builder() .printSingleliner() From bc2ae4a3112780bf79fad2ae6e556ddbfd4b4c93 Mon Sep 17 00:00:00 2001 From: Maciej Gawinecki Date: Sun, 12 Feb 2023 11:28:47 +0100 Subject: [PATCH 2/5] Use lambdas instead of anonymous classes --- .../curl/CurlRestAssuredConfigFactoryTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java b/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java index 29cc724..e189287 100644 --- a/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java +++ b/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java @@ -13,7 +13,6 @@ import io.restassured.specification.RequestSpecification; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; -import org.apache.http.client.HttpClient; import org.apache.http.impl.client.AbstractHttpClient; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.protocol.HttpContext; @@ -53,13 +52,10 @@ public void shouldIncludeCurlInterceptorWhenUpdatingExistingConfig() { HttpClientConfig.httpClientConfig() .setParam("TestParam", "TestValue") .httpClientFactory( - new HttpClientConfig.HttpClientFactory() { - @Override - public HttpClient createHttpClient() { - DefaultHttpClient client = new DefaultHttpClient(); - client.addRequestInterceptor(new MyRequestInerceptor()); - return client; - } + () -> { + DefaultHttpClient client = new DefaultHttpClient(); + client.addRequestInterceptor(new MyRequestInerceptor()); + return client; }); final RestAssuredConfig config = RestAssuredConfig.config().httpClient(httpClientConfig); From b95e18e9a6fad2c6526999cc0bb6e26ebc3e4ad7 Mon Sep 17 00:00:00 2001 From: Maciej Gawinecki Date: Sun, 12 Feb 2023 11:47:48 +0100 Subject: [PATCH 3/5] Use @Mock annotation --- pom.xml | 5 +++ .../testing/curl/TemporaryFolder.java | 1 + .../curl/UsingWithRestAssuredTest.java | 42 ++++--------------- 3 files changed, 13 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index ef9771a..d395271 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,11 @@ ${junit.jupiter.version} test + + org.mockito + mockito-junit-jupiter + 4.11.0 + org.junit.jupiter junit-jupiter-params diff --git a/src/test/java/com/github/dzieciou/testing/curl/TemporaryFolder.java b/src/test/java/com/github/dzieciou/testing/curl/TemporaryFolder.java index 3d560b3..b3e30f6 100644 --- a/src/test/java/com/github/dzieciou/testing/curl/TemporaryFolder.java +++ b/src/test/java/com/github/dzieciou/testing/curl/TemporaryFolder.java @@ -20,6 +20,7 @@ public Path createFile() throws IOException { public void deleteAll() { try (DirectoryStream directoryStream = Files.newDirectoryStream(this.dir)) { for (Path fpath : directoryStream) { + //noinspection ResultOfMethodCallIgnored fpath.toFile().delete(); } } catch (IOException ignored) { diff --git a/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java b/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java index 01c98a7..e5c545a 100644 --- a/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java +++ b/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java @@ -4,7 +4,6 @@ import static io.restassured.RestAssured.given; import static io.restassured.config.HttpClientConfig.httpClientConfig; import static io.restassured.config.MultiPartConfig.multiPartConfig; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockserver.integration.ClientAndServer.startClientAndServer; import static org.mockserver.model.HttpRequest.request; @@ -33,8 +32,12 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import org.mockserver.client.MockServerClient; +@ExtendWith(MockitoExtension.class) public class UsingWithRestAssuredTest { private static final int MOCK_PORT = 9999; @@ -44,6 +47,9 @@ public class UsingWithRestAssuredTest { private static MockServerClient mockServer; private static TemporaryFolder tempFolder; + @Mock + public Consumer curlConsumer; + private RestAssuredConfig getRestAssuredConfig(Consumer curlConsumer) { return config() .httpClient( @@ -62,9 +68,6 @@ public static void setupMock() throws IOException { @Test @Tag("end-to-end-samples") public void cookiesTest() { - - Consumer curlConsumer = mock(Consumer.class); - given() .redirects() .follow(false) @@ -94,9 +97,6 @@ public void cookiesTest() { @Test @Tag("end-to-end-samples") public void cookieWithSpecialCharactersTest() { - - Consumer curlConsumer = mock(Consumer.class); - given() .redirects() .follow(false) @@ -132,9 +132,6 @@ public void cookieWithSpecialCharactersTest() { @Test @Tag("end-to-end-samples") public void customizedCookie() { - - Consumer curlConsumer = mock(Consumer.class); - List cookies = new ArrayList<>(); cookies.add( new Cookie.Builder("token", "tokenValue") @@ -169,9 +166,6 @@ public void customizedCookie() { @Test @Tag("end-to-end-samples") public void basicIntegrationTest() { - - Consumer curlConsumer = mock(Consumer.class); - given() .redirects() .follow(false) @@ -190,9 +184,6 @@ public void basicIntegrationTest() { @Test @Tag("end-to-end-samples") public void shouldPrintPostRequestWithMultipartDataProperly() { - - Consumer curlConsumer = mock(Consumer.class); - given() .baseUri(MOCK_BASE_URI) .port(MOCK_PORT) @@ -214,9 +205,6 @@ public void shouldPrintPostRequestWithMultipartDataProperly() { @Test @Tag("end-to-end-samples") public void shouldPrintBody() { - - Consumer curlConsumer = mock(Consumer.class); - given() .baseUri(MOCK_BASE_URI) .port(MOCK_PORT) @@ -237,9 +225,6 @@ public void shouldPrintBody() { @Test @Tag("end-to-end-samples") public void shouldPrintBodyWithEncoding() { - - Consumer curlConsumer = mock(Consumer.class); - given() .baseUri(MOCK_BASE_URI) .port(MOCK_PORT) @@ -262,9 +247,6 @@ public void shouldPrintBodyWithEncoding() { @Test @Tag("end-to-end-samples") public void shouldPrintMultipartWithContentTypesForTypes() { - - Consumer curlConsumer = mock(Consumer.class); - given() .baseUri(MOCK_BASE_URI) .port(MOCK_PORT) @@ -284,9 +266,6 @@ public void shouldPrintMultipartWithContentTypesForTypes() { @Test public void shouldPrintMultipartWithMixedType() { - - Consumer curlConsumer = mock(Consumer.class); - given() .baseUri(MOCK_BASE_URI) .port(MOCK_PORT) @@ -307,8 +286,6 @@ public void shouldPrintMultipartWithMixedType() { @Test public void shouldPrintFileAsBinary() throws IOException { - Consumer curlConsumer = mock(Consumer.class); - File tempFile = tempFolder.createFile().toFile(); FileUtils.writeStringToFile(tempFile, "{ 'message' : 'hello world'}", Charset.defaultCharset()); @@ -330,8 +307,6 @@ public void shouldPrintFileAsBinary() throws IOException { @Test public void shouldPrintForm() { - Consumer curlConsumer = mock(Consumer.class); - given() .baseUri(MOCK_BASE_URI) .port(MOCK_PORT) @@ -353,9 +328,6 @@ public void shouldPrintForm() { @Test @Tag("end-to-end-samples") public void shouldPrintPut() { - - Consumer curlConsumer = mock(Consumer.class); - given() .redirects() .follow(false) From 15be0fafb1b8fd775ad355653ec611d4220f6dba Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Sun, 12 Feb 2023 10:48:41 +0000 Subject: [PATCH 4/5] Google Java Format --- .../testing/curl/CurlRestAssuredConfigFactoryTest.java | 6 ++---- .../dzieciou/testing/curl/UsingWithRestAssuredTest.java | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java b/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java index e189287..72bd8bf 100644 --- a/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java +++ b/src/test/java/com/github/dzieciou/testing/curl/CurlRestAssuredConfigFactoryTest.java @@ -136,14 +136,12 @@ protected boolean matchesSafely(AbstractHttpClient client, Description mismatchD } @Override - public void describeTo(Description description) { - } + public void describeTo(Description description) {} } private static class MyRequestInerceptor implements HttpRequestInterceptor { @Override - public void process(HttpRequest httpRequest, HttpContext httpContext) { - } + public void process(HttpRequest httpRequest, HttpContext httpContext) {} } } diff --git a/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java b/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java index e5c545a..285fb67 100644 --- a/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java +++ b/src/test/java/com/github/dzieciou/testing/curl/UsingWithRestAssuredTest.java @@ -47,8 +47,7 @@ public class UsingWithRestAssuredTest { private static MockServerClient mockServer; private static TemporaryFolder tempFolder; - @Mock - public Consumer curlConsumer; + @Mock public Consumer curlConsumer; private RestAssuredConfig getRestAssuredConfig(Consumer curlConsumer) { return config() From d37031ca1511559c51fd1cf94b275febe111787e Mon Sep 17 00:00:00 2001 From: Maciej Gawinecki Date: Sun, 12 Feb 2023 11:55:14 +0100 Subject: [PATCH 5/5] Set final --- src/main/java/com/github/dzieciou/testing/curl/Http2Curl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/dzieciou/testing/curl/Http2Curl.java b/src/main/java/com/github/dzieciou/testing/curl/Http2Curl.java index 87536bc..a0716a9 100644 --- a/src/main/java/com/github/dzieciou/testing/curl/Http2Curl.java +++ b/src/main/java/com/github/dzieciou/testing/curl/Http2Curl.java @@ -162,7 +162,7 @@ public String generateCurl(HttpRequest request) throws Exception { private static class Headers { List
toProcess; - Set ignored; + final Set ignored; public Headers(List
toProcess) { this.toProcess = toProcess;