X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fapi%2FChatBackendControllerTest.java;h=8947a03cd0579227d81d4482e92d92ccb0fff4f9;hb=972a1f2c248a51740091c1fdf3526f0eb676639e;hp=08361dd998554bd254079986410af5b9bd553564;hpb=22c15a299f38649686d2677731aeb349e51224a5;p=demos%2Fkafka%2Fchat

diff --git a/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java b/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java
index 08361dd9..8947a03c 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/api/ChatBackendControllerTest.java
@@ -2,7 +2,6 @@ package de.juplo.kafka.chat.backend.api;
 
 import de.juplo.kafka.chat.backend.domain.*;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +10,9 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.reactive.server.WebTestClient;
+import reactor.core.publisher.Mono;
 
 import java.time.LocalDateTime;
-import java.util.Optional;
 import java.util.UUID;
 
 import static org.mockito.ArgumentMatchers.any;
@@ -29,14 +28,14 @@ public class ChatBackendControllerTest
   @MockBean
   ChatHome chatHome;
 
-  @Disabled
   @Test
   @DisplayName("Assert expected problem-details for unknown chatroom on GET /list/{chatroomId}")
   void testUnknownChatroomExceptionForListChatroom(@Autowired WebTestClient client)
   {
     // Given
     UUID chatroomId = UUID.randomUUID();
-    when(chatHome.getChatroom(any(UUID.class))).thenReturn(Optional.empty());
+    when(chatHome.getChatroom(any(UUID.class)))
+        .thenReturn(Mono.error(() -> new UnknownChatroomException(chatroomId)));
 
     // When
     WebTestClient.ResponseSpec responseSpec = client
@@ -50,14 +49,14 @@ public class ChatBackendControllerTest
   }
 
 
-  @Disabled
   @Test
   @DisplayName("Assert expected problem-details for unknown chatroom on GET /get/{chatroomId}")
   void testUnknownChatroomExceptionForGetChatroom(@Autowired WebTestClient client)
   {
     // Given
     UUID chatroomId = UUID.randomUUID();
-    when(chatHome.getChatroom(any(UUID.class))).thenReturn(Optional.empty());
+    when(chatHome.getChatroom(any(UUID.class)))
+        .thenReturn(Mono.error(() -> new UnknownChatroomException(chatroomId)));
 
     // When
     WebTestClient.ResponseSpec responseSpec = client
@@ -78,7 +77,8 @@ public class ChatBackendControllerTest
     UUID chatroomId = UUID.randomUUID();
     String username = "foo";
     Long messageId = 66l;
-    when(chatHome.getChatroom(any(UUID.class))).thenReturn(Optional.empty());
+    when(chatHome.getChatroom(any(UUID.class)))
+        .thenReturn(Mono.error(() -> new UnknownChatroomException(chatroomId)));
 
     // When
     WebTestClient.ResponseSpec responseSpec = client
@@ -104,7 +104,8 @@ public class ChatBackendControllerTest
     UUID chatroomId = UUID.randomUUID();
     String username = "foo";
     Long messageId = 66l;
-    when(chatHome.getChatroom(any(UUID.class))).thenReturn(Optional.empty());
+    when(chatHome.getChatroom(any(UUID.class)))
+        .thenReturn(Mono.error(() -> new UnknownChatroomException(chatroomId)));
 
     // When
     WebTestClient.ResponseSpec responseSpec = client
@@ -127,13 +128,14 @@ public class ChatBackendControllerTest
   {
     // Given
     UUID chatroomId = UUID.randomUUID();
-    when(chatHome.getChatroom(any(UUID.class))).thenReturn(Optional.empty());
+    when(chatHome.getChatroom(any(UUID.class)))
+        .thenReturn(Mono.error(() -> new UnknownChatroomException(chatroomId)));
 
     // When
     WebTestClient.ResponseSpec responseSpec = client
         .get()
         .uri("/listen/{chatroomId}", chatroomId)
-        .accept(MediaType.TEXT_EVENT_STREAM, MediaType.APPLICATION_JSON)
+        // .accept(MediaType.TEXT_EVENT_STREAM, MediaType.APPLICATION_JSON) << TODO: Does not work!
         .exchange();
 
     // Then
@@ -161,13 +163,12 @@ public class ChatBackendControllerTest
     Long messageId = 66l;
     ChatRoom chatRoom = mock(ChatRoom.class);
     when(chatHome.getChatroom(any(UUID.class)))
-        .thenReturn(Optional.of(chatRoom));
+        .thenReturn(Mono.just(chatRoom));
     Message.MessageKey key = Message.MessageKey.of("foo", 1l);
     LocalDateTime timestamp = LocalDateTime.now();
-    Message mutated = new Message(key, 0l, timestamp, "Mutated!");
     Message existing = new Message(key, 0l, timestamp, "Existing");
     when(chatRoom.addMessage(any(Long.class), any(String.class), any(String.class)))
-        .thenThrow(new MessageMutationException(mutated, existing));
+        .thenReturn(Mono.error(() -> new MessageMutationException(existing, "Mutated!")));
 
     // When
     client
@@ -184,7 +185,7 @@ public class ChatBackendControllerTest
         .expectStatus().is4xxClientError()
         .expectBody()
         .jsonPath("$.type").isEqualTo("/problem/message-mutation")
-        .jsonPath("$.mutatedMessage.text").isEqualTo("Mutated!")
-        .jsonPath("$.existingMessage.text").isEqualTo("Existing");
+        .jsonPath("$.existingMessage.text").isEqualTo("Existing")
+        .jsonPath("$.mutatedText").isEqualTo("Mutated!");
   }
 }