Added testing - edge cases

Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>

Author: rapterjet2004

app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt

@@ -527,6 +527,93 @@ class ChatBlocksDaoTest {
             assertEquals(2, blocks.size)
         }
 
+    @Test
+    fun testUpsertAndMergeConnectedChatBlocksAdjacentBlocks() =
+        runTest {
+            val user = createUserEntity("account1", "Account 1")
+            usersDao.saveUser(user)
+            val account1 = usersDao.getUserWithUserId("account1").blockingGet()
+
+            conversationsDao.upsertConversations(
+                account1.id,
+                listOf(createConversationEntity(account1.id, "abc", "Conv"))
+            )
+            val conversation = conversationsDao.getConversationsForUser(account1.id).first()[0]
+
+            // Block 10-20
+            chatBlocksDao.upsertChatBlock(
+                ChatBlockEntity(
+                    internalConversationId = conversation.internalId,
+                    accountId = conversation.accountId,
+                    token = conversation.token,
+                    threadId = null,
+                    oldestMessageId = 10,
+                    newestMessageId = 20,
+                    hasHistory = true
+                )
+            )
+
+            // Block 21-30. No overlap, so they stay separate
+            chatBlocksDao.upsertAndMergeConnectedChatBlocks(
+                ChatBlockEntity(
+                    internalConversationId = conversation.internalId,
+                    accountId = conversation.accountId,
+                    token = conversation.token,
+                    threadId = null,
+                    oldestMessageId = 21,
+                    newestMessageId = 30,
+                    hasHistory = true
+                )
+            )
+
+            val blocks = chatBlocksDao.getChatBlocksForConversation(conversation.internalId)
+            assertEquals(2, blocks.size)
+        }
+
+    @Test
+    fun testUpsertAndMergeConnectedChatBlocksOverlapAtBoundary() =
+        runTest {
+            val user = createUserEntity("account1", "Account 1")
+            usersDao.saveUser(user)
+            val account1 = usersDao.getUserWithUserId("account1").blockingGet()
+
+            conversationsDao.upsertConversations(
+                account1.id,
+                listOf(createConversationEntity(account1.id, "abc", "Conv"))
+            )
+            val conversation = conversationsDao.getConversationsForUser(account1.id).first()[0]
+
+            chatBlocksDao.upsertChatBlock(
+                ChatBlockEntity(
+                    internalConversationId = conversation.internalId,
+                    accountId = conversation.accountId,
+                    token = conversation.token,
+                    threadId = null,
+                    oldestMessageId = 10,
+                    newestMessageId = 20,
+                    hasHistory = true
+                )
+            )
+
+            // Inserting 20-30. Boundary 20 is shared.
+            chatBlocksDao.upsertAndMergeConnectedChatBlocks(
+                ChatBlockEntity(
+                    internalConversationId = conversation.internalId,
+                    accountId = conversation.accountId,
+                    token = conversation.token,
+                    threadId = null,
+                    oldestMessageId = 20,
+                    newestMessageId = 30,
+                    hasHistory = true
+                )
+            )
+
+            val blocks = chatBlocksDao.getChatBlocksForConversation(conversation.internalId)
+            assertEquals(1, blocks.size)
+            assertEquals(10L, blocks[0].oldestMessageId)
+            assertEquals(30L, blocks[0].newestMessageId)
+        }
+
     private fun createUserEntity(userId: String, userName: String) =
         UserEntity(
             userId = userId,

app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ConversationsDaoTest.kt

@@ -10,6 +10,8 @@ import android.content.Context
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.nextcloud.talk.chat.data.model.ChatMessage
+import com.nextcloud.talk.data.database.model.ChatMessageEntity
 import com.nextcloud.talk.data.database.model.ConversationEntity
 import com.nextcloud.talk.data.source.local.TalkDatabase
 import com.nextcloud.talk.data.user.UsersDao
@@ -125,6 +127,46 @@ class ConversationsDaoTest {
             assertTrue(list.isEmpty())
         }
 
+    @Test
+    fun upsertConversations_emptyList() =
+        runTest {
+            conversationsDao.upsertConversations(accountId, emptyList())
+            val list = conversationsDao.getConversationsForUser(accountId).first()
+            assertTrue(list.isEmpty())
+        }
+
+    @Test
+    fun cascadeDeletion_deletesMessages() =
+        runTest {
+            val chatMessagesDao = db.chatMessagesDao()
+            val conversation = createConversationEntity(accountId, "token1", "Conv 1")
+            conversationsDao.insertConversation(conversation)
+
+            val message =
+                ChatMessageEntity(
+                    internalId = "${conversation.internalId}@1",
+                    internalConversationId = conversation.internalId,
+                    id = 1,
+                    message = "test message",
+                    accountId = accountId,
+                    token = "token1",
+                    actorId = "user1",
+                    actorType = "users",
+                    actorDisplayName = "User 1",
+                    messageType = "comment",
+                    systemMessageType = ChatMessage.SystemMessageType.DUMMY,
+                    timestamp = 1000
+                )
+            chatMessagesDao.upsertChatMessage(message)
+
+            // Delete conversation
+            conversationsDao.deleteConversations(listOf(conversation.internalId))
+
+            // Verify message is also gone
+            val messages = chatMessagesDao.getMessagesForConversation(conversation.internalId, null).first()
+            assertTrue(messages.isEmpty())
+        }
+
     private fun createConversationEntity(accountId: Long, token: String, roomName: String) =
         ConversationEntity(
             internalId = "$accountId@$token",

app/src/androidTest/java/com/nextcloud/talk/data/user/UsersDaoTest.kt

@@ -173,6 +173,25 @@ class UsersDaoTest {
         assertEquals(newState, retrieved.pushConfigurationState)
     }
 
+    @Test
+    fun setActiveNonExistentUser() {
+        val count = usersDao.setUserAsActiveWithId(9999)
+        assertEquals(0, count)
+    }
+
+    @Test
+    fun deleteActiveUser() {
+        val user = createUserEntity("user1", "Account 1", "https://server1.com").apply { current = true }
+        val id = usersDao.saveUser(user)
+        val savedUser = usersDao.getUserWithId(id).blockingGet()
+
+        usersDao.deleteUser(savedUser)
+
+        val active = usersDao.getActiveUser().blockingGet()
+        assertNull(active)
+        assertNull(usersDao.getActiveUserSynchronously())
+    }
+
     private fun createUserEntity(userId: String, userName: String, server: String) =
         UserEntity(
             userId = userId,