fix test compilation

This commit is contained in:
Valere 2025-09-17 15:53:14 +02:00
parent 9c11444cc7
commit ac7e1d6dc3
6 changed files with 13 additions and 6 deletions

View file

@ -30,6 +30,7 @@ fun aCallNotificationData(
avatarUrl: String? = AN_AVATAR_URL, avatarUrl: String? = AN_AVATAR_URL,
notificationChannelId: String = "channel_id", notificationChannelId: String = "channel_id",
timestamp: Long = 0L, timestamp: Long = 0L,
expirationTimestamp: Long = 0L,
textContent: String? = null, textContent: String? = null,
): CallNotificationData = CallNotificationData( ): CallNotificationData = CallNotificationData(
sessionId = sessionId, sessionId = sessionId,
@ -41,5 +42,6 @@ fun aCallNotificationData(
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
notificationChannelId = notificationChannelId, notificationChannelId = notificationChannelId,
timestamp = timestamp, timestamp = timestamp,
expirationTimestamp = expirationTimestamp,
textContent = textContent, textContent = textContent,
) )

View file

@ -38,6 +38,7 @@ class FakeElementCallEntryPoint(
senderName: String?, senderName: String?,
avatarUrl: String?, avatarUrl: String?,
timestamp: Long, timestamp: Long,
expirationTimestamp: Long,
notificationChannelId: String, notificationChannelId: String,
textContent: String?, textContent: String?,
) { ) {

View file

@ -61,11 +61,12 @@ class DefaultCallNotificationEventResolverTest {
isUpdated = false, isUpdated = false,
senderDisambiguatedDisplayName = A_USER_NAME_2, senderDisambiguatedDisplayName = A_USER_NAME_2,
senderAvatarUrl = null, senderAvatarUrl = null,
expirationTimestamp = 1567L,
callNotifyType = CallNotifyType.RING, callNotifyType = CallNotifyType.RING,
) )
val notificationData = aNotificationData( val notificationData = aNotificationData(
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING) content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING, 1567)
) )
val result = resolver.resolveEvent(A_SESSION_ID, notificationData) val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
assertThat(result.getOrNull()).isEqualTo(expectedResult) assertThat(result.getOrNull()).isEqualTo(expectedResult)
@ -109,7 +110,7 @@ class DefaultCallNotificationEventResolverTest {
) )
val notificationData = aNotificationData( val notificationData = aNotificationData(
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.NOTIFY) content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.NOTIFY, 0)
) )
val result = resolver.resolveEvent(A_SESSION_ID, notificationData) val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
assertThat(result.getOrNull()).isEqualTo(expectedResult) assertThat(result.getOrNull()).isEqualTo(expectedResult)
@ -153,7 +154,7 @@ class DefaultCallNotificationEventResolverTest {
) )
val notificationData = aNotificationData( val notificationData = aNotificationData(
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING) content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING, 0)
) )
val result = resolver.resolveEvent(A_SESSION_ID, notificationData) val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
assertThat(result.getOrNull()).isEqualTo(expectedResult) assertThat(result.getOrNull()).isEqualTo(expectedResult)

View file

@ -695,7 +695,8 @@ class DefaultNotifiableEventResolverTest {
AN_EVENT_ID to Result.success(aNotificationData( AN_EVENT_ID to Result.success(aNotificationData(
content = NotificationContent.MessageLike.CallNotify( content = NotificationContent.MessageLike.CallNotify(
A_USER_ID_2, A_USER_ID_2,
CallNotifyType.NOTIFY CallNotifyType.NOTIFY,
0
), ),
)) ))
) )
@ -719,7 +720,7 @@ class DefaultNotifiableEventResolverTest {
isRedacted = false, isRedacted = false,
imageUriString = null, imageUriString = null,
imageMimeType = null, imageMimeType = null,
type = EventType.CALL_NOTIFY, type = EventType.RTC_NOTIFICATION,
) )
) )
callNotificationEventResolver.resolveEventLambda = { _, _, _ -> Result.success(expectedResult.notifiableEvent) } callNotificationEventResolver.resolveEventLambda = { _, _, _ -> Result.success(expectedResult.notifiableEvent) }

View file

@ -121,6 +121,7 @@ fun aNotifiableCallEvent(
senderAvatarUrl: String? = AN_AVATAR_URL, senderAvatarUrl: String? = AN_AVATAR_URL,
callNotifyType: CallNotifyType = CallNotifyType.NOTIFY, callNotifyType: CallNotifyType = CallNotifyType.NOTIFY,
timestamp: Long = 0L, timestamp: Long = 0L,
expirationTimestamp: Long = 0L,
) = NotifiableRingingCallEvent( ) = NotifiableRingingCallEvent(
sessionId = sessionId, sessionId = sessionId,
eventId = eventId, eventId = eventId,
@ -129,6 +130,7 @@ fun aNotifiableCallEvent(
editedEventId = null, editedEventId = null,
description = "description", description = "description",
timestamp = timestamp, timestamp = timestamp,
expirationTimestamp = expirationTimestamp,
canBeReplaced = false, canBeReplaced = false,
isRedacted = false, isRedacted = false,
isUpdated = false, isUpdated = false,

View file

@ -440,7 +440,7 @@ class DefaultPushHandlerTest {
onNotifiableEventsReceived = onNotifiableEventsReceived, onNotifiableEventsReceived = onNotifiableEventsReceived,
notifiableEventsResult = { _, _ -> notifiableEventsResult = { _, _ ->
val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, A_PUSHER_INFO) val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, A_PUSHER_INFO)
Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent(type = EventType.CALL_NOTIFY))))) Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent(type = EventType.RTC_NOTIFICATION)))))
}, },
incrementPushCounterResult = {}, incrementPushCounterResult = {},
pushClientSecret = FakePushClientSecret( pushClientSecret = FakePushClientSecret(