X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fpersistence%2FAbstractStorageStrategyIT.java;h=69365325df78292b219a71a082cb3bc0b1107191;hb=b34a90295e36150695c4d99ae7d43008e092340b;hp=1373cf0ba1f80f4cfc380b683d2de9256f176d41;hpb=d7689f059964f8c6105b65bb3ee5a097fd106cb7;p=demos%2Fkafka%2Fchat

diff --git a/src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java b/src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
index 1373cf0b..69365325 100644
--- a/src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
+++ b/src/test/java/de/juplo/kafka/chat/backend/persistence/AbstractStorageStrategyIT.java
@@ -1,8 +1,6 @@
 package de.juplo.kafka.chat.backend.persistence;
 
 import de.juplo.kafka.chat.backend.domain.*;
-import de.juplo.kafka.chat.backend.persistence.inmemory.ChatHomeService;
-import de.juplo.kafka.chat.backend.persistence.inmemory.SimpleChatHome;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 
@@ -16,7 +14,6 @@ import static pl.rzrz.assertj.reactor.Assertions.*;
 public abstract class AbstractStorageStrategyIT
 {
   protected ChatHome chathome;
-  protected ChatRoomFactory chatRoomFactory;
 
 
   protected abstract StorageStrategy getStorageStrategy();
@@ -25,8 +22,7 @@ public abstract class AbstractStorageStrategyIT
   protected void start()
   {
     StorageStrategyITConfig config = getConfig();
-    chathome = new SimpleChatHome(config.getChatHomeService());
-    chatRoomFactory = config.getChatRoomFactory();
+    chathome = config.getChatHome();
   }
 
   protected void stop()
@@ -42,7 +38,7 @@ public abstract class AbstractStorageStrategyIT
     assertThat(chathome.getChatRooms().toStream()).hasSize(0);
 
     UUID chatRoomId = UUID.fromString("5c73531c-6fc4-426c-adcb-afc5c140a0f7");
-    ChatRoomInfo info = chatRoomFactory.createChatRoom(chatRoomId, "FOO").block();
+    ChatRoomInfo info = chathome.createChatRoom(chatRoomId, "FOO").block();
     log.debug("Created chat-room {}", info);
     ChatRoom chatroom = chathome.getChatRoom(chatRoomId).block();
     Message m1 = chatroom.addMessage(1l,"peter", "Hallo, ich heiße Peter!").block();
@@ -50,19 +46,20 @@ public abstract class AbstractStorageStrategyIT
     Message m3 = chatroom.addMessage(2l, "peter", "Willst du mit mir gehen?").block();
     Message m4 = chatroom.addMessage(1l, "klaus", "Ja? Nein? Vielleicht??").block();
 
+
     assertThat(chathome.getChatRooms().toStream()).containsExactlyElementsOf(List.of(chatroom));
-    assertThat(chathome.getChatRoom(chatroom.getId())).emitsExactly(chatroom);
+    assertThat(chathome.getChatRoom(chatRoomId)).emitsExactly(chatroom);
     assertThat(chathome
-        .getChatRoom(chatroom.getId())
+        .getChatRoom(chatRoomId)
         .flatMapMany(cr -> cr.getMessages())).emitsExactly(m1, m2, m3, m4);
 
     stop();
     start();
 
     assertThat(chathome.getChatRooms().toStream()).containsExactlyElementsOf(List.of(chatroom));
-    assertThat(chathome.getChatRoom(chatroom.getId())).emitsExactly(chatroom);
+    assertThat(chathome.getChatRoom(chatRoomId)).emitsExactly(chatroom);
     assertThat(chathome
-        .getChatRoom(chatroom.getId())
+        .getChatRoom(chatRoomId)
         .flatMapMany(cr -> cr.getMessages())).emitsExactly(m1, m2, m3, m4);
   }
 
@@ -74,7 +71,7 @@ public abstract class AbstractStorageStrategyIT
     assertThat(chathome.getChatRooms().toStream()).hasSize(0);
 
     UUID chatRoomAId = UUID.fromString("5c73531c-6fc4-426c-adcb-afc5c140a0f7");
