X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fdemo%2FHtmlControllerTest.java;h=96ac20ae926dee56fc39b022bdb0ef05169e583c;hb=ddda08de0026c84ed095dc76955f874fa7ef2dc6;hp=1584ef6f17e21eb4599d836b331a5c367d4f9c2b;hpb=24963bcd949bde78e6b9655b29bceffb525521d0;p=demos%2Ftesting

diff --git a/src/test/java/de/juplo/demo/HtmlControllerTest.java b/src/test/java/de/juplo/demo/HtmlControllerTest.java
index 1584ef6..96ac20a 100644
--- a/src/test/java/de/juplo/demo/HtmlControllerTest.java
+++ b/src/test/java/de/juplo/demo/HtmlControllerTest.java
@@ -7,12 +7,13 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.EnumSource;
 import org.mockito.ArgumentCaptor;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpStatus;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.ui.Model;
 import org.springframework.web.reactive.function.client.WebClientResponseException;
@@ -52,6 +53,7 @@ public class HtmlControllerTest
 
     assertThat(result).isEqualTo("home");
     ArgumentCaptor<Mono<String>> captor = ArgumentCaptor.forClass(Mono.class);
+    verify(model).addAttribute("path", "foo");
     verify(model).addAttribute(eq("text"), captor.capture());
     StepVerifier
         .create(captor.getValue())
@@ -71,6 +73,7 @@ public class HtmlControllerTest
 
     assertThat(result).isEqualTo("home");
     ArgumentCaptor<Mono<String>> captor = ArgumentCaptor.forClass(Mono.class);
+    verify(model).addAttribute("path", "foo");
     verify(model).addAttribute(eq("text"), captor.capture());
     StepVerifier
         .create(captor.getValue())
@@ -86,10 +89,26 @@ public class HtmlControllerTest
    */
   @DisplayName("Other error while fetching data from remote-server")
   @ParameterizedTest(name = "{arguments} ==> HTTP-status={0}")
-  @ValueSource(ints = { 400, 401, 403, 405, 406, 409, 410, 415, 422, 429, 500, 501, 502, 503, 504 })
-  void testOtherError(int status)
+  @EnumSource(value = HttpStatus.class, names = {
+    "BAD_REQUEST",
+    "UNAUTHORIZED",
+    "FORBIDDEN",
+    "METHOD_NOT_ALLOWED",
+    "NOT_ACCEPTABLE",
+    "CONFLICT",
+    "GONE",
+    "UNSUPPORTED_MEDIA_TYPE",
+    "TOO_MANY_REQUESTS",
+    "UNPROCESSABLE_ENTITY",
+    "INTERNAL_SERVER_ERROR",
+    "NOT_IMPLEMENTED",
+    "BAD_GATEWAY",
+    "SERVICE_UNAVAILABLE",
+    "GATEWAY_TIMEOUT"
+  })
+  void testOtherError(HttpStatus status)
   {
-    Mono<String> mono = Mono.error(WebClientResponseException.create(status, "", null, null, null));
+    Mono<String> mono = Mono.error(WebClientResponseException.create(status.value(), "", null, null, null));
     when(service.getRemoteText("foo")).thenReturn(mono);
 
     String result = controller.fetch(model, "foo");
@@ -99,7 +118,7 @@ public class HtmlControllerTest
     verify(model).addAttribute(eq("text"), captor.capture());
     StepVerifier
         .create(captor.getValue())
-        .expectNextMatches(message -> message.startsWith(Integer.toString(status)))
+        .expectNextMatches(message -> message.startsWith(Integer.toString(status.value())))
         .expectComplete()
         .verify();
   }