X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatRoomDataTest.java;h=3c7d1dd20eed6e7dc83da7514d0c7b1ba90d4a83;hb=a8868405a208e0bfd176890b6387fb5c794358e9;hp=822ffe77efbb493fb675f6189bc37fd4643826bd;hpb=fb9a6dd6f918d9b2f1ed4c5bb4b6cd2f609cf358;p=demos%2Fkafka%2Fchat

diff --git a/src/test/java/de/juplo/kafka/chat/backend/domain/ChatRoomDataTest.java b/src/test/java/de/juplo/kafka/chat/backend/domain/ChatRoomDataTest.java
index 822ffe77..3c7d1dd2 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/domain/ChatRoomDataTest.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/domain/ChatRoomDataTest.java
@@ -8,13 +8,12 @@ import java.time.Clock;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.UUID;
 
 import static org.mockito.Mockito.*;
 import static pl.rzrz.assertj.reactor.Assertions.assertThat;
 
 
-public class ChatRoomTest
+public class ChatRoomDataTest
 {
   @Test
   @DisplayName("Assert, that Mono emits expected message, if it exists")
@@ -23,21 +22,18 @@ public class ChatRoomTest
     // Given
     String user = "foo";
     Long messageId = 1l;
-    ChatRoomService chatRoomService = mock(ChatRoomService.class);
-    ChatRoom chatRoom = new ChatRoom(
-        UUID.randomUUID(),
-        "Foo",
-        0,
+    ChatMessageService chatMessageService = mock(ChatMessageService.class);
+    ChatRoomData chatRoomData = new ChatRoomData(
         Clock.systemDefaultZone(),
-        chatRoomService,
+        chatMessageService,
         8);
     Message.MessageKey key = Message.MessageKey.of(user, messageId);
     LocalDateTime timestamp = LocalDateTime.now();
     Message message = new Message(key, 0l, timestamp, "Bar");
-    when(chatRoomService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.just(message));
+    when(chatMessageService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.just(message));
 
     // When
-    Mono<Message> mono = chatRoom.getMessage(user, messageId);
+    Mono<Message> mono = chatRoomData.getMessage(user, messageId);
 
     // Then
     assertThat(mono).emitsExactly(message);
@@ -50,18 +46,15 @@ public class ChatRoomTest
     // Given
     String user = "foo";
     Long messageId = 1l;
-    ChatRoomService chatRoomService = mock(ChatRoomService.class);
-    ChatRoom chatRoom = new ChatRoom(
-        UUID.randomUUID(),
-        "Foo",
-        0,
+    ChatMessageService chatMessageService = mock(ChatMessageService.class);
+    ChatRoomData chatRoomData = new ChatRoomData(
         Clock.systemDefaultZone(),
-        chatRoomService,
+        chatMessageService,
         8);
-    when(chatRoomService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.empty());
+    when(chatMessageService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.empty());
 
     // When
-    Mono<Message> mono = chatRoom.getMessage(user, messageId);
+    Mono<Message> mono = chatRoomData.getMessage(user, messageId);
 
     // Then
     assertThat(mono).emitsCount(0);
@@ -74,24 +67,21 @@ public class ChatRoomTest
     // Given
     String user = "foo";
     Long messageId = 1l;
-    ChatRoomService chatRoomService = mock(ChatRoomService.class);
-    ChatRoom chatRoom = new ChatRoom(
-        UUID.randomUUID(),
-        "Foo",
-        0,
+    ChatMessageService chatMessageService = mock(ChatMessageService.class);
+    ChatRoomData chatRoomData = new ChatRoomData(
         Clock.systemDefaultZone(),
-        chatRoomService,
+        chatMessageService,
         8);
     Message.MessageKey key = Message.MessageKey.of(user, messageId);
     Clock now = Clock.fixed(Instant.now(), ZoneId.systemDefault());
     LocalDateTime timestamp = LocalDateTime.now(now);
     String messageText = "Bar";
     Message message = new Message(key, 0l, timestamp, messageText);
-    when(chatRoomService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.empty());
-    when(chatRoomService.persistMessage(any(Message.MessageKey.class), any(LocalDateTime.class), any(String.class))).thenReturn(Mono.just(message));
+    when(chatMessageService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.empty());
+    when(chatMessageService.persistMessage(any(Message.MessageKey.class), any(LocalDateTime.class), any(String.class))).thenReturn(Mono.just(message));
 
     // When
-    Mono<Message> mono = chatRoom.addMessage(messageId, user, messageText);
+    Mono<Message> mono = chatRoomData.addMessage(messageId, user, messageText);
 
     // Then
     assertThat(mono).emitsExactly(message);
@@ -104,24 +94,21 @@ public class ChatRoomTest
     // Given
     String user = "foo";
     Long messageId = 1l;
-    ChatRoomService chatRoomService = mock(ChatRoomService.class);
-    ChatRoom chatRoom = new ChatRoom(
-        UUID.randomUUID(),
-        "Foo",
-        0,
+    ChatMessageService chatMessageService = mock(ChatMessageService.class);
+    ChatRoomData chatRoomData = new ChatRoomData(
         Clock.systemDefaultZone(),
-        chatRoomService,
+        chatMessageService,
         8);
     Message.MessageKey key = Message.MessageKey.of(user, messageId);
     Clock now = Clock.fixed(Instant.now(), ZoneId.systemDefault());
     LocalDateTime timestamp = LocalDateTime.now(now);
     String messageText = "Bar";
     Message message = new Message(key, 0l, timestamp, messageText);
-    when(chatRoomService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.just(message));
-    when(chatRoomService.persistMessage(any(Message.MessageKey.class), any(LocalDateTime.class), any(String.class))).thenReturn(Mono.just(message));
+    when(chatMessageService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.just(message));
+    when(chatMessageService.persistMessage(any(Message.MessageKey.class), any(LocalDateTime.class), any(String.class))).thenReturn(Mono.just(message));
 
     // When
-    Mono<Message> mono = chatRoom.addMessage(messageId, user, messageText);
+    Mono<Message> mono = chatRoomData.addMessage(messageId, user, messageText);
 
     // Then
     assertThat(mono).emitsExactly(message);
@@ -134,13 +121,10 @@ public class ChatRoomTest
     // Given
     String user = "foo";
     Long messageId = 1l;
-    ChatRoomService chatRoomService = mock(ChatRoomService.class);
-    ChatRoom chatRoom = new ChatRoom(
-        UUID.randomUUID(),
-        "Foo",
-        0,
+    ChatMessageService chatMessageService = mock(ChatMessageService.class);
+    ChatRoomData chatRoomData = new ChatRoomData(
         Clock.systemDefaultZone(),
-        chatRoomService,
+        chatMessageService,
         8);
     Message.MessageKey key = Message.MessageKey.of(user, messageId);
     Clock now = Clock.fixed(Instant.now(), ZoneId.systemDefault());
@@ -148,11 +132,11 @@ public class ChatRoomTest
     String messageText = "Bar";
     String mutatedText = "Boom!";
     Message message = new Message(key, 0l, timestamp, messageText);
-    when(chatRoomService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.just(message));
-    when(chatRoomService.persistMessage(any(Message.MessageKey.class), any(LocalDateTime.class), any(String.class))).thenReturn(Mono.just(message));
+    when(chatMessageService.getMessage(any(Message.MessageKey.class))).thenReturn(Mono.just(message));
+    when(chatMessageService.persistMessage(any(Message.MessageKey.class), any(LocalDateTime.class), any(String.class))).thenReturn(Mono.just(message));
 
     // When
-    Mono<Message> mono = chatRoom.addMessage(messageId, user, mutatedText);
+    Mono<Message> mono = chatRoomData.addMessage(messageId, user, mutatedText);
 
     // Then
     assertThat(mono).sendsError();