From 030bc68090d626a420c2d45f9ebd53adf1399605 Mon Sep 17 00:00:00 2001 From: Ryan Bergman Date: Thu, 22 Aug 2024 08:22:42 -0500 Subject: [PATCH] some light test refactorings --- .../test/java/BehaviorTests/AsBytesTest.java | 14 +++---- .../test/java/BehaviorTests/AsEmptyTest.java | 4 +- .../test/java/BehaviorTests/AsFileTest.java | 25 +++++------ .../java/BehaviorTests/AsGenericTypeTest.java | 12 +++--- .../test/java/BehaviorTests/AsJsonTest.java | 17 ++++---- .../test/java/BehaviorTests/AsObjectTest.java | 32 +++++++------- .../test/java/BehaviorTests/AsStringTest.java | 24 ++++++----- .../BehaviorTests/BodyLogSummaryTest.java | 14 +++---- .../BehaviorTests/CachingAlternativeTest.java | 4 +- .../test/java/BehaviorTests/CachingTest.java | 12 +++--- .../test/java/BehaviorTests/ConsumerTest.java | 7 ++-- .../test/java/BehaviorTests/CookieTest.java | 28 +++++++------ .../java/BehaviorTests/CustomClientTest.java | 7 +--- .../java/BehaviorTests/ErrorParsingTest.java | 16 +++---- .../java/BehaviorTests/ExecutorTests.java | 2 +- .../BehaviorTests/GenericMappingTest.java | 2 +- .../java/BehaviorTests/HeaderAsserts.java | 22 ++++++---- .../java/BehaviorTests/HeaderAssertsTest.java | 6 +-- .../test/java/BehaviorTests/HeaderTest.java | 6 +-- .../java/BehaviorTests/HostsHeaderTest.java | 10 ++--- .../java/BehaviorTests/InterceptorTest.java | 6 +-- .../JacksonObjectMapperTest.java | 6 +-- .../java/BehaviorTests/JsonPatchTest.java | 2 +- .../test/java/BehaviorTests/MetricsTest.java | 28 ++++++------- .../MultiPartFormPostingTest.java | 42 +++++++++---------- .../BehaviorTests/ObjectFunctionalTest.java | 10 ++--- .../java/BehaviorTests/PathParamTest.java | 12 +++--- .../PostRequestHandlersTest.java | 21 ++-------- .../java/BehaviorTests/QueryStringTest.java | 6 +-- .../BehaviorTests/RedirectHandlingTest.java | 4 +- .../java/BehaviorTests/RequestCapture.java | 1 - .../BehaviorTests/ResponseHeaderTest.java | 9 ++-- .../java/BehaviorTests/RetryAsyncTest.java | 20 ++++----- .../test/java/BehaviorTests/RetryTest.java | 22 +++++----- .../BehaviorTests/UniBodyPostingTest.java | 32 +++++++------- .../BehaviorTests/UploadProgressTest.java | 2 +- .../src/test/java/BehaviorTests/VerbTest.java | 2 +- .../java/BehaviorTests/WebsocketTest.java | 2 +- 38 files changed, 243 insertions(+), 248 deletions(-) diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/AsBytesTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/AsBytesTest.java index 6cd9fd8e..bbbf9dc7 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/AsBytesTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/AsBytesTest.java @@ -35,18 +35,18 @@ class AsBytesTest extends BddTest { @Test void getGetResultAsBytes() { - byte[] content = Unirest.get(MockServer.GET) + var content = Unirest.get(MockServer.GET) .asBytes() .getBody(); - RequestCapture cap = om.readValue(content, RequestCapture.class); + var cap = om.readValue(content, RequestCapture.class); cap.assertStatus(200); } @Test void getGetBinaryResultAsBytes() { - byte[] content = Unirest.get(MockServer.BINARYFILE) + var content = Unirest.get(MockServer.BINARYFILE) .asBytes() .getBody(); @@ -55,12 +55,12 @@ void getGetBinaryResultAsBytes() { @Test void getGetResultAsBytesAsync() throws Exception { - byte[] content = Unirest.get(MockServer.GET) + var content = Unirest.get(MockServer.GET) .asBytesAsync() .get() .getBody(); - RequestCapture cap = om.readValue(content, RequestCapture.class); + var cap = om.readValue(content, RequestCapture.class); cap.assertStatus(200); } @@ -83,7 +83,7 @@ void getGetResultAsBytesAsyncCallback() throws Exception { @Test // https://github.com/Kong/unirest-java/issues/424 void mappingErrorsFromAsBytes() { MockServer.setStringResponse("howdy"); - String r = Unirest.get(MockServer.ERROR_RESPONSE) + var r = Unirest.get(MockServer.ERROR_RESPONSE) .asBytes() .mapError(String.class); @@ -93,7 +93,7 @@ void mappingErrorsFromAsBytes() { @Test // https://github.com/Kong/unirest-java/issues/424 void mappingErrorsFromAsBytesMapped() { MockServer.setJsonAsResponse(new Foo("howdy")); - Foo r = Unirest.get(MockServer.ERROR_RESPONSE) + var r = Unirest.get(MockServer.ERROR_RESPONSE) .asBytes() .mapError(Foo.class); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/AsEmptyTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/AsEmptyTest.java index f7d7fc7f..4b966a5a 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/AsEmptyTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/AsEmptyTest.java @@ -48,7 +48,7 @@ void asEmptyParams() { @Test void canDoAEmptyRequestThatDoesNotParseBodyAtAll() { MockServer.addResponseHeader("Content-Type", "json"); - HttpResponse res = Unirest.get(MockServer.GET).asEmpty(); + var res = Unirest.get(MockServer.GET).asEmpty(); assertNull(res.getBody()); assertEquals(200, res.getStatus()); @@ -58,7 +58,7 @@ void canDoAEmptyRequestThatDoesNotParseBodyAtAll() { @Test void canDoEmptyAsync() throws Exception { MockServer.addResponseHeader("Content-Type", "json"); - HttpResponse res = Unirest.get(MockServer.GET).asEmptyAsync().get(); + var res = Unirest.get(MockServer.GET).asEmptyAsync().get(); assertNull(res.getBody()); assertEquals(200, res.getStatus()); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/AsFileTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/AsFileTest.java index af24c61f..7699520d 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/AsFileTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/AsFileTest.java @@ -37,6 +37,7 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -54,7 +55,7 @@ public void tearDown() { @Test void canSaveContentsIntoFile() { - File result = Unirest.get(MockServer.GET) + var result = Unirest.get(MockServer.GET) .queryString("talking","heads") .queryString("param3", "こんにちは") .asFile(test.toString()) @@ -70,7 +71,7 @@ void canSaveContentsIntoFile() { @Test void canSaveContentsIntoFileAsync() throws Exception { - File result = Unirest.get(MockServer.GET) + var result = Unirest.get(MockServer.GET) .queryString("talking","heads") .queryString("param3", "こんにちは") .asFileAsync(test.toString()) @@ -104,9 +105,9 @@ void canSaveContentsIntoFileAsyncWithCallback() throws Exception { @Test void canDownloadABinaryFile() throws Exception { - File f1 = TestUtil.rezFile("/spidey.jpg"); + var f1 = TestUtil.rezFile("/spidey.jpg"); - File f2 = Unirest.get(MockServer.BINARYFILE) + var f2 = Unirest.get(MockServer.BINARYFILE) .asFile(test.toString()) .getBody(); @@ -118,20 +119,21 @@ void byDefaultFailWhenAttemptingToOverride() { Unirest.get(MockServer.BINARYFILE) .asFile(test.toString()); - HttpResponse f2 = Unirest.get(MockServer.BINARYFILE) + var f2 = Unirest.get(MockServer.BINARYFILE) .asFile(test.toString()); assertTrue(f2.getParsingError().isPresent()); - assertTrue(f2.getParsingError().get().getCause().getCause() instanceof FileAlreadyExistsException); + assertThat(f2.getParsingError().get().getCause().getCause()) + .isInstanceOf(FileAlreadyExistsException.class); } @Test void canOverrideExistingFiles() { - File f1 = Unirest.get(MockServer.BINARYFILE) + var f1 = Unirest.get(MockServer.BINARYFILE) .asFile(test.toString()) .getBody(); - File f2 = Unirest.get(MockServer.BINARYFILE) + var f2 = Unirest.get(MockServer.BINARYFILE) .asFile(test.toString(), StandardCopyOption.REPLACE_EXISTING) .getBody(); @@ -140,12 +142,12 @@ void canOverrideExistingFiles() { @Test void canOverrideExistingFiles_Async() throws Exception { - File f1 = Unirest.get(MockServer.BINARYFILE) + var f1 = Unirest.get(MockServer.BINARYFILE) .asFileAsync(test.toString()) .get() .getBody(); - File f2 = Unirest.get(MockServer.BINARYFILE) + var f2 = Unirest.get(MockServer.BINARYFILE) .asFileAsync(test.toString(), StandardCopyOption.REPLACE_EXISTING) .get() .getBody(); @@ -153,10 +155,9 @@ void canOverrideExistingFiles_Async() throws Exception { assertEquals(f1, f2); } - @Test void dontReadFilesWhenInError() { - HttpResponse f1 = Unirest.get(MockServer.BINARYFILE) + var f1 = Unirest.get(MockServer.BINARYFILE) .downloadMonitor((field, fileName, bytesWritten, totalBytes) -> { throw new RuntimeException("hey hey hey"); }) diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/AsGenericTypeTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/AsGenericTypeTest.java index b6fc075b..86528685 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/AsGenericTypeTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/AsGenericTypeTest.java @@ -48,7 +48,7 @@ class AsGenericTypeTest extends BddTest { void canGetAListOfObjects() { MockServer.setJsonAsResponse(foos); - List foos = Unirest.get(MockServer.GET) + var foos = Unirest.get(MockServer.GET) .asObject(new GenericType>(){}) .getBody(); @@ -59,7 +59,7 @@ void canGetAListOfObjects() { void canGetAListOfObjectsAsync() throws ExecutionException, InterruptedException { MockServer.setJsonAsResponse(foos); - List foos = Unirest.get(MockServer.GET) + var foos = Unirest.get(MockServer.GET) .asObjectAsync(new GenericType>(){}) .get() .getBody(); @@ -86,11 +86,11 @@ void canGetAListOfObjectsAsyncWithCallback() { void soManyLayersOfGenerics() { MockServer.setJsonAsResponse(new WeirdType<>(foos, "hey")); - WeirdType> foos = Unirest.get(MockServer.GET) + var foos = Unirest.get(MockServer.GET) .asObject(new GenericType>>(){}) .getBody(); - List someTees = foos.getSomeTees(); + var someTees = foos.getSomeTees(); assertTheFoos(someTees); } @@ -100,11 +100,11 @@ void itAlsoWorksWithGson() { MockServer.setJsonAsResponse(new WeirdType<>(foos, "hey")); - WeirdType> foos = Unirest.get(MockServer.GET) + var foos = Unirest.get(MockServer.GET) .asObject(new GenericType>>(){}) .getBody(); - List someTees = foos.getSomeTees(); + var someTees = foos.getSomeTees(); assertTheFoos(someTees); } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/AsJsonTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/AsJsonTest.java index 939b57e5..922d6960 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/AsJsonTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/AsJsonTest.java @@ -38,7 +38,7 @@ class AsJsonTest extends BddTest { @Test void whenNoBodyIsReturned() { - HttpResponse i = Unirest.get(MockServer.NOBODY).asJson(); + var i = Unirest.get(MockServer.NOBODY).asJson(); assertEquals(HttpStatus.OK, i.getStatus()); assertEquals("{}", i.getBody().toString()); @@ -47,7 +47,7 @@ void whenNoBodyIsReturned() { @Test void toStringAObject() { MockServer.setStringResponse(new JSONObject().put("f", 1).put("a", Arrays.asList(2, 3, 4)).toString()); - HttpResponse i = Unirest.get(MockServer.GET).asJson(); + var i = Unirest.get(MockServer.GET).asJson(); assertEquals("{\"f\":1,\"a\":[2,3,4]}", i.getBody().toString()); } @@ -55,7 +55,7 @@ void toStringAObject() { @Test void toPrettyStringAObject() { MockServer.setStringResponse(new JSONObject().put("f", 1).put("a", Arrays.asList(2, 3, 4)).toString()); - HttpResponse i = Unirest.get(MockServer.GET).asJson(); + var i = Unirest.get(MockServer.GET).asJson(); assertEquals("{\n" + " \"f\": 1,\n" + @@ -69,7 +69,7 @@ void toPrettyStringAObject() { @Test void canGetBinaryResponse() { - HttpResponse i = Unirest.get(MockServer.GET) + var i = Unirest.get(MockServer.GET) .queryString("foo", "bar") .asJson(); @@ -78,7 +78,7 @@ void canGetBinaryResponse() { @Test void canGetBinaryResponseAsync() throws Exception { - CompletableFuture> r = Unirest.get(MockServer.GET) + var r = Unirest.get(MockServer.GET) .queryString("foo", "bar") .asJsonAsync(); @@ -99,12 +99,13 @@ void canGetBinaryResponseAsyncWithCallback() { @Test void failureToReturnValidJsonWillResultInAnEmptyNode() { - HttpResponse response = Unirest.get(MockServer.INVALID_REQUEST).asJson(); + var response = Unirest.get(MockServer.INVALID_REQUEST).asJson(); assertEquals(HttpStatus.BAD_REQUEST, response.getStatus()); assertNull(response.getBody()); assertTrue(response.getParsingError().isPresent()); - UnirestParsingException ex = response.getParsingError().get(); + + var ex = response.getParsingError().get(); assertEquals("You did something bad", ex.getOriginalBody()); assertEquals("kong.unirest.core.json.JSONException: Invalid JSON", response.getParsingError().get().getMessage()); @@ -130,7 +131,7 @@ void failureToReturnValidJsonWillResultInAnEmptyNodeAsync() { void doNotEscapeHTML() { MockServer.setStringResponse("{\"test\":\"it's a && b || c + 1!?\"}"); - JSONObject test = Unirest.get(MockServer.GET) + var test = Unirest.get(MockServer.GET) .asJson() .getBody() .getObject(); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/AsObjectTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/AsObjectTest.java index f4ab1bb6..fb001b21 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/AsObjectTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/AsObjectTest.java @@ -43,7 +43,8 @@ class AsObjectTest extends BddTest { @Test void basicJsonObjectMapperIsTheDefault() { Unirest.config().reset(true); - assertTrue(Unirest.config().getObjectMapper() instanceof GsonObjectMapper); + assertThat(Unirest.config().getObjectMapper()) + .isInstanceOf(GsonObjectMapper.class); } @Test @@ -60,10 +61,10 @@ void basicJsonObjectMapperIsGoodEnough() { @Test void whenNoBodyIsReturned() { - HttpResponse i = Unirest.get(MockServer.NOBODY).asObject(RequestCapture.class); + var i = Unirest.get(MockServer.NOBODY).asObject(RequestCapture.class); assertEquals(200, i.getStatus()); - assertEquals(null, i.getBody()); + assertNull(i.getBody()); } @Test @@ -102,7 +103,7 @@ void canGetObjectResponseAsyncWithCallback() { void canPassAnObjectMapperAsPartOfARequest(){ Unirest.config().setObjectMapper(null); - TestingMapper mapper = new TestingMapper(); + var mapper = new TestingMapper(); Unirest.post(MockServer.POST) .queryString("foo", "bar") .withObjectMapper(mapper) @@ -153,7 +154,7 @@ void setNoCharSetAfterBody() { @Test void ifTheObjectMapperFailsReturnEmptyAndAddToParsingError() { - HttpResponse request = Unirest.get(MockServer.INVALID_REQUEST) + var request = Unirest.get(MockServer.INVALID_REQUEST) .asObject(RequestCapture.class); assertNull(request.getBody()); @@ -167,7 +168,7 @@ void ifTheObjectMapperFailsReturnEmptyAndAddToParsingError() { @Test void ifTheObjectMapperFailsReturnEmptyAndAddToParsingErrorObGenericTypes() { - HttpResponse request = Unirest.get(MockServer.INVALID_REQUEST) + var request = Unirest.get(MockServer.INVALID_REQUEST) .asObject(new GenericType() {}); assertNull(request.getBody()); @@ -180,7 +181,7 @@ void ifTheObjectMapperFailsReturnEmptyAndAddToParsingErrorObGenericTypes() { @Test void unirestExceptionsAreAlsoParseExceptions() { - HttpResponse request = Unirest.get(MockServer.INVALID_REQUEST) + var request = Unirest.get(MockServer.INVALID_REQUEST) .asObject(new GenericType() {}); assertNull(request.getBody()); @@ -193,14 +194,14 @@ void unirestExceptionsAreAlsoParseExceptions() { @Test void canSetObjectMapperToFailOnUnknown() { - com.fasterxml.jackson.databind.ObjectMapper jack = new com.fasterxml.jackson.databind.ObjectMapper(); + var jack = new com.fasterxml.jackson.databind.ObjectMapper(); jack.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); Unirest.config().setObjectMapper(new JacksonObjectMapper(jack)); MockServer.setStringResponse("{\"foo\": [1,2,3] }"); - Error error = Unirest.get(MockServer.GET) + var error = Unirest.get(MockServer.GET) .asObject(RequestCapture.class) .mapError(Error.class); @@ -216,21 +217,22 @@ void parsingExceptions() { .getParsingError() .get(); - assertThat(ex) - .isInstanceOf(UnirestParsingException.class) - .hasMessage("kong.unirest.core.UnirestException: com.fasterxml.jackson.core.JsonParseException: Unrecognized token 'hi': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + - " at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); line: 1, column: 3]"); + assertParsingError(ex); var ex2 = Unirest.get(MockServer.ERROR_RESPONSE) .asObject(new GenericType() {}) .getParsingError() .get(); - assertThat(ex2) + assertParsingError(ex2); + + } + + private static void assertParsingError(UnirestParsingException e) { + assertThat(e) .isInstanceOf(UnirestParsingException.class) .hasMessage("kong.unirest.core.UnirestException: com.fasterxml.jackson.core.JsonParseException: Unrecognized token 'hi': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" + " at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); line: 1, column: 3]"); - } static class SomeTestClass {} diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/AsStringTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/AsStringTest.java index 1d49476d..51ca098a 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/AsStringTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/AsStringTest.java @@ -41,13 +41,13 @@ class AsStringTest extends BddTest { @Test void simpleExample() { MockServer.setStringResponse("Hi Mom"); - String body = Unirest.get(MockServer.GET).asString().getBody(); + var body = Unirest.get(MockServer.GET).asString().getBody(); assertEquals("Hi Mom", body); } @Test void whenNoBodyIsReturned() { - HttpResponse i = Unirest.get(MockServer.NOBODY).asString(); + var i = Unirest.get(MockServer.NOBODY).asString(); assertEquals(200, i.getStatus()); assertEquals("", i.getBody()); @@ -55,24 +55,26 @@ void whenNoBodyIsReturned() { @Test void canParseGzippedStringResponse() { - HttpResponse i = Unirest.get(MockServer.GZIP) + var i = Unirest.get(MockServer.GZIP) .queryString("foo", "bar") .header(Header.ACCEPT_ENCODING, "gzip") .asString(); - RequestCapture cap = TestUtil.readValue(i.getBody(), RequestCapture.class); assertEquals(200, i.getStatus()); + + var cap = TestUtil.readValue(i.getBody(), RequestCapture.class); cap.assertParam("foo", "bar"); } @Test void canParseGzippedResponseAsync() throws Exception { - HttpResponse i = Unirest.get(MockServer.GZIP) + var i = Unirest.get(MockServer.GZIP) .queryString("foo", "bar") .asStringAsync().get(); - RequestCapture cap = TestUtil.readValue(i.getBody(), RequestCapture.class); assertEquals(200, i.getStatus()); + + var cap = TestUtil.readValue(i.getBody(), RequestCapture.class); cap.assertParam("foo", "bar"); } @@ -82,17 +84,17 @@ void canGetBinaryResponse() { .queryString("foo", "bar") .asString(); - RequestCapture cap = TestUtil.readValue(i.getBody(), RequestCapture.class); + var cap = TestUtil.readValue(i.getBody(), RequestCapture.class); cap.assertParam("foo", "bar"); } @Test void canGetBinaryResponseAsync() throws Exception { - CompletableFuture> r = Unirest.get(MockServer.GET) + var r = Unirest.get(MockServer.GET) .queryString("foo", "bar") .asStringAsync(); - RequestCapture cap = TestUtil.readValue(r.get().getBody(), RequestCapture.class); + var cap = TestUtil.readValue(r.get().getBody(), RequestCapture.class); cap.assertParam("foo", "bar"); } @@ -131,7 +133,7 @@ void unicodeResponseAsync() throws Exception { @Test @Disabled void canSetExpectedCharsetOfResponse() { - HttpResponse response = Unirest.get(MockServer.WINDOWS_LATIN_1_FILE) + var response = Unirest.get(MockServer.WINDOWS_LATIN_1_FILE) .responseEncoding("windows-1250") .asString(); @@ -143,7 +145,7 @@ void canSetExpectedCharsetOfResponse() { void canSetDefaultCharsetOfResponse() { Unirest.config().setDefaultResponseEncoding("windows-1250"); - HttpResponse response = Unirest.get(MockServer.WINDOWS_LATIN_1_FILE) + var response = Unirest.get(MockServer.WINDOWS_LATIN_1_FILE) .asString(); assertEquals(200, response.getStatus()); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/BodyLogSummaryTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/BodyLogSummaryTest.java index 39a9ce64..bd81ea42 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/BodyLogSummaryTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/BodyLogSummaryTest.java @@ -38,7 +38,7 @@ class BodyLogSummaryTest extends BddTest { @Test void forSimpleGets() { - String log = Unirest.get("http://somewhere/{magic}") + var log = Unirest.get("http://somewhere/{magic}") .routeParam("magic", "beans") .queryString("fruit", "apple") .header("Accept", "image/raw") @@ -52,7 +52,7 @@ void forSimpleGets() { @Test void forSimpleBodies() { - String log = Unirest.post("http://somewhere/{magic}") + var log = Unirest.post("http://somewhere/{magic}") .routeParam("magic", "beans") .queryString("fruit", "apple") .header("Accept", "image/raw") @@ -68,7 +68,7 @@ void forSimpleBodies() { @Test void forJsonBodies() { - String log = Unirest.post("http://somewhere/{magic}") + var log = Unirest.post("http://somewhere/{magic}") .routeParam("magic", "beans") .queryString("fruit", "apple") .header("Accept", "image/raw") @@ -84,7 +84,7 @@ void forJsonBodies() { @Test void forObjectBodies() { - String log = Unirest.post("http://somewhere/{magic}") + var log = Unirest.post("http://somewhere/{magic}") .routeParam("magic", "beans") .queryString("fruit", "apple") .header("Accept", "image/raw") @@ -100,7 +100,7 @@ void forObjectBodies() { @Test void simpleFormBody() { - String log = Unirest.post("http://somewhere/{magic}") + var log = Unirest.post("http://somewhere/{magic}") .routeParam("magic", "beans") .queryString("fruit", "apple") .header("Accept", "image/raw") @@ -117,8 +117,8 @@ void simpleFormBody() { @Test void multiPart() { - String boundary = "ABC-123-BOUNDARY"; - String body = Unirest.post(MockServer.ECHO_RAW) + var boundary = "ABC-123-BOUNDARY"; + var body = Unirest.post(MockServer.ECHO_RAW) .header("Accept", "image/raw") .field("band", "Talking Heads") .field("album", "77") diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/CachingAlternativeTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/CachingAlternativeTest.java index 47f9d202..6f8627c7 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/CachingAlternativeTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/CachingAlternativeTest.java @@ -42,7 +42,7 @@ class CachingAlternativeTest extends BddTest { @Test void canSupplyCustomCache() { - GuavaCache cache = new GuavaCache(); + var cache = new GuavaCache(); Unirest.config().cacheResponses(Cache.builder().backingCache(cache)); assertSame( @@ -79,7 +79,7 @@ void supplyCustomCacheKeyFunction() { assertEquals(1, MockServer.timesCalled); } - public static class GuavaCache implements Cache{ + public static class GuavaCache implements Cache { com.google.common.cache.Cache regular = CacheBuilder.newBuilder().build(); com.google.common.cache.Cache async = CacheBuilder.newBuilder().build(); @Override diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/CachingTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/CachingTest.java index 016ab82e..7d60bbbe 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/CachingTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/CachingTest.java @@ -54,8 +54,8 @@ void doesNotCacheByDefault() { void canCacheResponsesForEqualRequests() { Unirest.config().cacheResponses(true); - String r1 = Unirest.get(MockServer.GET).asObject(RequestCapture.class).getBody().requestId; - String r2 = Unirest.get(MockServer.GET).asObject(RequestCapture.class).getBody().requestId; + var r1 = Unirest.get(MockServer.GET).asObject(RequestCapture.class).getBody().requestId; + var r2 = Unirest.get(MockServer.GET).asObject(RequestCapture.class).getBody().requestId; assertEquals(1, MockServer.timesCalled); assertEquals(r1, r2); @@ -65,8 +65,8 @@ void canCacheResponsesForEqualRequests() { void canCacheResponsesForEqualRequests_async() throws Exception { Unirest.config().cacheResponses(true); - String r1 = Unirest.get(MockServer.GET).asObjectAsync(RequestCapture.class).get().getBody().requestId; - String r2 = Unirest.get(MockServer.GET).asObjectAsync(RequestCapture.class).get().getBody().requestId; + var r1 = Unirest.get(MockServer.GET).asObjectAsync(RequestCapture.class).get().getBody().requestId; + var r2 = Unirest.get(MockServer.GET).asObjectAsync(RequestCapture.class).get().getBody().requestId; assertEquals(1, MockServer.timesCalled); assertEquals(r1, r2); @@ -162,8 +162,8 @@ void doesNotCacheByDefault_json() { @Test void willCacheIfEnabled_json() { Unirest.config().cacheResponses(true); - HttpResponse response1 = Unirest.get(MockServer.GET).queryString(of("a",1)).asJson(); - HttpResponse response2 = Unirest.get(MockServer.GET).queryString(of("a",1)).asJson(); + var response1 = Unirest.get(MockServer.GET).queryString(of("a",1)).asJson(); + var response2 = Unirest.get(MockServer.GET).queryString(of("a",1)).asJson(); assertEquals( response1.getBody().getObject().getString("requestId"), diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/ConsumerTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/ConsumerTest.java index 70991287..2a94a00c 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/ConsumerTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/ConsumerTest.java @@ -37,8 +37,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; class ConsumerTest extends BddTest { @@ -84,7 +83,7 @@ void downloadAFileAsync() { while (!asyncDone){ System.out.print("."); } - assertEquals(null, error); + assertNull(error); assertEquals(200, status); assertTrue(test.toFile().exists()); } @@ -102,7 +101,7 @@ void downloadAFile() { } }); - assertEquals(null, error); + assertNull(error); assertEquals(200, status); assertTrue(test.toFile().exists()); } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/CookieTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/CookieTest.java index acfed1c8..a6638210 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/CookieTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/CookieTest.java @@ -93,7 +93,7 @@ void canGetCookiesFromTheResponse() { MockServer.expectCookie("JSESSIONID", "ABC123"); MockServer.expectCookie("color", "ruby"); - HttpResponse response = Unirest.get(MockServer.GET).asEmpty(); + var response = Unirest.get(MockServer.GET).asEmpty(); assertEquals("ABC123", response.getCookies().getNamed("JSESSIONID").getValue()); assertEquals("ruby", response.getCookies().getNamed("color").getValue()); @@ -103,7 +103,7 @@ void canGetCookiesFromTheResponse() { void canGetUnicode() { MockServer.expectCookie("nepali", "फनकी"); - HttpResponse response = Unirest.get(MockServer.GET).asEmpty(); + var response = Unirest.get(MockServer.GET).asEmpty(); assertEquals("फनकी", response.getCookies().getNamed("nepali").getUrlDecodedValue()); } @@ -112,7 +112,7 @@ void canGetUnicode() { void canGetValuesWithBadCharacters() { MockServer.expectCookie("odd", "1=2;3=4"); - HttpResponse response = Unirest.get(MockServer.GET).asEmpty(); + var response = Unirest.get(MockServer.GET).asEmpty(); assertEquals("1=2;3=4", response.getCookies().getNamed("odd").getUrlDecodedValue()); } @@ -121,7 +121,7 @@ void canGetValuesWithBadCharacters() { void complicatedCookies(){ expectCoookie(42); - HttpResponse response = Unirest.get(MockServer.GET).asEmpty(); + var response = Unirest.get(MockServer.GET).asEmpty(); Cookie back = response.getCookies().getNamed("color"); assertEquals("blue", back.getValue()); @@ -135,18 +135,18 @@ void complicatedCookies(){ @Test void cookieLifeCycle() { expectCoookie(42); - HttpResponse r1 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); + var r1 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); assertNotNull(r1.getCookies().getNamed("color")); MockServer.clearCookies(); expectCoookie(0); - HttpResponse r2 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); + var r2 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); assertNotNull(r1.getCookies().getNamed("color")); r2.getBody().assertCookie("color", "blue"); MockServer.clearCookies(); - HttpResponse r3 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); + var r3 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); r3.getBody().assertNoCookie("color"); } @@ -175,13 +175,13 @@ void canTurnOffCookieManagement() { void doubleQuotedValues() { MockServer.expectCookie(new io.javalin.http.Cookie("foo", "\"bar\"")); - HttpResponse res = Unirest.get(MockServer.GET) + var res = Unirest.get(MockServer.GET) .cookie("baz", "\" wut \"") .asObject(RequestCapture.class); res.getBody().assertCookie("baz", " wut "); - Cookie cookie = res + var cookie = res .getCookies() .getNamed("foo"); @@ -219,7 +219,7 @@ void stringCookieParsing() { // We make a request and the cookie is returned and we have the cookie // It should now be in our store - HttpResponse r1 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); + var r1 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); assertNotNull(r1.getCookies().getNamed("color")); } @@ -228,14 +228,16 @@ void stringCookieParsing() { void newAgeCookies() { Unirest.config().cookieSpec("standard"); MockServer.addResponseHeader("Set-Cookie", "cookie_name=blah;Max-Age=86400;Expires=Wed, 9 Dec 2220 20:26:05 GMT;Path=/;Domain=localhost;HTTPOnly"); - HttpResponse response = Unirest.get(MockServer.GET).asObject(RequestCapture.class); + + var response = Unirest.get(MockServer.GET).asObject(RequestCapture.class); assertNotNull(response.getCookies().getNamed("cookie_name")); - HttpResponse r2 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); + + var r2 = Unirest.get(MockServer.GET).asObject(RequestCapture.class); r2.getBody().assertCookie("cookie_name","blah"); } private String getCookieValue(ZonedDateTime dt) { - String date = dt.format(DateTimeFormatter.ofPattern("EEE, dd-MMM-yyyy HH:mm:ss zzz")); + var date = dt.format(DateTimeFormatter.ofPattern("EEE, dd-MMM-yyyy HH:mm:ss zzz")); return String.format("color=blue; Path=/get; Max-Age=6000; Domain=localhost; Expires=%s; HttpOnly", date); } } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/CustomClientTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/CustomClientTest.java index 22367be8..fd9579d4 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/CustomClientTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/CustomClientTest.java @@ -25,7 +25,6 @@ package BehaviorTests; - import kong.unirest.core.Client; import kong.unirest.core.HttpRequest; import kong.unirest.core.HttpResponse; @@ -43,9 +42,9 @@ class CustomClientTest extends BddTest { @Test void settingACustomClient() { - Client client = mock(Client.class);; + var client = mock(Client.class);; - HttpResponse mock = mock(HttpResponse.class); + var mock = mock(HttpResponse.class); when(client.request(any(HttpRequest.class), any(Function.class), any(Class.class))).thenReturn(mock); @@ -53,6 +52,4 @@ void settingACustomClient() { assertEquals(mock, Unirest.get("http://localhost/getme").asEmpty()); } - - } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/ErrorParsingTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/ErrorParsingTest.java index 51d78ea3..cb5825d3 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/ErrorParsingTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/ErrorParsingTest.java @@ -58,7 +58,7 @@ void passParsingErrorsOnInFalure() { void parsingAnAlternativeErrorObject() { MockServer.setJsonAsResponse(new ErrorThing("boom!")); - ErrorThing e = Unirest.get(MockServer.ERROR_RESPONSE) + var e = Unirest.get(MockServer.ERROR_RESPONSE) .asObject(RequestCapture.class) .mapError(ErrorThing.class); @@ -69,7 +69,7 @@ void parsingAnAlternativeErrorObject() { void mapTheErrorToAString() { MockServer.setJsonAsResponse(new ErrorThing("boom!")); - String e = Unirest.get(MockServer.ERROR_RESPONSE) + var e = Unirest.get(MockServer.ERROR_RESPONSE) .asObject(RequestCapture.class) .mapError(String.class); @@ -80,7 +80,7 @@ void mapTheErrorToAString() { void parsingAnAlternativeErrorObject_StringBody() { MockServer.setJsonAsResponse(new ErrorThing("boom!")); - ErrorThing e = Unirest.get(MockServer.ERROR_RESPONSE) + var e = Unirest.get(MockServer.ERROR_RESPONSE) .asString() .mapError(ErrorThing.class); @@ -91,7 +91,7 @@ void parsingAnAlternativeErrorObject_StringBody() { void parsingAnAlternativeErrorObject_JsonBody() { MockServer.setJsonAsResponse(new ErrorThing("boom!")); - ErrorThing e = Unirest.get(MockServer.ERROR_RESPONSE) + var e = Unirest.get(MockServer.ERROR_RESPONSE) .asJson() .mapError(ErrorThing.class); @@ -100,7 +100,7 @@ void parsingAnAlternativeErrorObject_JsonBody() { @Test void ifNoErrorThenGetTheRegularBody() { - ErrorThing error = Unirest.get(MockServer.GET) + var error = Unirest.get(MockServer.GET) .asObject(RequestCapture.class) .mapError(ErrorThing.class); @@ -109,17 +109,17 @@ void ifNoErrorThenGetTheRegularBody() { @Test void failsIfErrorResponseCantBeMapped() { - JacksonObjectMapper om = new JacksonObjectMapper(); + var om = new JacksonObjectMapper(); om.om.configure(JsonGenerator.Feature.IGNORE_UNKNOWN, false); om.om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true); MockServer.setJsonAsResponse(new ErrorThing("boom!")); - HttpResponse request = Unirest.get(MockServer.ERROR_RESPONSE) + var request = Unirest.get(MockServer.ERROR_RESPONSE) .withObjectMapper(om) .asObject(RequestCapture.class); - NotTheError error = request.mapError(NotTheError.class); + var error = request.mapError(NotTheError.class); assertNull(error.merp); assertEquals("{\"message\":\"boom!\"}", request.getParsingError().get().getOriginalBody()); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/ExecutorTests.java b/unirest-bdd-tests/src/test/java/BehaviorTests/ExecutorTests.java index 0a7c7154..7fa53790 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/ExecutorTests.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/ExecutorTests.java @@ -36,7 +36,7 @@ public class ExecutorTests extends BddTest { @Test void canSetCustomExecutor() { - CustomExecutor executor = new CustomExecutor(); + var executor = new CustomExecutor(); Unirest.config().executor(executor); Unirest.get(MockServer.GET).asEmpty(); assertTrue(executor.wasUsed); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/GenericMappingTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/GenericMappingTest.java index b5b7abb1..d1fca382 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/GenericMappingTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/GenericMappingTest.java @@ -47,7 +47,7 @@ void canMapTheEntireResponseIntoAnotherResponse() { MockServer.setStringResponse("123456"); MockServer.addResponseHeader("cheese","cheddar"); - HttpResponse response = Unirest.get(MockServer.GET) + var response = Unirest.get(MockServer.GET) .asString() .map(Integer::valueOf); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAsserts.java b/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAsserts.java index 017f6d2e..a3aec7b6 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAsserts.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAsserts.java @@ -60,47 +60,53 @@ public void assertNoHeader(String s) { assertFalse(headers.containsKey(s), "Should Have No Header " + s); } - public void assertHeader(String key, String... value) { + public HeaderAsserts assertHeader(String key, String... value) { TestUtil.assertMultiMap(headers).containsKeys(key); assertThat(headers.get(key)) .extracting(HeaderValue::getValue) .contains(value); + return this; } - public void assertBasicAuth(String username, String password) { + public HeaderAsserts assertBasicAuth(String username, String password) { TestUtil.assertMultiMap(headers).containsKeys("Authorization"); var value = headers.get("Authorization").get(0); assertThat(value.getValue()).as("Missing value scope of Basic").contains("Basic "); String decoded = new String(Base64.getDecoder().decode(value.getValue().replace("Basic ", ""))); assertThat(decoded).isEqualTo(username + ":" + password); + return this; } - public void assertHeaderSize(String name, int size) { + public HeaderAsserts assertHeaderSize(String name, int size) { assertEquals(size, headers.get(name).size()); + return this; } - public void assertMultiPartContentType() { - List h = headers.get("Content-Type"); + public HeaderAsserts assertMultiPartContentType() { + var h = headers.get("Content-Type"); assertEquals(1, h.size(), "Expected exactly 1 Content-Type header"); - HeaderValue value = h.get(0); + var value = h.get(0); value.assertMainValue("multipart/form-data"); value.assertHasParam("boundary"); value.assertParam("charset", "UTF-8"); + return this; } - public void assertHeaderWithParam(String headerKey, String headerValue, String paramKey, String paramValue) { + public HeaderAsserts assertHeaderWithParam(String headerKey, String headerValue, String paramKey, String paramValue) { TestUtil.assertMultiMap(headers).containsKeys(headerKey); var value = headers.get(headerKey).get(0); value.assertMainValue(headerValue); value.assertParam(paramKey, paramValue); + return this; } - public void assertRawValue(String key, String value) { + public HeaderAsserts assertRawValue(String key, String value) { assertThat(headers.get(key)) .isNotEmpty() .extracting(HeaderValue::rawValue) .contains(value); + return this; } public HeaderValue getFirst(String name) { diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAssertsTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAssertsTest.java index 5c5e2357..b72febcc 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAssertsTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderAssertsTest.java @@ -33,8 +33,8 @@ class HeaderAssertsTest { @Test void canAssertHeaderWithParts() { - HeaderAsserts a = new HeaderAsserts(Map.of("foo", "bar; baz=qux; zip=zap;;")); - a.assertHeader("foo", "bar"); - a.assertHeaderWithParam("foo", "bar", "baz", "qux"); + new HeaderAsserts(Map.of("foo", "bar; baz=qux; zip=zap;;")) + .assertHeader("foo", "bar") + .assertHeaderWithParam("foo", "bar", "baz", "qux"); } } \ No newline at end of file diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderTest.java index 414f95f6..c844fcaf 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/HeaderTest.java @@ -84,7 +84,7 @@ void testDefaultHeaders() { Unirest.config().setDefaultHeader("X-Custom-Header", "hello"); Unirest.config().setDefaultHeader("user-agent", "foobar"); - HttpResponse jsonResponse = Unirest.get(MockServer.GET).asJson(); + var jsonResponse = Unirest.get(MockServer.GET).asJson(); parse(jsonResponse) .assertHeader("X-Custom-Header", "hello") @@ -104,7 +104,7 @@ void testDefaultHeaders() { @Test void testCaseInsensitiveHeaders() { - GetRequest request = Unirest.get(MockServer.GET) + var request = Unirest.get(MockServer.GET) .header("Name", "Marco"); assertEquals(1, request.getHeaders().size()); @@ -256,7 +256,7 @@ void doesNotCacheAuthAcrossDomains(){ .getBody() .assertBasicAuth("user1","pass1"); - JsonNode bin = Unirest.post("http://httpbin.org/post") + var bin = Unirest.post("http://httpbin.org/post") .basicAuth("user2", "pass2") .asJson() .getBody(); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/HostsHeaderTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/HostsHeaderTest.java index c3aa06dd..111a7b24 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/HostsHeaderTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/HostsHeaderTest.java @@ -31,6 +31,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -67,15 +68,14 @@ void willHonorHostsHeaders() { @Test void cannotNormallyOverrideHost() { - Exception ex = assertThrows(UnirestException.class, - () -> Unirest.get(MockServer.ALTGET) - .header("Host", "localhost").asEmpty()); - assertEquals("restricted header name: \"Host\"", ex.getCause().getMessage()); + assertThatThrownBy(() -> Unirest.get(MockServer.ALTGET).header("Host", "localhost").asEmpty()) + .isInstanceOf(UnirestException.class) + .hasRootCauseMessage("restricted header name: \"Host\""); } @Test @Disabled void canBuildCustomHost() { - HttpResponse s = Unirest.get("https://104.154.89.105/") + var s = Unirest.get("https://104.154.89.105/") .header("Host", "sha512.badssl.com") .asString(); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/InterceptorTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/InterceptorTest.java index 6213340f..25c193ab 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/InterceptorTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/InterceptorTest.java @@ -92,7 +92,7 @@ void canReturnEmptyResultRatherThanThrow() throws Exception { Unirest.config().httpClient(TestUtil.getFailureClient()).interceptor(interceptor); interceptor.failResponse = true; - HttpResponse response = Unirest.get(MockServer.GET).asString(); + var response = Unirest.get(MockServer.GET).asString(); assertEquals(542, response.getStatus()); assertEquals("Something horrible happened", response.getStatusText()); @@ -105,14 +105,14 @@ void totalAsyncFailure_Recovery() throws Exception { .httpClient(TestUtil.getFailureAsyncClient()) .interceptor(interceptor); - HttpResponse response = Unirest.get(MockServer.GET).asStringAsync().get(); + var response = Unirest.get(MockServer.GET).asStringAsync().get(); assertEquals(542, response.getStatus()); } @Test void loggingBodyPartsExample() { - final Set values = new HashSet<>(); + var values = new HashSet<>(); Unirest.config().interceptor(new Interceptor() { @Override public void onRequest(HttpRequest request, Config config) { diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/JacksonObjectMapperTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/JacksonObjectMapperTest.java index 3e1d6988..f1bbc923 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/JacksonObjectMapperTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/JacksonObjectMapperTest.java @@ -37,7 +37,7 @@ class JacksonObjectMapperTest { @Test void jsonPatch() throws JSONException { - JsonPatch patch = new JsonPatch(); + var patch = new JsonPatch(); patch.add("/foo", "bar"); patch.add("/baz", "qux"); @@ -51,11 +51,11 @@ void jsonPatch() throws JSONException { @Test void jsonPatchInRequestCapture() throws JSONException { - JsonPatch patch = new JsonPatch(); + var patch = new JsonPatch(); patch.add("/foo", "bar"); patch.add("/baz", "qux"); - RequestCapture rc = new RequestCapture(); + var rc = new RequestCapture(); rc.setPatch(patch); String actualStr = om.writeValue(rc); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/JsonPatchTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/JsonPatchTest.java index 54a66c96..9b4b2f1f 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/JsonPatchTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/JsonPatchTest.java @@ -151,7 +151,7 @@ void thatsSomeValidJson() throws Exception { .getBody() .body; - String expected = TestUtil.getResource("test-json-patch.json"); + var expected = TestUtil.getResource("test-json-patch.json"); JSONAssert.assertEquals(expected, patch, true); } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/MetricsTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/MetricsTest.java index 071506ee..ad1b15aa 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/MetricsTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/MetricsTest.java @@ -35,12 +35,13 @@ import java.util.function.Function; import static BehaviorTests.MockServer.*; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.*; class MetricsTest extends BddTest { @Test void canSetAMetricObjectToInstramentUnirest() { - MyMetric metric = configureMetric(); + var metric = configureMetric(); Unirest.get(GET).asEmpty(); Unirest.get(GET).asEmpty(); @@ -55,7 +56,7 @@ void canSetAMetricObjectToInstramentUnirest() { @Test void canGetParamedUrlInSummary() { - MyMetric metric = configureMetric(HttpRequestSummary::getRawPath); + var metric = configureMetric(HttpRequestSummary::getRawPath); Unirest.get(PASSED_PATH_PARAM) .routeParam("params", "foo") @@ -67,7 +68,7 @@ void canGetParamedUrlInSummary() { @Test void canGetToMethod() { - MyMetric metric = configureMetric(s -> s.getHttpMethod().name()); + var metric = configureMetric(s -> s.getHttpMethod().name()); Unirest.get(GET).asEmpty(); Unirest.get(GET).asEmpty(); @@ -80,7 +81,7 @@ void canGetToMethod() { @Test void amountOfTimeBetweenRequestAndResponseDoesNotIncludeDeserialization() { - MyMetric metric = configureMetric(); + var metric = configureMetric(); Unirest.get(GET).asObject(r -> { assertEquals(1, metric.routes.get(GET).size()); @@ -90,7 +91,7 @@ void amountOfTimeBetweenRequestAndResponseDoesNotIncludeDeserialization() { @Test void canGetInformationOnStatus() { - MyMetric metric = configureMetric(HttpRequestSummary::getUrl); + var metric = configureMetric(HttpRequestSummary::getUrl); Unirest.get(GET).asEmpty(); Unirest.get(REDIRECT).asEmpty(); @@ -104,7 +105,7 @@ void canGetInformationOnStatus() { @Test void metricsOnAsyncRequests() throws Exception { - MyMetric metric = configureMetric(); + var metric = configureMetric(); Unirest.get(GET).asEmptyAsync().get(); @@ -113,7 +114,7 @@ void metricsOnAsyncRequests() throws Exception { @Test void metricsOnAsyncMethodsWithCallbacks() { - MyMetric metric = configureMetric(); + var metric = configureMetric(); Unirest.get(GET).asEmptyAsync(r -> asyncSuccess()); @@ -123,14 +124,10 @@ void metricsOnAsyncMethodsWithCallbacks() { @Test void errorHandling() throws Exception { - MyMetric metric = new MyMetric(HttpRequestSummary::getUrl); + var metric = new MyMetric(HttpRequestSummary::getUrl); Unirest.config().reset().httpClient(TestUtil.getFailureClient()).instrumentWith(metric); - try { - Unirest.get(GET).asEmpty(); - }catch (Exception e){ - - } + assertThatThrownBy(() -> Unirest.get(GET).asEmpty()); assertEquals("Something horrible happened", metric.routes.get(GET).get(0).e.getMessage()); } @@ -139,6 +136,7 @@ void errorHandling() throws Exception { void errorHandling_async() throws Exception { MyMetric metric = configureMetric(); + try { Unirest.get("http://localhost:0000").asEmptyAsync().get(); }catch (Exception e){ @@ -166,7 +164,7 @@ void metricAsALambda() { @Test void showWhatJavalinDoes() { - HashMap map = Unirest.get(JAVALIN) + var map = Unirest.get(JAVALIN) .routeParam("spark", "joy") .queryString("food", "hamberders") .queryString("colour", "red") @@ -186,7 +184,7 @@ private MyMetric configureMetric() { } private MyMetric configureMetric(Function keyFunction) { - MyMetric metric = new MyMetric(keyFunction); + var metric = new MyMetric(keyFunction); Unirest.config().followRedirects(false).instrumentWith(metric); return metric; } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/MultiPartFormPostingTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/MultiPartFormPostingTest.java index 88cfced2..dac7c7fd 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/MultiPartFormPostingTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/MultiPartFormPostingTest.java @@ -42,7 +42,7 @@ class MultiPartFormPostingTest extends BddTest { @Test - void testMultipart() throws Exception { + void testMultipart() { Unirest.post(MockServer.POST) .field("name", "Mark") .field("funky", "bunch") @@ -58,8 +58,8 @@ void testMultipart() throws Exception { @Test void fileSizeDoesntChange() throws Exception { - File file = rezFile("/image.jpg"); - long size = file.length(); + var file = rezFile("/image.jpg"); + var size = file.length(); RequestCapture capture = Unirest.post(MockServer.POST) .field("file", file) @@ -87,7 +87,7 @@ void testMultipartContentType() { @Test void canSendRawInputStreamsWithoutAFileName() throws Exception { - FileInputStream stream = new FileInputStream(rezFile("/test.txt")); + var stream = new FileInputStream(rezFile("/test.txt")); Unirest.post(MockServer.POST) .field("file", stream) @@ -98,7 +98,7 @@ void canSendRawInputStreamsWithoutAFileName() throws Exception { @Test void multipleFiles_sameField() { - RequestCapture body = Unirest.post(MockServer.POST) + var body = Unirest.post(MockServer.POST) .field("file", rezFile("/image.jpg")) .field("file", rezFile("/spidey.jpg")) .asObject(RequestCapture.class) @@ -143,7 +143,7 @@ void testMultipartInputStreamContentTypeAsync() throws Exception { @Test void testMultipartByteContentType() throws Exception { - final byte[] bytes = getFileBytes("/image.jpg"); + var bytes = getFileBytes("/image.jpg"); Unirest.post(MockServer.POST) .field("boot", "boot") @@ -157,7 +157,7 @@ void testMultipartByteContentType() throws Exception { @Test void testMultipartByteContentTypeAsync() throws Exception { - final byte[] bytes = getFileBytes("/test.txt"); + var bytes = getFileBytes("/test.txt"); Unirest.post(MockServer.POST) .field("name", "Mark") @@ -175,7 +175,7 @@ void testMultipartByteContentTypeAsync() throws Exception { @Test - void testMultipartAsync() throws Exception { + void testMultipartAsync() { Unirest.post(MockServer.POST) .field("name", "Mark") .field("file", rezFile("/test.txt")) @@ -193,8 +193,8 @@ void testMultipartAsync() throws Exception { @Test void utf8FileNames() { - InputStream fileData = new ByteArrayInputStream(new byte[]{'t', 'e', 's', 't'}); - final String filename = "fileäöü.pöf"; + var fileData = new ByteArrayInputStream(new byte[]{'t', 'e', 's', 't'}); + var filename = "fileäöü.pöf"; Unirest.post(MockServer.POST) .field("file", fileData, filename) @@ -217,8 +217,8 @@ void simpleMultiPart() { @Test void canSetModeToStrictForLegacySupport() { - InputStream fileData = new ByteArrayInputStream(new byte[]{'t', 'e', 's', 't'}); - final String filename = "fileäöü.pöf"; + var fileData = new ByteArrayInputStream(new byte[]{'t', 'e', 's', 't'}); + var filename = "fileäöü.pöf"; Unirest.post(MockServer.POST) .field("file", fileData, filename) @@ -232,7 +232,7 @@ void canSetModeToStrictForLegacySupport() { @Test void canPostInputStreamWithContentType() throws Exception { - File file = TestUtil.getImageFile(); + var file = TestUtil.getImageFile(); Unirest.post(MockServer.POST) .field("testfile", new FileInputStream(file), ContentType.IMAGE_JPEG, "image.jpg") .asObject(RequestCapture.class) @@ -245,7 +245,7 @@ void canPostInputStreamWithContentType() throws Exception { @Test void canPostInputStream() throws Exception { - File file = TestUtil.getImageFile(); + var file = TestUtil.getImageFile(); Unirest.post(MockServer.POST) .field("testfile", new FileInputStream(file), "image.jpg") .asObject(RequestCapture.class) @@ -258,7 +258,7 @@ void canPostInputStream() throws Exception { @Test void postFieldsAsMap() throws URISyntaxException { - File file = TestUtil.getImageFile(); + var file = TestUtil.getImageFile(); Unirest.post(MockServer.POST) .fields(TestUtil.mapOf("big", "bird", "charlie", 42, "testfile", file, "gonzo", null)) @@ -274,7 +274,7 @@ void postFieldsAsMap() throws URISyntaxException { @Test void postFileWithoutContentType() { - File file = TestUtil.getImageFile(); + var file = TestUtil.getImageFile(); Unirest.post(MockServer.POST) .field("testfile", file) .asObject(RequestCapture.class) @@ -286,7 +286,7 @@ void postFileWithoutContentType() { @Test void postFileWithContentType() { - File file = TestUtil.getImageFile(); + var file = TestUtil.getImageFile(); Unirest.post(MockServer.POST) .field("testfile", file, ContentType.IMAGE_JPEG.getMimeType()) .asObject(RequestCapture.class) @@ -312,7 +312,7 @@ void multiPartInputStreamAsFile() throws FileNotFoundException { @Test void testPostMulipleFIles() { - RequestCapture cap = Unirest.post(MockServer.POST) + var cap = Unirest.post(MockServer.POST) .field("name", asList(rezFile("/test.txt"), rezFile("/test2.txt"))) .asObject(RequestCapture.class) .getBody() @@ -408,16 +408,16 @@ void canForceIntoMultiPart() { @Test void rawInspection() { - String body = Unirest.post(MockServer.ECHO_RAW) + var body = Unirest.post(MockServer.ECHO_RAW) .field("marky", "mark") .field("funky", "bunch") .field("file", rezFile("/test.txt")) .asString() .getBody(); - String expected = TestUtil.getResource("rawPost.txt").replaceAll("\r", "").trim(); + var expected = TestUtil.getResource("rawPost.txt").replaceAll("\r", "").trim(); - String id = body.substring(2, body.indexOf("\n") - 1); + var id = body.substring(2, body.indexOf("\n") - 1); body = body.replaceAll(id, "IDENTIFIER").replaceAll("\r", "").trim(); assertEquals(expected, body); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/ObjectFunctionalTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/ObjectFunctionalTest.java index e259614f..7dd4ee14 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/ObjectFunctionalTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/ObjectFunctionalTest.java @@ -45,7 +45,7 @@ class ObjectFunctionalTest extends BddTest { void canUseAFunctionToTransform() { MockServer.setJsonAsResponse(of("foo", "bar")); - Map r = Unirest.get(MockServer.GET) + var r = Unirest.get(MockServer.GET) .asObject(i -> gson.fromJson(i.getContentReader(), HashMap.class)) .getBody(); @@ -56,7 +56,7 @@ void canUseAFunctionToTransform() { void canUseAFunctionToTransformAsync() throws Exception { MockServer.setJsonAsResponse(of("foo", "bar")); - Map r = Unirest.get(MockServer.GET) + var r = Unirest.get(MockServer.GET) .asObjectAsync(i -> gson.fromJson(i.getContentReader(), HashMap.class)) .get() .getBody(); @@ -68,7 +68,7 @@ void canUseAFunctionToTransformAsync() throws Exception { void willNotStopForParsingExceptions() { MockServer.setStringResponse("call me ishmael"); - RuntimeException ohNoes = new RuntimeException("oh noes"); + var ohNoes = new RuntimeException("oh noes"); HttpResponse r = Unirest.get(MockServer.GET) .asObject(i -> { @@ -85,9 +85,9 @@ void willNotStopForParsingExceptions() { void willNotStopForParsingExceptions_async() throws Exception { MockServer.setStringResponse("call me ishmael"); - RuntimeException ohNoes = new RuntimeException("oh noes"); + var ohNoes = new RuntimeException("oh noes"); - HttpResponse r = Unirest.get(MockServer.GET) + var r = Unirest.get(MockServer.GET) .asObjectAsync(i -> { throw ohNoes; }).get(); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/PathParamTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/PathParamTest.java index 24d98920..e4dd7e37 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/PathParamTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/PathParamTest.java @@ -41,7 +41,7 @@ class PathParamTest extends BddTest { @Test void canAddRouteParamsAsMap() { - String param = "Hamberders"; + var param = "Hamberders"; Unirest.get(MockServer.PASSED_PATH_PARAM_MULTI) .routeParam(ImmutableMap.of("params", param, "another", 42)) @@ -68,7 +68,7 @@ void specialCharactersInTheDirectoryPath() { @Test void properlyDealsWithPlusInPAth() { - String param = "jack+4@email.com"; + var param = "jack+4@email.com"; Unirest.get(MockServer.PASSED_PATH_PARAM) .routeParam("params", param) @@ -131,7 +131,7 @@ void testMissingPathParameterValue() { @Test void illigalPathParams() { - String value = "/?ЊЯЯ"; + var value = "/?ЊЯЯ"; Unirest.get(MockServer.PASSED_PATH_PARAM) .routeParam("params", value) @@ -143,7 +143,7 @@ void illigalPathParams() { @Test void spacesAndPluses() { - String value = "Hunky Dory+Cheese Wiz"; + var value = "Hunky Dory+Cheese Wiz"; Unirest.get(MockServer.PASSED_PATH_PARAM) .routeParam("params", value) @@ -165,7 +165,7 @@ void nulls() { @Test void getRequestSummaryOnResponse() { - HttpRequestSummary sum = Unirest.get(MockServer.PASSED_PATH_PARAM) + var sum = Unirest.get(MockServer.PASSED_PATH_PARAM) .routeParam("params", "cheese") .queryString("fruit", "apples") .asEmpty() @@ -178,7 +178,7 @@ void getRequestSummaryOnResponse() { @Test void getRequestSummaryOnResponse_async() throws Exception { - HttpRequestSummary sum = Unirest.get(MockServer.PASSED_PATH_PARAM) + var sum = Unirest.get(MockServer.PASSED_PATH_PARAM) .routeParam("params", "cheese") .queryString("fruit", "apples") .asEmptyAsync() diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/PostRequestHandlersTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/PostRequestHandlersTest.java index 2d61a745..aa4a3e1a 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/PostRequestHandlersTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/PostRequestHandlersTest.java @@ -85,24 +85,9 @@ void itsAFailIfTheMapperFails() { assertEquals("not what you expect", captured.getParsingError().get().getOriginalBody()); } - - - private static class Error implements Consumer> { - - public HttpResponse httpResponse; - - @Override - public void accept(HttpResponse httpResponse) { - - this.httpResponse = httpResponse; - } - } - - - @Test void onSuccessBeSuccessful() { - HttpResponse response = Unirest.get(MockServer.GET) + var response = Unirest.get(MockServer.GET) .queryString("foo", "bar") .asObject(RequestCapture.class); @@ -111,7 +96,7 @@ void onSuccessBeSuccessful() { @Test void onFailBeUnsuccessful() { - HttpResponse response = Unirest.get(MockServer.INVALID_REQUEST) + var response = Unirest.get(MockServer.INVALID_REQUEST) .queryString("foo", "bar") .asObject(RequestCapture.class); @@ -122,7 +107,7 @@ void onFailBeUnsuccessful() { void beUnsuccessfulIfTheMapperFails() { MockServer.setStringResponse("not what you expect"); - HttpResponse response = Unirest.get(MockServer.GET) + var response = Unirest.get(MockServer.GET) .queryString("foo", "bar") .asObject(RequestCapture.class); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/QueryStringTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/QueryStringTest.java index b6e44892..408a1597 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/QueryStringTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/QueryStringTest.java @@ -92,15 +92,15 @@ void testGetUTF8() { @Test void testGetMultiple() { for (int i = 1; i <= 20; i++) { - HttpResponse response = Unirest.get(MockServer.GET + "?try=" + i).asJson(); + var response = Unirest.get(MockServer.GET + "?try=" + i).asJson(); parse(response).assertParam("try", String.valueOf(i)); } } @Test void testQueryStringEncoding() { - String testKey = "email2=someKey&email"; - String testValue = "hello@hello.com"; + var testKey = "email2=someKey&email"; + var testValue = "hello@hello.com"; Unirest.get(MockServer.GET) .queryString(testKey, testValue) diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/RedirectHandlingTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/RedirectHandlingTest.java index 844cd328..a08f8d40 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/RedirectHandlingTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/RedirectHandlingTest.java @@ -55,7 +55,7 @@ void redirectOnPost() { @Test void canDisableRedirects(){ Unirest.config().followRedirects(false); - HttpResponse response = Unirest.get(MockServer.REDIRECT).asEmpty(); + var response = Unirest.get(MockServer.REDIRECT).asEmpty(); assertEquals(301, response.getStatus()); } @@ -72,7 +72,7 @@ void willFollowRedirectsByDefaultAsync() throws ExecutionException, InterruptedE @Test void canDisableRedirectsAsync() throws Exception { Unirest.config().followRedirects(false); - HttpResponse response = Unirest.get(MockServer.REDIRECT).asEmptyAsync().get(); + var response = Unirest.get(MockServer.REDIRECT).asEmptyAsync().get(); assertEquals(301, response.getStatus()); } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/RequestCapture.java b/unirest-bdd-tests/src/test/java/BehaviorTests/RequestCapture.java index 829cfaca..ca9ca574 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/RequestCapture.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/RequestCapture.java @@ -289,7 +289,6 @@ public RequestCapture assertContentType(String content, String paramKey, String return this; } - public RequestCapture assertMultiPartContentType() { headers.assertMultiPartContentType(); return this; diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/ResponseHeaderTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/ResponseHeaderTest.java index 3bdf0f62..a3fa30ba 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/ResponseHeaderTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/ResponseHeaderTest.java @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; class ResponseHeaderTest extends BddTest { @@ -60,10 +61,10 @@ void multipleHeaders() { MockServer.addResponseHeader("fruit", "apples"); MockServer.addResponseHeader("fruit", "grapes"); - Headers h = Unirest.get(MockServer.GET).asString().getHeaders(); + var h = Unirest.get(MockServer.GET).asString().getHeaders(); - List headers = h.get("fruit"); - assertEquals(3, headers.size()); - assertEquals(Arrays.asList("oranges","apples","grapes"), headers); + assertThat(h.get("fruit")) + .hasSize(3) + .containsExactlyInAnyOrder("oranges","apples","grapes"); } } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/RetryAsyncTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/RetryAsyncTest.java index e35d80f1..69f61059 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/RetryAsyncTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/RetryAsyncTest.java @@ -84,34 +84,34 @@ void willRetryAfterSeconds_AsObject() { @Test void willRetryAfterSeconds_AsObjectGenerics() { - List o = Arrays.asList( + var o = Arrays.asList( new Foo("foo"), new Foo("bar"), new Foo("baz") ); MockServer.setJsonAsResponse(o); - List cap = (List)this.doWithRetry(r -> r.asObjectAsync(new GenericType>(){})); + var cap = (List)this.doWithRetry(r -> r.asObjectAsync(new GenericType>(){})); assertEquals(o, cap); } @Test void willRetryAfterSeconds_AsString() { MockServer.setStringResponse("Hi Mom"); - String cap = this.doWithRetry(r -> r.asStringAsync()); + var cap = this.doWithRetry(r -> r.asStringAsync()); assertEquals("Hi Mom", cap); } @Test void willRetryAfterSeconds_AsJson() { MockServer.setStringResponse("{\"message\": \"Hi Mom\"}"); - JsonNode cap = this.doWithRetry(r -> r.asJsonAsync()); + var cap = this.doWithRetry(r -> r.asJsonAsync()); assertEquals("Hi Mom", cap.getObject().getString("message")); } @Test void willRetryAfterSeconds_AsBytes() { MockServer.setStringResponse("Hi Mom"); - byte[] cap = this.doWithRetry(r -> r.asBytesAsync()); + var cap = this.doWithRetry(r -> r.asBytesAsync()); assertEquals("Hi Mom", new String(cap)); } @@ -122,11 +122,11 @@ void willRetryAfterSeconds_Empty() { @Test void willRetryAfterSeconds_AsFile() { - Path path = Paths.get("results.json"); + var path = Paths.get("results.json"); clearFile(path); MockServer.setStringResponse("Hi Mom"); - File cap = (File)this.doWithRetry(r -> r.asFileAsync(path.toString(), StandardCopyOption.REPLACE_EXISTING)); + var cap = (File)this.doWithRetry(r -> r.asFileAsync(path.toString(), StandardCopyOption.REPLACE_EXISTING)); assertTrue(cap.exists()); clearFile(path); @@ -137,7 +137,7 @@ void willReturn429OnceItExceedsMaxAttempts() { MockServer.retryTimes(10, 429, .01); Unirest.config().retryAfter(true, 3); - HttpResponse resp = Unirest.get(MockServer.GET).asEmpty(); + var resp = Unirest.get(MockServer.GET).asEmpty(); assertEquals(429, resp.getStatus()); MockServer.assertRequestCount(3); } @@ -160,9 +160,9 @@ private R doWithRetry(Function response = bodyExtractor.apply(request).get(); + var response = bodyExtractor.apply(request).get(); assertEquals(200, response.getStatus()); MockServer.assertRequestCount(2); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/RetryTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/RetryTest.java index d33a4e2c..b40ea3fc 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/RetryTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/RetryTest.java @@ -94,34 +94,34 @@ void willRetryAfterSeconds_AsObject() { @Test void willRetryAfterSeconds_AsObjectGenerics() { - List o = Arrays.asList( + var o = Arrays.asList( new Foo("foo"), new Foo("bar"), new Foo("baz") ); MockServer.setJsonAsResponse(o); - List cap = (List)this.doWithRetry(429, r -> r.asObject(new GenericType>(){})); + var cap = (List)this.doWithRetry(429, r -> r.asObject(new GenericType>(){})); assertEquals(o, cap); } @Test void willRetryAfterSeconds_AsString() { MockServer.setStringResponse("Hi Mom"); - String cap = this.doWithRetry(429, r -> r.asString()); + var cap = this.doWithRetry(429, r -> r.asString()); assertEquals("Hi Mom", cap); } @Test void willRetryAfterSeconds_AsJson() { MockServer.setStringResponse("{\"message\": \"Hi Mom\"}"); - JsonNode cap = this.doWithRetry(429, r -> r.asJson()); + var cap = this.doWithRetry(429, r -> r.asJson()); assertEquals("Hi Mom", cap.getObject().getString("message")); } @Test void willRetryAfterSeconds_AsBytes() { MockServer.setStringResponse("Hi Mom"); - byte[] cap = this.doWithRetry(429, r -> r.asBytes()); + var cap = this.doWithRetry(429, r -> r.asBytes()); assertEquals("Hi Mom", new String(cap)); } @@ -137,11 +137,11 @@ void willRetryOn503_Empty() { @Test void willRetryAfterSeconds_AsFile() { - Path path = Paths.get("results.json"); + var path = Paths.get("results.json"); clearFile(path); MockServer.setStringResponse("Hi Mom"); - File cap = this.doWithRetry(429, r -> r.asFile(path.toString(), StandardCopyOption.REPLACE_EXISTING)); + var cap = this.doWithRetry(429, r -> r.asFile(path.toString(), StandardCopyOption.REPLACE_EXISTING)); assertTrue(cap.exists()); clearFile(path); @@ -152,7 +152,7 @@ void willReturn429OnceItExceedsMaxAttempts() { MockServer.retryTimes(10, 429, .01); Unirest.config().retryAfter(true, 3); - HttpResponse resp = Unirest.get(MockServer.GET).asEmpty(); + var resp = Unirest.get(MockServer.GET).asEmpty(); assertEquals(429, resp.getStatus()); MockServer.assertRequestCount(3); } @@ -162,7 +162,7 @@ void canCustomizeRetrySignal() { MockServer.retryTimes(10, 429, .01); Unirest.config().retryAfter(true, 3); - HttpResponse resp = Unirest.get(MockServer.GET).asEmpty(); + var resp = Unirest.get(MockServer.GET).asEmpty(); assertEquals(429, resp.getStatus()); MockServer.assertRequestCount(3); } @@ -194,9 +194,9 @@ private void assertDidNotRetry() { private R doWithRetry(int status, Function> bodyExtractor) { MockServer.retryTimes(1, status, 0.01); - HttpRequest request = Unirest.get(MockServer.GET); + var request = Unirest.get(MockServer.GET); - HttpResponse response = bodyExtractor.apply(request); + var response = bodyExtractor.apply(request); assertEquals(200, response.getStatus()); MockServer.assertRequestCount(2); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/UniBodyPostingTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/UniBodyPostingTest.java index 582b17d3..ef10e4b6 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/UniBodyPostingTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/UniBodyPostingTest.java @@ -35,6 +35,7 @@ import java.nio.charset.StandardCharsets; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -95,8 +96,8 @@ void canSetCharsetOfBodyAfterMovingToBody(){ @Test void testPostRawBody() { - String sourceString = "'\"@こんにちは-test-123-" + Math.random(); - byte[] sentBytes = sourceString.getBytes(); + var sourceString = "'\"@こんにちは-test-123-" + Math.random(); + var sentBytes = sourceString.getBytes(); Unirest.post(MockServer.POST) .body(sentBytes) @@ -122,7 +123,7 @@ void testAsyncCustomContentType() { @Test void postAPojoObjectUsingTheMapper() { - GetResponse postResponseMock = new GetResponse(); + var postResponseMock = new GetResponse(); postResponseMock.setUrl(MockServer.POST); Unirest.post(postResponseMock.getUrl()) @@ -136,7 +137,7 @@ void postAPojoObjectUsingTheMapper() { @Test void testDeleteBody() { - String body = "{\"jsonString\":{\"members\":\"members1\"}}"; + var body = "{\"jsonString\":{\"members\":\"members1\"}}"; Unirest.delete(MockServer.DELETE) .body(body) .asObject(RequestCapture.class) @@ -146,7 +147,7 @@ void testDeleteBody() { @Test void postBodyAsJson() { - JSONObject body = new JSONObject(); + var body = new JSONObject(); body.put("krusty","krab"); Unirest.post(MockServer.POST) @@ -158,7 +159,7 @@ void postBodyAsJson() { @Test void postBodyAsJsonArray() { - JSONArray body = new JSONArray(); + var body = new JSONArray(); body.put(0, "krusty"); body.put(1, "krab"); @@ -171,7 +172,7 @@ void postBodyAsJsonArray() { @Test void postBodyAsJsonNode() { - JsonNode body = new JsonNode("{\"krusty\":\"krab\"}"); + var body = new JsonNode("{\"krusty\":\"krab\"}"); Unirest.post(MockServer.POST) .body(body) @@ -184,19 +185,20 @@ void postBodyAsJsonNode() { void cantPostObjectWithoutObjectMapper(){ Unirest.config().setObjectMapper(null); - UnirestConfigException ex = assertThrows(UnirestConfigException.class, () -> Unirest.post(MockServer.POST).body(new Foo("die"))); - assertEquals("No Object Mapper Configured. Please config one with Unirest.config().setObjectMapper", ex.getMessage()); + assertThatThrownBy(() -> Unirest.post(MockServer.POST).body(new Foo("die"))) + .isInstanceOf(UnirestConfigException.class) + .hasMessage("No Object Mapper Configured. Please config one with Unirest.config().setObjectMapper"); } @Test void theRequestBodyIsAString() { - RequestBodyEntity request = Unirest.post(MockServer.POST) + var request = Unirest.post(MockServer.POST) .basicAuth("foo", "bar") .header("Content-Type", "application/json") .queryString("foo", "bar") .body("{\"body\": \"sample\"}"); - Object value = request.getBody().get().uniPart().getValue(); + var value = request.getBody().get().uniPart().getValue(); assertEquals("{\"body\": \"sample\"}", value); } @@ -209,7 +211,7 @@ void stringPassedToObjectGetsPassedToString() { .queryString("foo", "bar") .body(body); - Object value = request.getBody().get().uniPart().getValue(); + var value = request.getBody().get().uniPart().getValue(); assertEquals("{\"body\": \"sample\"}", value); } @@ -222,7 +224,7 @@ void jsonNodePassedToObjectGetsPassedToString() { .queryString("foo", "bar") .body(body); - Object value = request.getBody().get().uniPart().getValue(); + var value = request.getBody().get().uniPart().getValue(); assertEquals("{\"body\":\"sample\"}", value); } @@ -235,7 +237,7 @@ void jsonObjectPassedToObjectGetsPassedToString() { .queryString("foo", "bar") .body(body); - Object value = request.getBody().get().uniPart().getValue(); + var value = request.getBody().get().uniPart().getValue(); assertEquals("{\"body\":\"sample\"}", value); } @@ -248,7 +250,7 @@ void jsonArrayPassedToObjectGetsPassedToString() { .queryString("foo", "bar") .body(body); - Object value = request.getBody().get().uniPart().getValue(); + var value = request.getBody().get().uniPart().getValue(); assertEquals("[\"body\",\"sample\"]", value); } diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/UploadProgressTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/UploadProgressTest.java index f3a9cf7c..1f754063 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/UploadProgressTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/UploadProgressTest.java @@ -98,7 +98,7 @@ void canUseWithInputStreamBody() throws Exception { } private void assertOtherFileUpload() { - TestMonitor.Stats stat = monitor.get("test.txt"); + var stat = monitor.get("test.txt"); assertEquals(1, stat.timesCalled); assertEquals(asList(19L), stat.progress); assertEquals(19L, stat.total); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/VerbTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/VerbTest.java index 9874d80b..c8bc08e3 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/VerbTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/VerbTest.java @@ -68,7 +68,7 @@ void patch() { @Test void head() { - HttpResponse response = Unirest.head(MockServer.GET).asEmpty(); + var response = Unirest.head(MockServer.GET).asEmpty(); assertEquals(200, response.getStatus()); assertEquals("text/plain;charset=utf-8", response.getHeaders().getFirst("Content-Type")); diff --git a/unirest-bdd-tests/src/test/java/BehaviorTests/WebsocketTest.java b/unirest-bdd-tests/src/test/java/BehaviorTests/WebsocketTest.java index 0f4084ce..1731dcf3 100644 --- a/unirest-bdd-tests/src/test/java/BehaviorTests/WebsocketTest.java +++ b/unirest-bdd-tests/src/test/java/BehaviorTests/WebsocketTest.java @@ -40,7 +40,7 @@ public class WebsocketTest extends BddTest { @Test void makeAWebSocket() throws Exception { - TheListener listener = new TheListener(); + var listener = new TheListener(); MockServer.WebSocketHandler.expectOpeningMessage("Darkness Rises When Silence Dies"); assertEquals("ws://localhost:4567/websocket", MockServer.WEBSOCKET); Unirest.webSocket(MockServer.WEBSOCKET)