Merge pull request #5957 from element-hq/feature/bma/cleanup2025

Cleanup FFI object fixtures.

features/space/impl/src/test/kotlin/io/element/android/features/space/impl/root/SpaceViewTest.kt

@@ -140,7 +140,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpace
     onRoomClick: (SpaceRoom) -> Unit = EnsureNeverCalledWithParam(),
     onShareSpace: () -> Unit = EnsureNeverCalled(),
     onLeaveSpaceClick: () -> Unit = EnsureNeverCalled(),
-    onDetailsClick: () -> Unit = EnsureNeverCalled(),
+    onSettingsClick: () -> Unit = EnsureNeverCalled(),
     onViewMembersClick: () -> Unit = EnsureNeverCalled(),
     acceptDeclineInviteView: @Composable () -> Unit = {},
 ) {
@@ -151,7 +151,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSpace
             onRoomClick = onRoomClick,
             onShareSpace = onShareSpace,
             onLeaveSpaceClick = onLeaveSpaceClick,
-            onSettingsClick = onDetailsClick,
+            onSettingsClick = onSettingsClick,
             onViewMembersClick = onViewMembersClick,
             acceptDeclineInviteView = acceptDeclineInviteView,
         )

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

@@ -21,14 +21,14 @@ import org.matrix.rustcomponents.sdk.ShieldState
 import org.matrix.rustcomponents.sdk.TimelineItemContent
 import uniffi.matrix_sdk_ui.EventItemOrigin
 
