From 7398f6e246db11d4e79481c8c1796a0e6e60e0dd Mon Sep 17 00:00:00 2001
From: Jakub Zerko <iot.zerko@gmail.com>
Date: Mon, 13 Jan 2025 11:18:19 +0100
Subject: [PATCH] test fixes

---
 .../wire/kalium/persistence/dao/message/MessageDAOTest.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt
index 809ec882a3..a0ea8d2220 100644
--- a/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt
+++ b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/message/MessageDAOTest.kt
@@ -2350,7 +2350,6 @@ class MessageDAOTest : BaseDatabaseTest() {
     }
 
     @Test
-<<<<<<< HEAD
     fun givenMessagesAndUsersAreInserted_whenGettingSenderNameByMessageId_thenOnlyRelevantNameReturned() = runTest {
         insertInitialData()
 
@@ -2458,7 +2457,9 @@ class MessageDAOTest : BaseDatabaseTest() {
         val result = messageDAO.getNextAudioMessageInConversation("1", conversationEntity1.id)
 
         assertEquals("3", result)
-=======
+    }
+
+    @Test
     fun givenAllTypesOfMessages_whenMovingToAnotherConversation_thenItSucceeds() = runTest {
         // Given
         insertInitialData()
@@ -2482,7 +2483,6 @@ class MessageDAOTest : BaseDatabaseTest() {
         assertNull(exception, "Expected no exception but got: ${exception?.message}")
         val result = messageDAO.getMessagesByConversationAndVisibility(conversationEntity2.id, 100, 0).first()
         assertEquals(messages.size, result.size)
->>>>>>> 3b9629000e (fix: messages migration from proteus to mls (#3218))
     }
 
     private suspend fun insertInitialData() {