Simplify Fixture Loading

Since package is always same, so we can resolve the whole path in
the base class.

Also put the context information in file name at the end, so that
fixtures show up near the test class in the IDE.

Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>

Author: Weltraumschaf

src/test/java/io/securecodebox/persistence/defectdojo/service/EndpointServiceTest.java

@@ -1,16 +1,16 @@
 package io.securecodebox.persistence.defectdojo.service;
 
 import io.securecodebox.persistence.defectdojo.model.Endpoint;
-import io.securecodebox.persistence.defectdojo.model.User;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
-import static org.junit.jupiter.api.Assertions.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.jupiter.api.Assertions.assertAll;
 
 /**
  * Tests for {@link EndpointService}
@@ -24,7 +24,7 @@ void search() throws URISyntaxException, IOException {
       get("/api/v2/endpoints/?offset=0&limit=100")
         .willReturn(
           ok()
-            .withBody(readResponseBodyFromFixture("io/securecodebox/persistence/defectdojo/service/fixture_EndpointService.json"))
+            .withBody(readResponseBodyFromFixture("EndpointService_response_fixture.json"))
         )
     );
 

src/test/java/io/securecodebox/persistence/defectdojo/service/HttpClientExampleTest.java

@@ -1,14 +1,11 @@
 package io.securecodebox.persistence.defectdojo.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
-import io.securecodebox.persistence.defectdojo.config.Config;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -27,7 +24,7 @@
 final class HttpClientExampleTest extends WireMockBaseTestCase {
 
   private URI createUri(String path) {
-    return URI.create("http://localhost:%d/%s".formatted(PORT, path));
+    return URI.create("http://localhost:%d/%s".formatted(8080, path));
   }
 
   @Test

src/test/java/io/securecodebox/persistence/defectdojo/service/ProductTypeServiceTest.java

@@ -24,7 +24,7 @@ void search() throws URISyntaxException, IOException {
       get("/api/v2/product_types/?offset=0&limit=100")
         .willReturn(
           ok()
-            .withBody(readResponseBodyFromFixture("io/securecodebox/persistence/defectdojo/service/fixture_ProductTypeService.json"))
+            .withBody(readResponseBodyFromFixture("ProductTypeService_response_fixture.json"))
         )
     );
 

src/test/java/io/securecodebox/persistence/defectdojo/service/UserServiceTest.java

@@ -27,7 +27,7 @@ void search() throws URISyntaxException, IOException {
       get("/api/v2/users/?offset=0&limit=100")
         .willReturn(
           ok()
-            .withBody(readResponseBodyFromFixture("io/securecodebox/persistence/defectdojo/service/fixture_UserService.json"))
+            .withBody(readResponseBodyFromFixture("UserService_response_fixture.json"))
         )
     );
 

src/test/java/io/securecodebox/persistence/defectdojo/service/WireMockBaseTestCase.java

@@ -17,12 +17,15 @@
 @WireMockTest(httpPort = WireMockBaseTestCase.PORT)
 abstract class WireMockBaseTestCase {
   static final int PORT = 8888;
+  private static final String FIXTURE_BASE_PACKAGE = "io/securecodebox/persistence/defectdojo/service";
 
   private final Config conf = new Config(
     String.format("http://localhost:%d/", PORT),
     "not-required-for-tests");
 
-  String readResponseBodyFromFixture(String fixtureFilePath) throws IOException {
+  String readResponseBodyFromFixture(String fixtureFile) throws IOException {
+    final var fixtureFilePath = FIXTURE_BASE_PACKAGE + "/" + fixtureFile;
+
     try (final var input = getClass().getClassLoader().getResourceAsStream(fixtureFilePath)) {
       final var bytes = Objects.requireNonNull(input).readAllBytes();
       return new String(bytes, StandardCharsets.UTF_8);