-    ChatRoomInfo infoA = chatRoomFactory.createChatRoom(chatRoomAId, "FOO").block();
+    ChatRoomInfo infoA = chathome.createChatRoom(chatRoomAId, "FOO").block();
     log.debug("Created chat-room {}", infoA);
     ChatRoom chatroomA = chathome.getChatRoom(chatRoomAId).block();
     Message ma1 = chatroomA.addMessage(1l,"peter", "Hallo, ich heiße Peter!").block();
@@ -83,7 +80,7 @@ public abstract class AbstractStorageStrategyIT
     Message ma4 = chatroomA.addMessage(1l, "klaus", "Ja? Nein? Vielleicht??").block();
 
     UUID chatRoomBId = UUID.fromString("8763dfdc-4dda-4a74-bea4-4b389177abea");
-    ChatRoomInfo infoB = chatRoomFactory.createChatRoom(chatRoomBId, "BAR").block();
+    ChatRoomInfo infoB = chathome.createChatRoom(chatRoomBId, "BAR").block();
     log.debug("Created chat-room {}", infoB);
     ChatRoom chatroomB = chathome.getChatRoom(chatRoomBId).block();
     Message mb1 = chatroomB.addMessage(1l,"peter", "Hallo, ich heiße Uwe!").block();
@@ -92,33 +89,32 @@ public abstract class AbstractStorageStrategyIT
     Message mb4 = chatroomB.addMessage(2l, "peter", "Hä? Was jetzt?!? Isch glohb isch höb ühn däjah vüh...").block();
 
     assertThat(chathome.getChatRooms().toStream()).containsExactlyInAnyOrderElementsOf(List.of(chatroomA, chatroomB));
-    assertThat(chathome.getChatRoom(chatroomA.getId())).emitsExactly(chatroomA);
+    assertThat(chathome.getChatRoom(chatRoomAId)).emitsExactly(chatroomA);
     assertThat(chathome
-        .getChatRoom(chatroomA.getId())
+        .getChatRoom(chatRoomAId)
         .flatMapMany(cr -> cr.getMessages())).emitsExactly(ma1, ma2, ma3, ma4);
-    assertThat(chathome.getChatRoom(chatroomB.getId())).emitsExactly(chatroomB);
+    assertThat(chathome.getChatRoom(chatRoomBId)).emitsExactly(chatroomB);
     assertThat(chathome
-        .getChatRoom(chatroomB.getId())
+        .getChatRoom(chatRoomBId)
         .flatMapMany(cr -> cr.getMessages())).emitsExactly(mb1, mb2, mb3, mb4);
 
     stop();
     start();
 
     assertThat(chathome.getChatRooms().toStream()).containsExactlyInAnyOrderElementsOf(List.of(chatroomA, chatroomB));
-    assertThat(chathome.getChatRoom(chatroomA.getId())).emitsExactly(chatroomA);
+    assertThat(chathome.getChatRoom(chatRoomAId)).emitsExactly(chatroomA);
     assertThat(chathome
-        .getChatRoom(chatroomA.getId())
+        .getChatRoom(chatRoomAId)
         .flatMapMany(cr -> cr.getMessages())).emitsExactly(ma1, ma2, ma3, ma4);
-    assertThat(chathome.getChatRoom(chatroomB.getId())).emitsExactly(chatroomB);
+    assertThat(chathome.getChatRoom(chatRoomBId)).emitsExactly(chatroomB);
     assertThat(chathome
-        .getChatRoom(chatroomB.getId())
+        .getChatRoom(chatRoomBId)
         .flatMapMany(cr -> cr.getMessages())).emitsExactly(mb1, mb2, mb3, mb4);
   }
 
 
   interface StorageStrategyITConfig
   {
-    ChatHomeService getChatHomeService();
-    ChatRoomFactory getChatRoomFactory();
+    ChatHome getChatHome();
   }
 }