Skip to content

Commit

Permalink
renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
@tnaskali
tnaskali committed Jan 27, 2025
1 parent 7a2bffa commit 83eef94
Show file tree
Hide file tree
Showing 17 changed files with 81 additions and 69 deletions.
18 changes: 15 additions & 3 deletions src/test/java/li/naska/bgg/resource/AbstractMockServerIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/li/naska/bgg/resource/v1/CompanyResourceV1IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -86,7 +86,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -129,7 +129,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -176,7 +176,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/li/naska/bgg/resource/v1/GeeklistResourceV1IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -94,7 +94,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -135,7 +135,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -188,7 +188,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -236,7 +236,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/li/naska/bgg/resource/v1/PersonResourceV1IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -91,7 +91,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -134,7 +134,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -181,7 +181,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/li/naska/bgg/resource/v2/CollectionResourceV2IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -82,7 +82,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -161,7 +161,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -239,7 +239,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/li/naska/bgg/resource/v2/CompanyResourceV2IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ class Given {
</videos>
</item>
</items>
""";
""";

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -90,7 +90,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -142,7 +142,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -191,7 +191,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/li/naska/bgg/resource/v2/FamilyResourceV2IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -81,7 +81,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -134,7 +134,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -184,7 +184,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/li/naska/bgg/resource/v2/ForumListResourceV2IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -80,7 +80,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -131,7 +131,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -179,7 +179,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/li/naska/bgg/resource/v2/ForumResourceV2IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -82,7 +82,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -133,7 +133,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -181,7 +181,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/li/naska/bgg/resource/v2/GuildResourceV2IT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class Given {

@BeforeEach
public void setup() {
dispatch(200, mockResponseBody);
dispatchXml(200, mockResponseBody);
}

@Nested
Expand All @@ -90,7 +90,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -143,7 +143,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down Expand Up @@ -192,7 +192,7 @@ class Then {
@BeforeEach
public void setup() {
result = test.get();
recordedRequest = record();
recordedRequest = takeRequest();
}

@Test
Expand Down
Loading

0 comments on commit 83eef94

Please sign in to comment.