From 2b4ebea4932c99feb8370fa6965c7d1f5c77394c Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Wed, 6 Sep 2023 00:02:28 +0200 Subject: [PATCH] test: Refactored test-code --- .../AbstractStorageStrategyIT.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) 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 2a42a128..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 @@ -46,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); } @@ -88,26 +89,26 @@ 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); } -- 2.20.1