Merge pull request #3488 from element-hq/feature/bma/cleanupAndFixtures

Cleanup and fixtures for SDK classes.

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt

@@ -251,18 +251,17 @@ class RustMatrixAuthenticationService @Inject constructor(
                     oidcConfiguration = oidcConfiguration,
                     progressListener = progressListener,
                 )
-
+                val sessionData = client.use { rustClient ->
-                client.use { rustClient ->
+                    rustClient.session()
-                    val sessionData = rustClient.session()
                         .toSessionData(
                             isTokenValid = true,
                             loginType = LoginType.QR,
                             passphrase = pendingPassphrase,
                             sessionPaths = emptySessionPaths,
                         )
-                    sessionStore.storeData(sessionData)
-                    SessionId(sessionData.userId)
                 }
+                sessionStore.storeData(sessionData)
+                SessionId(sessionData.userId)
             }.mapFailure {
                 when (it) {
                     is QrCodeDecodeException -> QrErrorMapper.map(it)
@@ -285,14 +284,14 @@ class RustMatrixAuthenticationService @Inject constructor(
         if (slidingSyncType is ClientBuilderSlidingSync.Simplified) {
             Timber.d("Creating client with simplified sliding sync")
             try {
-               return rustMatrixClientFactory
+                return rustMatrixClientFactory
-                   .getBaseClientBuilder(
+                    .getBaseClientBuilder(
-                       sessionPaths = sessionPaths,
+                        sessionPaths = sessionPaths,
-                       passphrase = pendingPassphrase,
+                        passphrase = pendingPassphrase,
-                       slidingSyncType = slidingSyncType,
+                        slidingSyncType = slidingSyncType,
-                   )
+                    )
-                   .run { config() }
+                    .config()
-                   .build()
+                    .build()
             } catch (e: HumanQrLoginException.SlidingSyncNotAvailable) {
                 Timber.e(e, "Failed to create client with simplified sliding sync, trying with Proxy now")
             }
@@ -304,7 +303,7 @@ class RustMatrixAuthenticationService @Inject constructor(
                 passphrase = pendingPassphrase,
                 slidingSyncType = getSlidingSyncProxy(),
             )
-            .run { config() }
+            .config()
             .build()
     }
 

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/verification/RustSessionVerificationService.kt

@@ -206,6 +206,7 @@ class RustSessionVerificationService(
             }
         }
     }
+
     private suspend fun updateVerificationStatus() {
         if (verificationFlowState.value == VerificationFlowState.Finished) {
             // Calling `encryptionService.verificationState()` performs a network call and it will deadlock if there is no network

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/FakeRustRoom.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.tests.testutils.lambda.lambdaError
+import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.Room
+import org.matrix.rustcomponents.sdk.RoomMembersIterator
+
+class FakeRustRoom(
+    private val roomId: RoomId = A_ROOM_ID,
+    private val getMembers: () -> RoomMembersIterator = { lambdaError() },
+    private val getMembersNoSync: () -> RoomMembersIterator = { lambdaError() },
+) : Room(NoPointer) {
+    override fun id(): String {
+        return roomId.value
+    }
+
+    override suspend fun members(): RoomMembersIterator {
+        return getMembers()
+    }
+
+    override suspend fun membersNoSync(): RoomMembersIterator {
+        return getMembersNoSync()
+    }
+
+    override fun close() {
+        // No-op
+    }
+}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/FakeRustRoomListItem.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures
+
+import io.element.android.libraries.matrix.api.core.RoomId
+import org.matrix.rustcomponents.sdk.EventTimelineItem
+import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.RoomInfo
+import org.matrix.rustcomponents.sdk.RoomListItem
+
+class FakeRustRoomListItem(
+    private val roomId: RoomId,
+    private val roomInfo: RoomInfo = aRustRoomInfo(id = roomId.value),
+    private val latestEvent: EventTimelineItem? = null,
+) : RoomListItem(NoPointer) {
+    override fun id(): String {
+        return roomId.value
+    }
+
+    override suspend fun roomInfo(): RoomInfo {
+        return roomInfo
+    }
+
+    override suspend fun latestEvent(): EventTimelineItem? {
+        return latestEvent
+    }
+}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/FakeRustRoomMembersIterator.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures
+
+import org.matrix.rustcomponents.sdk.NoPointer
+import org.matrix.rustcomponents.sdk.RoomMember
+import org.matrix.rustcomponents.sdk.RoomMembersIterator
+
+class FakeRustRoomMembersIterator(
+    private var members: List<RoomMember>? = null
+) : RoomMembersIterator(NoPointer) {
+    override fun len(): UInt {
+        return members?.size?.toUInt() ?: 0u
+    }
+
+    override fun nextChunk(chunkSize: UInt): List<RoomMember>? {
+        if (members?.isEmpty() == true) {
+            return null
+        }
+        return members?.let {
+            val result = it.take(chunkSize.toInt())
+            members = it.subList(result.size, it.size)
+            result
+        }
+    }
+}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/RustRoomInfo.kt

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import org.matrix.rustcomponents.sdk.Membership
+import org.matrix.rustcomponents.sdk.RoomHero
+import org.matrix.rustcomponents.sdk.RoomInfo
+import org.matrix.rustcomponents.sdk.RoomMember
+import org.matrix.rustcomponents.sdk.RoomNotificationMode
+
+fun aRustRoomInfo(
+    id: String = A_ROOM_ID.value,
+    displayName: String = A_ROOM_NAME,
+    rawName: String = A_ROOM_NAME,
+    topic: String? = null,
+    avatarUrl: String? = null,
+    isDirect: Boolean = false,
+    isPublic: Boolean = false,
+    isSpace: Boolean = false,
+    isTombstoned: Boolean = false,
+    isFavourite: Boolean = false,
+    canonicalAlias: String? = null,
+    alternativeAliases: List<String> = listOf(),
+    membership: Membership = Membership.JOINED,
+    inviter: RoomMember? = null,
+    heroes: List<RoomHero> = listOf(),
+    activeMembersCount: ULong = 0uL,
+    invitedMembersCount: ULong = 0uL,
+    joinedMembersCount: ULong = 0uL,
+    userPowerLevels: Map<String, Long> = mapOf(),
+    highlightCount: ULong = 0uL,
+    notificationCount: ULong = 0uL,
+    userDefinedNotificationMode: RoomNotificationMode? = null,
+    hasRoomCall: Boolean = false,
+    activeRoomCallParticipants: List<String> = listOf(),
+    isMarkedUnread: Boolean = false,
+    numUnreadMessages: ULong = 0uL,
+    numUnreadNotifications: ULong = 0uL,
+    numUnreadMentions: ULong = 0uL,
+    pinnedEventIds: List<String> = listOf(),
+    roomCreator: UserId? = null,
+) = RoomInfo(
+    id = id,
+    displayName = displayName,
+    rawName = rawName,
+    topic = topic,
+    avatarUrl = avatarUrl,
+    isDirect = isDirect,
+    isPublic = isPublic,
+    isSpace = isSpace,
+    isTombstoned = isTombstoned,
+    isFavourite = isFavourite,
+    canonicalAlias = canonicalAlias,
+    alternativeAliases = alternativeAliases,
+    membership = membership,
+    inviter = inviter,
+    heroes = heroes,
+    activeMembersCount = activeMembersCount,
+    invitedMembersCount = invitedMembersCount,
+    joinedMembersCount = joinedMembersCount,
+    userPowerLevels = userPowerLevels,
+    highlightCount = highlightCount,
+    notificationCount = notificationCount,
+    cachedUserDefinedNotificationMode = userDefinedNotificationMode,
+    hasRoomCall = hasRoomCall,
+    activeRoomCallParticipants = activeRoomCallParticipants,
+    isMarkedUnread = isMarkedUnread,
+    numUnreadMessages = numUnreadMessages,
+    numUnreadNotifications = numUnreadNotifications,
+    numUnreadMentions = numUnreadMentions,
+    pinnedEventIds = pinnedEventIds,
+    creator = roomCreator?.value,
+)

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/RustRoomMember.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures
+
+import io.element.android.libraries.matrix.api.core.UserId
+import org.matrix.rustcomponents.sdk.MembershipState
+import org.matrix.rustcomponents.sdk.RoomMember
+import uniffi.matrix_sdk.RoomMemberRole
+
+fun aRustRoomMember(
+    userId: UserId,
+    displayName: String? = null,
+    avatarUrl: String? = null,
+    membership: MembershipState = MembershipState.JOIN,
+    isNameAmbiguous: Boolean = false,
+    powerLevel: Long = 0L,
+    isIgnored: Boolean = false,
+    role: RoomMemberRole = RoomMemberRole.USER,
+) = RoomMember(
+    userId = userId.value,
+    displayName = displayName,
+    avatarUrl = avatarUrl,
+    membership = membership,
+    isNameAmbiguous = isNameAmbiguous,
+    powerLevel = powerLevel,
+    normalizedPowerLevel = powerLevel,
+    isIgnored = isIgnored,
+    suggestedRoleForPowerLevel = role,
+)

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt

@@ -9,13 +9,14 @@ package io.element.android.libraries.matrix.impl.room.member
 
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.roomMembers
+import io.element.android.libraries.matrix.impl.fixtures.FakeRustRoom
+import io.element.android.libraries.matrix.impl.fixtures.FakeRustRoomMembersIterator
+import io.element.android.libraries.matrix.impl.fixtures.aRustRoomMember
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher.Source.CACHE
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher.Source.CACHE_AND_SERVER
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher.Source.SERVER
-import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID_3
@@ -23,22 +24,16 @@ import io.element.android.libraries.matrix.test.A_USER_ID_4
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.MembershipState
-import org.matrix.rustcomponents.sdk.NoPointer
-import org.matrix.rustcomponents.sdk.Room
-import org.matrix.rustcomponents.sdk.RoomMember
-import org.matrix.rustcomponents.sdk.RoomMembersIterator
-import uniffi.matrix_sdk.RoomMemberRole
 
 class RoomMemberListFetcherTest {
     @Test
     fun `fetchRoomMembers with CACHE source - emits cached members, if any`() = runTest {
         val room = FakeRustRoom(getMembersNoSync = {
-            FakeRoomMembersIterator(
+            FakeRustRoomMembersIterator(
                 listOf(
-                    fakeRustRoomMember(A_USER_ID),
+                    aRustRoomMember(A_USER_ID),
-                    fakeRustRoomMember(A_USER_ID_2),
+                    aRustRoomMember(A_USER_ID_2),
-                    fakeRustRoomMember(A_USER_ID_3),
+                    aRustRoomMember(A_USER_ID_3),
                 )
             )
         })
@@ -55,17 +50,13 @@ class RoomMemberListFetcherTest {
             val cachedItemsState = awaitItem()
             assertThat(cachedItemsState).isInstanceOf(MatrixRoomMembersState.Ready::class.java)
             assertThat((cachedItemsState as? MatrixRoomMembersState.Ready)?.roomMembers).hasSize(3)
-
-            // Assert only the 'no sync' method was called, so no new member sync happened
-            assertThat(room.membersNoSyncCallCount).isEqualTo(1)
-            assertThat(room.membersCallCount).isEqualTo(0)
         }
     }
 
     @Test
     fun `fetchRoomMembers with CACHE source - emits empty list, if no members exist`() = runTest {
         val room = FakeRustRoom(getMembersNoSync = {
-            FakeRoomMembersIterator(emptyList())
+            FakeRustRoomMembersIterator(emptyList())
         })
 
         val fetcher = RoomMemberListFetcher(room, Dispatchers.Default)
@@ -95,11 +86,11 @@ class RoomMemberListFetcherTest {
     @Test
     fun `fetchRoomMembers with CACHE source - emits all items at once`() = runTest {
         val room = FakeRustRoom(getMembersNoSync = {
-            FakeRoomMembersIterator(
+            FakeRustRoomMembersIterator(
                 listOf(
-                    fakeRustRoomMember(A_USER_ID),
+                    aRustRoomMember(A_USER_ID),
-                    fakeRustRoomMember(A_USER_ID_2),
+                    aRustRoomMember(A_USER_ID_2),
-                    fakeRustRoomMember(A_USER_ID_3),
+                    aRustRoomMember(A_USER_ID_3),
                 )
             )
         })
@@ -122,11 +113,11 @@ class RoomMemberListFetcherTest {
     @Test
     fun `fetchRoomMembers with SERVER source - emits only new members, if any`() = runTest {
         val room = FakeRustRoom(getMembers = {
-            FakeRoomMembersIterator(
+            FakeRustRoomMembersIterator(
                 listOf(
-                    fakeRustRoomMember(A_USER_ID),
+                    aRustRoomMember(A_USER_ID),
-                    fakeRustRoomMember(A_USER_ID_2),
+                    aRustRoomMember(A_USER_ID_2),
-                    fakeRustRoomMember(A_USER_ID_3),
+                    aRustRoomMember(A_USER_ID_3),
                 )
             )
         })
@@ -138,10 +129,6 @@ class RoomMemberListFetcherTest {
             assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
             assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
             assertThat((awaitItem() as? MatrixRoomMembersState.Ready)?.roomMembers?.size).isEqualTo(3)
-
-            // Assert only the 'sync' method was called, so a new member sync happened
-            assertThat(room.membersNoSyncCallCount).isEqualTo(0)
-            assertThat(room.membersCallCount).isEqualTo(1)
         }
     }
 
@@ -163,14 +150,14 @@ class RoomMemberListFetcherTest {
     fun `fetchRoomMembers with CACHE_AND_SERVER source - returns cached items first, then new ones`() = runTest {
         val room = FakeRustRoom(
             getMembersNoSync = {
-                FakeRoomMembersIterator(listOf(fakeRustRoomMember(A_USER_ID_4)))
+                FakeRustRoomMembersIterator(listOf(aRustRoomMember(A_USER_ID_4)))
             },
             getMembers = {
-                FakeRoomMembersIterator(
+                FakeRustRoomMembersIterator(
                     listOf(
-                        fakeRustRoomMember(A_USER_ID),
+                        aRustRoomMember(A_USER_ID),
-                        fakeRustRoomMember(A_USER_ID_2),
+                        aRustRoomMember(A_USER_ID_2),
-                        fakeRustRoomMember(A_USER_ID_3),
+                        aRustRoomMember(A_USER_ID_3),
                     )
                 )
             }
@@ -196,76 +183,6 @@ class RoomMemberListFetcherTest {
                 assertThat(ready).isInstanceOf(MatrixRoomMembersState.Ready::class.java)
                 assertThat(ready.roomMembers()).hasSize(3)
             }
-
-            // Assert both member methods were called, so both the cache was hit and a new member sync happened
-            assertThat(room.membersNoSyncCallCount).isEqualTo(1)
-            assertThat(room.membersCallCount).isEqualTo(1)
         }
     }
 }
-
-class FakeRustRoom(
-    private val getMembers: () -> RoomMembersIterator = { FakeRoomMembersIterator() },
-    private val getMembersNoSync: () -> RoomMembersIterator = { FakeRoomMembersIterator() },
-) : Room(NoPointer) {
-    var membersCallCount = 0
-    var membersNoSyncCallCount = 0
-
-    override fun id(): String {
-        return A_ROOM_ID.value
-    }
-
-    override suspend fun members(): RoomMembersIterator {
-        membersCallCount++
-        return getMembers()
-    }
-
-    override suspend fun membersNoSync(): RoomMembersIterator {
-        membersNoSyncCallCount++
-        return getMembersNoSync()
-    }
-
-    override fun close() {
-        // No-op
-    }
-}
-
-class FakeRoomMembersIterator(
-    private var members: List<RoomMember>? = null
-) : RoomMembersIterator(NoPointer) {
-    override fun len(): UInt {
-        return members?.size?.toUInt() ?: 0u
-    }
-
-    override fun nextChunk(chunkSize: UInt): List<RoomMember>? {
-        if (members?.isEmpty() == true) {
-            return null
-        }
-        return members?.let {
-            val result = it.take(chunkSize.toInt())
-            members = it.subList(result.size, it.size)
-            result
-        }
-    }
-}
-
-private fun fakeRustRoomMember(
-    userId: UserId,
-    displayName: String? = null,
-    avatarUrl: String? = null,
-    membership: MembershipState = MembershipState.JOIN,
-    isNameAmbiguous: Boolean = false,
-    powerLevel: Long = 0L,
-    isIgnored: Boolean = false,
-    role: RoomMemberRole = RoomMemberRole.USER,
-) = RoomMember(
-    userId = userId.value,
-    displayName = displayName,
-    avatarUrl = avatarUrl,
-    membership = membership,
-    isNameAmbiguous = isNameAmbiguous,
-    powerLevel = powerLevel,
-    normalizedPowerLevel = powerLevel,
-    isIgnored = isIgnored,
-    suggestedRoleForPowerLevel = role,
-)

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryListProcessorTest.kt

@@ -9,12 +9,10 @@ package io.element.android.libraries.matrix.impl.roomlist
 
 import com.google.common.truth.Truth.assertThat
 import com.sun.jna.Pointer
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
+import io.element.android.libraries.matrix.impl.fixtures.FakeRustRoomListItem
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID_2
-import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -22,19 +20,12 @@ import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.EventTimelineItem
-import org.matrix.rustcomponents.sdk.Membership
-import org.matrix.rustcomponents.sdk.NoPointer
-import org.matrix.rustcomponents.sdk.RoomHero
-import org.matrix.rustcomponents.sdk.RoomInfo
 import org.matrix.rustcomponents.sdk.RoomList
 import org.matrix.rustcomponents.sdk.RoomListEntriesUpdate
 import org.matrix.rustcomponents.sdk.RoomListItem
 import org.matrix.rustcomponents.sdk.RoomListServiceInterface
 import org.matrix.rustcomponents.sdk.RoomListServiceStateListener
 import org.matrix.rustcomponents.sdk.RoomListServiceSyncIndicatorListener
-import org.matrix.rustcomponents.sdk.RoomMember
-import org.matrix.rustcomponents.sdk.RoomNotificationMode
 import org.matrix.rustcomponents.sdk.RoomSubscription
 import org.matrix.rustcomponents.sdk.TaskHandle
 
@@ -48,7 +39,7 @@ class RoomSummaryListProcessorTest {
         summaries.value = listOf(aRoomSummary())
         val processor = createProcessor()
 
-        val newEntry = FakeRoomListItem(A_ROOM_ID_2)
+        val newEntry = FakeRustRoomListItem(A_ROOM_ID_2)
         processor.postUpdate(listOf(RoomListEntriesUpdate.Append(listOf(newEntry, newEntry, newEntry))))
 
         assertThat(summaries.value.count()).isEqualTo(4)
@@ -59,7 +50,7 @@ class RoomSummaryListProcessorTest {
     fun `PushBack adds a new entry at the end of the list`() = runTest {
         summaries.value = listOf(aRoomSummaryFilled())
         val processor = createProcessor()
-        processor.postUpdate(listOf(RoomListEntriesUpdate.PushBack(FakeRoomListItem(A_ROOM_ID_2))))
+        processor.postUpdate(listOf(RoomListEntriesUpdate.PushBack(FakeRustRoomListItem(A_ROOM_ID_2))))
 
         assertThat(summaries.value.count()).isEqualTo(2)
         assertThat(summaries.value.last().roomId).isEqualTo(A_ROOM_ID_2)
@@ -69,7 +60,7 @@ class RoomSummaryListProcessorTest {
     fun `PushFront inserts a new entry at the start of the list`() = runTest {
         summaries.value = listOf(aRoomSummaryFilled())
         val processor = createProcessor()
-        processor.postUpdate(listOf(RoomListEntriesUpdate.PushFront(FakeRoomListItem(A_ROOM_ID_2))))
+        processor.postUpdate(listOf(RoomListEntriesUpdate.PushFront(FakeRustRoomListItem(A_ROOM_ID_2))))
 
         assertThat(summaries.value.count()).isEqualTo(2)
         assertThat(summaries.value.first().roomId).isEqualTo(A_ROOM_ID_2)
@@ -81,7 +72,7 @@ class RoomSummaryListProcessorTest {
         val processor = createProcessor()
         val index = 0
 
-        processor.postUpdate(listOf(RoomListEntriesUpdate.Set(index.toUInt(), FakeRoomListItem(A_ROOM_ID_2))))
+        processor.postUpdate(listOf(RoomListEntriesUpdate.Set(index.toUInt(), FakeRustRoomListItem(A_ROOM_ID_2))))
 
         assertThat(summaries.value.count()).isEqualTo(1)
         assertThat(summaries.value[index].roomId).isEqualTo(A_ROOM_ID_2)
@@ -93,7 +84,7 @@ class RoomSummaryListProcessorTest {
         val processor = createProcessor()
         val index = 0
 
-        processor.postUpdate(listOf(RoomListEntriesUpdate.Insert(index.toUInt(), FakeRoomListItem(A_ROOM_ID_2))))
+        processor.postUpdate(listOf(RoomListEntriesUpdate.Insert(index.toUInt(), FakeRustRoomListItem(A_ROOM_ID_2))))
 
         assertThat(summaries.value.count()).isEqualTo(2)
         assertThat(summaries.value[index].roomId).isEqualTo(A_ROOM_ID_2)
@@ -185,85 +176,3 @@ class RoomSummaryListProcessorTest {
         override fun subscribeToRooms(roomIds: List<String>, settings: RoomSubscription?) = Unit
     }
 }
-
-private fun aRustRoomInfo(
-    id: String = A_ROOM_ID.value,
-    displayName: String = A_ROOM_NAME,
-    rawName: String = A_ROOM_NAME,
-    topic: String? = null,
-    avatarUrl: String? = null,
-    isDirect: Boolean = false,
-    isPublic: Boolean = false,
-    isSpace: Boolean = false,
-    isTombstoned: Boolean = false,
-    isFavourite: Boolean = false,
-    canonicalAlias: String? = null,
-    alternativeAliases: List<String> = listOf(),
-    membership: Membership = Membership.JOINED,
-    inviter: RoomMember? = null,
-    heroes: List<RoomHero> = listOf(),
-    activeMembersCount: ULong = 0uL,
-    invitedMembersCount: ULong = 0uL,
-    joinedMembersCount: ULong = 0uL,
-    userPowerLevels: Map<String, Long> = mapOf(),
-    highlightCount: ULong = 0uL,
-    notificationCount: ULong = 0uL,
-    userDefinedNotificationMode: RoomNotificationMode? = null,
-    hasRoomCall: Boolean = false,
-    activeRoomCallParticipants: List<String> = listOf(),
-    isMarkedUnread: Boolean = false,
-    numUnreadMessages: ULong = 0uL,
-    numUnreadNotifications: ULong = 0uL,
-    numUnreadMentions: ULong = 0uL,
-    pinnedEventIds: List<String> = listOf(),
-    roomCreator: UserId? = null,
-) = RoomInfo(
-    id = id,
-    displayName = displayName,
-    rawName = rawName,
-    topic = topic,
-    avatarUrl = avatarUrl,
-    isDirect = isDirect,
-    isPublic = isPublic,
-    isSpace = isSpace,
-    isTombstoned = isTombstoned,
-    isFavourite = isFavourite,
-    canonicalAlias = canonicalAlias,
-    alternativeAliases = alternativeAliases,
-    membership = membership,
-    inviter = inviter,
-    heroes = heroes,
-    activeMembersCount = activeMembersCount,
-    invitedMembersCount = invitedMembersCount,
-    joinedMembersCount = joinedMembersCount,
-    userPowerLevels = userPowerLevels,
-    highlightCount = highlightCount,
-    notificationCount = notificationCount,
-    cachedUserDefinedNotificationMode = userDefinedNotificationMode,
-    hasRoomCall = hasRoomCall,
-    activeRoomCallParticipants = activeRoomCallParticipants,
-    isMarkedUnread = isMarkedUnread,
-    numUnreadMessages = numUnreadMessages,
-    numUnreadNotifications = numUnreadNotifications,
-    numUnreadMentions = numUnreadMentions,
-    pinnedEventIds = pinnedEventIds,
-    creator = roomCreator?.value,
-)
-
-class FakeRoomListItem(
-    private val roomId: RoomId,
-    private val roomInfo: RoomInfo = aRustRoomInfo(id = roomId.value),
-    private val latestEvent: EventTimelineItem? = null,
-) : RoomListItem(NoPointer) {
-    override fun id(): String {
-        return roomId.value
-    }
-
-    override suspend fun roomInfo(): RoomInfo {
-        return roomInfo
-    }
-
-    override suspend fun latestEvent(): EventTimelineItem? {
-        return latestEvent
-    }
-}