Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Ensure factorize follow the same code convention

Browse source
This commit is contained in:
Benoit Marty 2025-12-29 09:37:56 +01:00
parent 46ae4b9f6b
commit 971bcbf0bf
17 changed files with 77 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

0
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevels.kt → libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomPowerLevelsValues.kt
View file

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

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

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

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

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

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

16
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventType.kt → libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineEventContentMessageLike.kt
View file

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

4
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/EventTimelineItemContent.kt → libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/TimelineItemContentMsgLike.kt
View file

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

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

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

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

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

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

@ -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.exception.NotificationResolverException
import io.element.android.libraries.matrix.api.notification.NotificationContent 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.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.aRustNotificationEventTimeline
import io.element.android.libraries.matrix.impl.fixtures.factories.aRustNotificationItem import io.element.android.libraries.matrix.impl.fixtures.factories.aRustNotificationItem
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiNotificationClient import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiNotificationClient
@ -38,7 +38,7 @@ class RustNotificationServiceTest {
@Test @Test
fun test() = runTest { fun test() = runTest {
val notificationClient = FakeFfiNotificationClient( val notificationClient = FakeFfiNotificationClient(
notificationItemResult = mapOf(AN_EVENT_ID.value to aRustBatchNotificationResult()), notificationItemResult = mapOf(AN_EVENT_ID.value to aRustBatchNotificationResultOk()),
) )
val sut = createRustNotificationService( val sut = createRustNotificationService(
notificationClient = notificationClient, notificationClient = notificationClient,
@ -66,10 +66,10 @@ class RustNotificationServiceTest {
} }
val notificationClient = FakeFfiNotificationClient( val notificationClient = FakeFfiNotificationClient(
notificationItemResult = mapOf( notificationItemResult = mapOf(
AN_EVENT_ID.value to aRustBatchNotificationResult( AN_EVENT_ID.value to aRustBatchNotificationResultOk(
notificationStatus = NotificationStatus.Event(aRustNotificationItem(aRustNotificationEventTimeline(faultyEvent))) notificationStatus = NotificationStatus.Event(aRustNotificationItem(aRustNotificationEventTimeline(faultyEvent)))
), ),
AN_EVENT_ID_2.value to aRustBatchNotificationResult() AN_EVENT_ID_2.value to aRustBatchNotificationResultOk()
), ),
) )
val sut = createRustNotificationService( val sut = createRustNotificationService(