Merge pull request #52 from wiremock/feature/issue-49-incorrect-searc…

…h-for-mappings fix: looking for mocks under directory before classpath (refs #49)
wiremock · Oct 10, 2024 · 7f9bc1c · 7f9bc1c
2 parents d6caf57 + bb9ee82
commit 7f9bc1c
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 47 deletions.
diff --git a/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java b/src/main/java/org/wiremock/spring/internal/WireMockServerCreator.java
@@ -35,25 +35,29 @@ public WireMockServer createWireMockServer(
 
     final WireMockConfiguration serverOptions =
         options().port(serverPort).notifier(new Slf4jNotifier(options.name()));
-    this.configureFilesUnderClasspath(options.filesUnderClasspath(), "/" + options.name())
+
+    this.configureFilesUnderDirectory(options.filesUnderDirectory(), "/" + options.name())
         .ifPresentOrElse(
-            present -> this.usingFilesUnderClasspath(serverOptions, present),
+            present -> this.usingFilesUnderDirectory(serverOptions, present),
             () -> {
-              this.configureFilesUnderClasspath(options.filesUnderClasspath(), "")
+              this.configureFilesUnderDirectory(options.filesUnderDirectory(), "")
                   .ifPresentOrElse(
-                      present -> this.usingFilesUnderClasspath(serverOptions, present),
+                      present -> this.usingFilesUnderDirectory(serverOptions, present),
                       () -> {
-                        this.configureFilesUnderDirectory(
-                                options.filesUnderDirectory(), "/" + options.name())
+                        this.logger.info("No mocks found under directory");
+                        this.configureFilesUnderClasspath(
+                                options.filesUnderClasspath(), "/" + options.name())
                             .ifPresentOrElse(
-                                present -> this.usingFilesUnderDirectory(serverOptions, present),
+                                present -> this.usingFilesUnderClasspath(serverOptions, present),
                                 () -> {
-                                  this.configureFilesUnderDirectory(
-                                          options.filesUnderDirectory(), "")
-                                      .ifPresent(
+                                  this.configureFilesUnderClasspath(
+                                          options.filesUnderClasspath(), "")
+                                      .ifPresentOrElse(
                                           present ->
-                                              this.usingFilesUnderDirectory(
-                                                  serverOptions, present));
+                                              this.usingFilesUnderClasspath(serverOptions, present),
+                                          () -> {
+                                            this.logger.info("No mocks found under classpath");
+                                          });
                                 });
                       });
             });

diff --git a/.../test/wiremock-mappings/mappings/get.json → ...t/files-under-directory/mappings/get.json b/.../test/wiremock-mappings/mappings/get.json → ...t/files-under-directory/mappings/get.json
@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "url": "/wiremockmappingsmock"
+    "url": "/files-under-directory"
   },
   "response": {
     "jsonBody": {

diff --git a/wiremock-spring-boot-example/src/test/java/app/FilesUnderClasspathTest.java b/wiremock-spring-boot-example/src/test/java/app/FilesUnderClasspathTest.java
@@ -2,41 +2,45 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import app.todoclient.Todo;
-import app.todoclient.TodoClient;
-import java.util.List;
+import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.wiremock.spring.ConfigureWireMock;
 import org.wiremock.spring.EnableWireMock;
 
 @SpringBootTest
-@EnableWireMock({
-  @ConfigureWireMock(
-      name = "todo-client",
-      baseUrlProperties = "todo-client.url",
-      filesUnderClasspath = "custom-location")
-})
+@EnableWireMock({@ConfigureWireMock(filesUnderClasspath = "custom-location")})
 class FilesUnderClasspathTest {
 
-  @Autowired private TodoClient todoClient;
+  @Value("${wiremock.server.baseUrl}")
+  private String wireMockServerUrl;
 
   @Test
-  void usesStubFilesFromCustomLocation() {
-    final List<Todo> todos = this.todoClient.findAll();
-    assertThat(todos).isNotNull().hasSize(2);
-    assertThat(todos.get(0))
-        .satisfies(
-            todo -> {
-              assertThat(todo.id()).isEqualTo(1);
-              assertThat(todo.title()).isEqualTo("custom location todo 1");
-            });
-    assertThat(todos.get(1))
-        .satisfies(
-            todo -> {
-              assertThat(todo.id()).isEqualTo(2);
-              assertThat(todo.title()).isEqualTo("custom location todo 2");
-            });
+  void test() {
+    RestAssured.baseURI = this.wireMockServerUrl;
+    final String actual =
+        RestAssured.when()
+            .get("/classpathmappings")
+            .then()
+            .statusCode(200)
+            .extract()
+            .asPrettyString();
+    assertThat(actual)
+        .isEqualToIgnoringWhitespace(
+            """
+				[
+				    {
+				        "id": 1,
+				        "title": "custom location todo 1",
+				        "userId": 1
+				    },
+				    {
+				        "id": 2,
+				        "title": "custom location todo 2",
+				        "userId": 1
+				    }
+				]
+				""");
   }
 }
diff --git a/wiremock-spring-boot-example/src/test/java/app/FilesUnderDirectoryTests.java b/wiremock-spring-boot-example/src/test/java/app/FilesUnderDirectoryTests.java
@@ -1,5 +1,7 @@
 package app;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
@@ -8,12 +10,7 @@
 import org.wiremock.spring.EnableWireMock;
 
 @SpringBootTest
-@EnableWireMock({
-  @ConfigureWireMock(
-      name = "fs-client",
-      filesUnderClasspath = "does_not_exist",
-      filesUnderDirectory = "src/test/wiremock-mappings")
-})
+@EnableWireMock({@ConfigureWireMock(filesUnderDirectory = "src/test/files-under-directory")})
 class FilesUnderDirectoryTests {
 
   @Value("${wiremock.server.baseUrl}")
@@ -22,6 +19,16 @@ class FilesUnderDirectoryTests {
   @Test
   void test() {
     RestAssured.baseURI = this.wireMockServerUrl;
-    RestAssured.when().get("/wiremockmappingsmock").then().statusCode(200);
+    final String actual =
+        RestAssured.when()
+            .get("/files-under-directory")
+            .then()
+            .statusCode(200)
+            .extract()
+            .asPrettyString();
+
+    assertThat(actual).isEqualToIgnoringWhitespace("""
+				{"wiremockmappingsmock":"yes"}
+				""");
   }
 }
diff --git a/wiremock-spring-boot-example/src/test/resources/custom-location/mappings/todos.json b/wiremock-spring-boot-example/src/test/resources/custom-location/mappings/todos.json
@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "url": "/"
+    "url": "/classpathmappings"
   },
   "response": {
     "headers": {