-fun aRustEventTimelineItem(
+internal fun aRustEventTimelineItem(
     isRemote: Boolean = true,
     eventOrTransactionId: EventOrTransactionId = EventOrTransactionId.EventId(AN_EVENT_ID.value),
     sender: String = A_USER_ID.value,
     senderProfile: ProfileDetails = ProfileDetails.Unavailable,
     isOwn: Boolean = true,
     isEditable: Boolean = true,
-    content: TimelineItemContent = aRustTimelineItemMessageContent(),
+    content: TimelineItemContent = aRustTimelineItemContentMsgLike(),
     timestamp: ULong = 0uL,
     debugInfo: EventTimelineItemDebugInfo = anEventTimelineItemDebugInfo(),
     localSendState: EventSendState? = null,

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

@@ -10,7 +10,7 @@ package io.element.android.libraries.matrix.impl.fixtures.factories
 
 import org.matrix.rustcomponents.sdk.EventTimelineItemDebugInfo
 
-fun anEventTimelineItemDebugInfo(
+internal fun anEventTimelineItemDebugInfo(
     model: String = "model",
     originalJson: String? = null,
     latestEditJson: String? = null,

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

@@ -13,6 +13,7 @@ import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimelineEv
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_USER_NAME
 import org.matrix.rustcomponents.sdk.Action
+import org.matrix.rustcomponents.sdk.BatchNotificationResult
 import org.matrix.rustcomponents.sdk.JoinRule
 import org.matrix.rustcomponents.sdk.NotificationEvent
 import org.matrix.rustcomponents.sdk.NotificationItem
@@ -21,7 +22,7 @@ import org.matrix.rustcomponents.sdk.NotificationSenderInfo
 import org.matrix.rustcomponents.sdk.NotificationStatus
 import org.matrix.rustcomponents.sdk.TimelineEvent
 
-fun aRustNotificationItem(
+internal fun aRustNotificationItem(
     event: NotificationEvent = aRustNotificationEventTimeline(),
     senderInfo: NotificationSenderInfo = aRustNotificationSenderInfo(),
     roomInfo: NotificationRoomInfo = aRustNotificationRoomInfo(),
@@ -39,13 +40,13 @@ fun aRustNotificationItem(
     actions = actions,
 )
 
-fun aRustBatchNotificationResult(
+internal fun aRustBatchNotificationResultOk(
     notificationStatus: NotificationStatus = NotificationStatus.Event(aRustNotificationItem()),
-) = org.matrix.rustcomponents.sdk.BatchNotificationResult.Ok(
+) = BatchNotificationResult.Ok(
     status = notificationStatus,
 )
 
-fun aRustNotificationSenderInfo(
+internal fun aRustNotificationSenderInfo(
     displayName: String? = A_USER_NAME,
     avatarUrl: String? = null,
     isNameAmbiguous: Boolean = false,
@@ -55,7 +56,7 @@ fun aRustNotificationSenderInfo(
     isNameAmbiguous = isNameAmbiguous,
 )
 
-fun aRustNotificationRoomInfo(
+internal fun aRustNotificationRoomInfo(
     displayName: String = A_ROOM_NAME,
     avatarUrl: String? = null,
     canonicalAlias: String? = null,
@@ -77,7 +78,7 @@ fun aRustNotificationRoomInfo(
     isSpace = isSpace,
 )
 
-fun aRustNotificationEventTimeline(
+internal fun aRustNotificationEventTimeline(
     event: TimelineEvent = FakeFfiTimelineEvent(),
 ) = NotificationEvent.Timeline(
     event = event,

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

@@ -22,15 +22,13 @@ internal fun aRustRoomDescription(
     joinRule: PublicRoomJoinRule = PublicRoomJoinRule.PUBLIC,
     isWorldReadable: Boolean = true,
     joinedMembers: ULong = 2u,
-): RoomDescription {
-    return RoomDescription(
-        roomId = roomId,
-        name = name,
-        topic = topic,
-        alias = alias,
-        avatarUrl = avatarUrl,
-        joinRule = joinRule,
-        isWorldReadable = isWorldReadable,
-        joinedMembers = joinedMembers,
-    )
-}
+) = RoomDescription(
+    roomId = roomId,
+    name = name,
+    topic = topic,
+    alias = alias,
+    avatarUrl = avatarUrl,
+    joinRule = joinRule,
+    isWorldReadable = isWorldReadable,
+    joinedMembers = joinedMembers,
+)

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

@@ -14,10 +14,8 @@ import org.matrix.rustcomponents.sdk.RoomHero
 
 internal fun aRustRoomHero(
     userId: UserId = A_USER_ID,
-): RoomHero {
-    return RoomHero(
-        userId = userId.value,
-        displayName = "displayName",
-        avatarUrl = "avatarUrl",
-    )
-}
+) = RoomHero(
+    userId = userId.value,
+    displayName = "displayName",
+    avatarUrl = "avatarUrl",
+)

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

@@ -22,7 +22,7 @@ import org.matrix.rustcomponents.sdk.RoomPowerLevels
 import org.matrix.rustcomponents.sdk.SuccessorRoom
 import uniffi.matrix_sdk_base.EncryptionState
 
-fun aRustRoomInfo(
+internal fun aRustRoomInfo(
     id: String = A_ROOM_ID.value,
     displayName: String? = A_ROOM_NAME,
     rawName: String? = A_ROOM_NAME,

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

@@ -14,7 +14,7 @@ import org.matrix.rustcomponents.sdk.PowerLevel
 import org.matrix.rustcomponents.sdk.RoomMember
 import uniffi.matrix_sdk.RoomMemberRole
 
-fun aRustRoomMember(
+internal fun aRustRoomMember(
     userId: UserId,
     displayName: String? = null,
     avatarUrl: String? = null,

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

@@ -11,7 +11,7 @@ package io.element.android.libraries.matrix.impl.fixtures.factories
 import org.matrix.rustcomponents.sdk.RoomNotificationMode
 import org.matrix.rustcomponents.sdk.RoomNotificationSettings
 
-fun aRustRoomNotificationSettings(
+internal fun aRustRoomNotificationSettings(
     mode: RoomNotificationMode = RoomNotificationMode.ALL_MESSAGES,
     isDefault: Boolean = true,
 ) = RoomNotificationSettings(

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

@@ -19,20 +19,18 @@ internal fun aRustRoomPreviewInfo(
     canonicalAlias: String? = A_ROOM_ALIAS.value,
     membership: Membership? = Membership.JOINED,
     joinRule: JoinRule = JoinRule.Public,
-): RoomPreviewInfo {
-    return RoomPreviewInfo(
-        roomId = A_ROOM_ID.value,
-        canonicalAlias = canonicalAlias,
-        name = "name",
-        topic = "topic",
-        avatarUrl = "avatarUrl",
-        numJoinedMembers = 1u,
-        numActiveMembers = 1u,
-        isDirect = false,
-        roomType = RoomType.Room,
-        isHistoryWorldReadable = true,
-        membership = membership,
-        joinRule = joinRule,
-        heroes = null,
-    )
-}
+) = RoomPreviewInfo(
+    roomId = A_ROOM_ID.value,
+    canonicalAlias = canonicalAlias,
+    name = "name",
+    topic = "topic",
+    avatarUrl = "avatarUrl",
+    numJoinedMembers = 1u,
+    numActiveMembers = 1u,
+    isDirect = false,
+    roomType = RoomType.Room,
+    isHistoryWorldReadable = true,
+    membership = membership,
+    joinRule = joinRule,
+    heroes = null,
+)

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

@@ -18,14 +18,12 @@ internal fun aRustSession(
     proxy: SlidingSyncVersion = SlidingSyncVersion.NONE,
     accessToken: String = "accessToken",
     refreshToken: String = "refreshToken",
-): Session {
-    return Session(
-        accessToken = accessToken,
-        refreshToken = refreshToken,
-        userId = A_USER_ID.value,
-        deviceId = A_DEVICE_ID.value,
-        homeserverUrl = A_HOMESERVER_URL,
-        oidcData = null,
-        slidingSyncVersion = proxy,
-    )
-}
+) = Session(
+    accessToken = accessToken,
+    refreshToken = refreshToken,
+    userId = A_USER_ID.value,
+    deviceId = A_DEVICE_ID.value,
+    homeserverUrl = A_HOMESERVER_URL,
+    oidcData = null,
+    slidingSyncVersion = proxy,
+)

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

@@ -16,7 +16,7 @@ import org.matrix.rustcomponents.sdk.RoomHero
 import org.matrix.rustcomponents.sdk.RoomType
 import org.matrix.rustcomponents.sdk.SpaceRoom
 
-fun aRustSpaceRoom(
+internal fun aRustSpaceRoom(
     roomId: RoomId = A_ROOM_ID,
     isDirect: Boolean = false,
     canonicalAlias: String? = null,

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

@@ -15,15 +15,13 @@ import org.matrix.rustcomponents.sdk.MessageType
 import org.matrix.rustcomponents.sdk.TextMessageContent
 import org.matrix.rustcomponents.sdk.TimelineEventContent
 
-fun aRustTimelineEventContentMessageLike(
+internal fun aRustTimelineEventContentMessageLike(
     content: MessageLikeEventContent = aRustMessageLikeEventContentRoomMessage(),
-): TimelineEventContent.MessageLike {
-    return TimelineEventContent.MessageLike(
-        content = content,
-    )
-}
+) = TimelineEventContent.MessageLike(
+    content = content,
+)
 
-fun aRustMessageLikeEventContentRoomMessage(
+internal fun aRustMessageLikeEventContentRoomMessage(
     messageType: MessageType = aRustMessageTypeText(),
     inReplyToEventId: String? = null,
 ) = MessageLikeEventContent.RoomMessage(
@@ -31,13 +29,13 @@ fun aRustMessageLikeEventContentRoomMessage(
     inReplyToEventId = inReplyToEventId,
 )
 
-fun aRustMessageTypeText(
+internal fun aRustMessageTypeText(
     content: TextMessageContent = aRustTextMessageContent(),
 ) = MessageType.Text(
     content = content,
 )
 
-fun aRustTextMessageContent(
+internal fun aRustTextMessageContent(
     body: String = A_MESSAGE,
     formatted: FormattedBody? = null,
 ) = TextMessageContent(

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

@@ -15,7 +15,9 @@ import org.matrix.rustcomponents.sdk.MsgLikeKind
 import org.matrix.rustcomponents.sdk.TextMessageContent
 import org.matrix.rustcomponents.sdk.TimelineItemContent
 
-fun aRustTimelineItemMessageContent(body: String = "Hello") = TimelineItemContent.MsgLike(
+internal fun aRustTimelineItemContentMsgLike(
+    body: String = "Hello",
+) = TimelineItemContent.MsgLike(
     content = MsgLikeContent(
         kind = MsgLikeKind.Message(
             content = MessageContent(

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

@@ -19,14 +19,12 @@ internal fun aRustUnableToDecryptInfo(
     userTrustsOwnIdentity: Boolean = false,
     senderHomeserver: String = "",
     ownHomeserver: String = "",
-): UnableToDecryptInfo {
-    return UnableToDecryptInfo(
-        eventId = eventId,
-        timeToDecryptMs = timeToDecryptMs,
-        cause = cause,
-        eventLocalAgeMillis = eventLocalAgeMillis,
-        userTrustsOwnIdentity = userTrustsOwnIdentity,
-        senderHomeserver = senderHomeserver,
-        ownHomeserver = ownHomeserver,
-    )
-}
+) = UnableToDecryptInfo(
+    eventId = eventId,
+    timeToDecryptMs = timeToDecryptMs,
+    cause = cause,
+    eventLocalAgeMillis = eventLocalAgeMillis,
+    userTrustsOwnIdentity = userTrustsOwnIdentity,
+    senderHomeserver = senderHomeserver,
+    ownHomeserver = ownHomeserver,
+)

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

@@ -11,7 +11,7 @@ package io.element.android.libraries.matrix.impl.fixtures.factories
 import io.element.android.libraries.matrix.test.A_USER_ID
 import org.matrix.rustcomponents.sdk.UserProfile
 
-fun aRustUserProfile(
+internal fun aRustUserProfile(
     userId: String = A_USER_ID.value,
     displayName: String = "displayName",
     avatarUrl: String = "avatarUrl",

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationServiceTest.kt

@@ -12,7 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.exception.NotificationResolverException
 import io.element.android.libraries.matrix.api.notification.NotificationContent
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
-import io.element.android.libraries.matrix.impl.fixtures.factories.aRustBatchNotificationResult
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustBatchNotificationResultOk
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustNotificationEventTimeline
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustNotificationItem
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiNotificationClient
@@ -38,7 +38,7 @@ class RustNotificationServiceTest {
     @Test
     fun test() = runTest {
         val notificationClient = FakeFfiNotificationClient(
-            notificationItemResult = mapOf(AN_EVENT_ID.value to aRustBatchNotificationResult()),
+            notificationItemResult = mapOf(AN_EVENT_ID.value to aRustBatchNotificationResultOk()),
         )
         val sut = createRustNotificationService(
             notificationClient = notificationClient,
@@ -66,10 +66,10 @@ class RustNotificationServiceTest {
         }
         val notificationClient = FakeFfiNotificationClient(
             notificationItemResult = mapOf(
-                AN_EVENT_ID.value to aRustBatchNotificationResult(
+                AN_EVENT_ID.value to aRustBatchNotificationResultOk(
                     notificationStatus = NotificationStatus.Event(aRustNotificationItem(aRustNotificationEventTimeline(faultyEvent)))
                 ),
-                AN_EVENT_ID_2.value to aRustBatchNotificationResult()
+                AN_EVENT_ID_2.value to aRustBatchNotificationResultOk()
             ),
         )
         val sut = createRustNotificationService(