diff --git a/src/test/java/li/naska/bgg/resource/AbstractMockServerIT.java b/src/test/java/li/naska/bgg/resource/AbstractMockServerIT.java index 76f11d8..3840ddb 100644 --- a/src/test/java/li/naska/bgg/resource/AbstractMockServerIT.java +++ b/src/test/java/li/naska/bgg/resource/AbstractMockServerIT.java @@ -42,19 +42,31 @@ static void registerProperties(DynamicPropertyRegistry registry) { registry.add("bgg.web.baseurl-geekdo", () -> mockWebServer.url("/").url().toString()); } - protected void dispatch(int responseCode, String mockResponseBody) { + protected void dispatchXml(int responseCode, String mockResponseBody) { + dispatch(responseCode, MediaType.TEXT_XML, mockResponseBody); + } + + protected void dispatchJson(int responseCode, String mockResponseBody) { + dispatch(responseCode, MediaType.APPLICATION_JSON, mockResponseBody); + } + + protected void dispatchHtml(int responseCode, String mockResponseBody) { + dispatch(responseCode, MediaType.TEXT_HTML, mockResponseBody); + } + + protected void dispatch(int responseCode, MediaType mediaType, String mockResponseBody) { mockWebServer.setDispatcher(new Dispatcher() { @Override public @NotNull MockResponse dispatch(@NotNull RecordedRequest request) { return new MockResponse() .setResponseCode(responseCode) - .addHeader(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_XML_VALUE) + .addHeader(HttpHeaders.CONTENT_TYPE, mediaType) .setBody(mockResponseBody); } }); } - protected RecordedRequest record() { + protected RecordedRequest takeRequest() { try { return mockWebServer.takeRequest(500, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { diff --git a/src/test/java/li/naska/bgg/resource/v1/CompanyResourceV1IT.java b/src/test/java/li/naska/bgg/resource/v1/CompanyResourceV1IT.java index 8bb006f..4aea6a5 100644 --- a/src/test/java/li/naska/bgg/resource/v1/CompanyResourceV1IT.java +++ b/src/test/java/li/naska/bgg/resource/v1/CompanyResourceV1IT.java @@ -65,7 +65,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -86,7 +86,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -129,7 +129,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -176,7 +176,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v1/GeeklistResourceV1IT.java b/src/test/java/li/naska/bgg/resource/v1/GeeklistResourceV1IT.java index a8da4f7..99bb99f 100644 --- a/src/test/java/li/naska/bgg/resource/v1/GeeklistResourceV1IT.java +++ b/src/test/java/li/naska/bgg/resource/v1/GeeklistResourceV1IT.java @@ -73,7 +73,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -94,7 +94,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -135,7 +135,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -188,7 +188,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -236,7 +236,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v1/PersonResourceV1IT.java b/src/test/java/li/naska/bgg/resource/v1/PersonResourceV1IT.java index 26731e6..eeeee4b 100644 --- a/src/test/java/li/naska/bgg/resource/v1/PersonResourceV1IT.java +++ b/src/test/java/li/naska/bgg/resource/v1/PersonResourceV1IT.java @@ -70,7 +70,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -91,7 +91,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -134,7 +134,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -181,7 +181,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/CollectionResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/CollectionResourceV2IT.java index 153006e..dfdab63 100644 --- a/src/test/java/li/naska/bgg/resource/v2/CollectionResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/CollectionResourceV2IT.java @@ -61,7 +61,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -82,7 +82,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -161,7 +161,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -239,7 +239,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/CompanyResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/CompanyResourceV2IT.java index 36074fa..36afc18 100644 --- a/src/test/java/li/naska/bgg/resource/v2/CompanyResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/CompanyResourceV2IT.java @@ -65,11 +65,11 @@ class Given { - """; + """; @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -90,7 +90,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -142,7 +142,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -191,7 +191,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/FamilyResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/FamilyResourceV2IT.java index e9b24fd..cf2baeb 100644 --- a/src/test/java/li/naska/bgg/resource/v2/FamilyResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/FamilyResourceV2IT.java @@ -60,7 +60,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -81,7 +81,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -134,7 +134,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -184,7 +184,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/ForumListResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/ForumListResourceV2IT.java index 55aaf2c..9c4e430 100644 --- a/src/test/java/li/naska/bgg/resource/v2/ForumListResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/ForumListResourceV2IT.java @@ -59,7 +59,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -80,7 +80,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -131,7 +131,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -179,7 +179,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/ForumResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/ForumResourceV2IT.java index 9351618..a9ebb39 100644 --- a/src/test/java/li/naska/bgg/resource/v2/ForumResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/ForumResourceV2IT.java @@ -61,7 +61,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -82,7 +82,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -133,7 +133,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -181,7 +181,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/GuildResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/GuildResourceV2IT.java index 9819a2f..9cd42e9 100644 --- a/src/test/java/li/naska/bgg/resource/v2/GuildResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/GuildResourceV2IT.java @@ -69,7 +69,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -90,7 +90,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -143,7 +143,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -192,7 +192,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/HotItemsResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/HotItemsResourceV2IT.java index 2322c02..4e1d704 100644 --- a/src/test/java/li/naska/bgg/resource/v2/HotItemsResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/HotItemsResourceV2IT.java @@ -62,7 +62,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -83,7 +83,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -133,7 +133,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -180,7 +180,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/PersonResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/PersonResourceV2IT.java index 788426a..865f4f5 100644 --- a/src/test/java/li/naska/bgg/resource/v2/PersonResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/PersonResourceV2IT.java @@ -64,7 +64,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -85,7 +85,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -137,7 +137,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -186,7 +186,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/PlaysResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/PlaysResourceV2IT.java index b58de36..c0da491 100644 --- a/src/test/java/li/naska/bgg/resource/v2/PlaysResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/PlaysResourceV2IT.java @@ -64,7 +64,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -85,7 +85,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -141,7 +141,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -196,7 +196,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/SearchResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/SearchResourceV2IT.java index a39d034..91b5132 100644 --- a/src/test/java/li/naska/bgg/resource/v2/SearchResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/SearchResourceV2IT.java @@ -61,7 +61,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -82,7 +82,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -134,7 +134,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -182,7 +182,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/ThingResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/ThingResourceV2IT.java index f02a25a..10e1c35 100644 --- a/src/test/java/li/naska/bgg/resource/v2/ThingResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/ThingResourceV2IT.java @@ -60,7 +60,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -81,7 +81,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -144,7 +144,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -204,7 +204,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/ThreadResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/ThreadResourceV2IT.java index bca783a..6a834c2 100644 --- a/src/test/java/li/naska/bgg/resource/v2/ThreadResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/ThreadResourceV2IT.java @@ -68,7 +68,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -89,7 +89,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -143,7 +143,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -196,7 +196,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test diff --git a/src/test/java/li/naska/bgg/resource/v2/UserResourceV2IT.java b/src/test/java/li/naska/bgg/resource/v2/UserResourceV2IT.java index 11062d2..054f976 100644 --- a/src/test/java/li/naska/bgg/resource/v2/UserResourceV2IT.java +++ b/src/test/java/li/naska/bgg/resource/v2/UserResourceV2IT.java @@ -72,7 +72,7 @@ class Given { @BeforeEach public void setup() { - dispatch(200, mockResponseBody); + dispatchXml(200, mockResponseBody); } @Nested @@ -93,7 +93,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -149,7 +149,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test @@ -204,7 +204,7 @@ class Then { @BeforeEach public void setup() { result = test.get(); - recordedRequest = record(); + recordedRequest = takeRequest(); } @Test