Skip to content

Commit 277602f

Browse files
committed
fix test compilation
1 parent d350a55 commit 277602f

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ fun aCallNotificationData(
3030
avatarUrl: String? = AN_AVATAR_URL,
3131
notificationChannelId: String = "channel_id",
3232
timestamp: Long = 0L,
33+
expirationTimestamp: Long = 0L,
3334
textContent: String? = null,
3435
): CallNotificationData = CallNotificationData(
3536
sessionId = sessionId,
@@ -41,5 +42,6 @@ fun aCallNotificationData(
4142
avatarUrl = avatarUrl,
4243
notificationChannelId = notificationChannelId,
4344
timestamp = timestamp,
45+
expirationTimestamp = expirationTimestamp,
4446
textContent = textContent,
4547
)

features/call/test/src/main/kotlin/io/element/android/features/call/test/FakeElementCallEntryPoint.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class FakeElementCallEntryPoint(
3838
senderName: String?,
3939
avatarUrl: String?,
4040
timestamp: Long,
41+
expirationTimestamp: Long,
4142
notificationChannelId: String,
4243
textContent: String?,
4344
) {

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultCallNotificationEventResolverTest.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,12 @@ class DefaultCallNotificationEventResolverTest {
6161
isUpdated = false,
6262
senderDisambiguatedDisplayName = A_USER_NAME_2,
6363
senderAvatarUrl = null,
64+
expirationTimestamp = 1567L,
6465
callNotifyType = CallNotifyType.RING,
6566
)
6667

6768
val notificationData = aNotificationData(
68-
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING)
69+
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING, 1567)
6970
)
7071
val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
7172
assertThat(result.getOrNull()).isEqualTo(expectedResult)
@@ -109,7 +110,7 @@ class DefaultCallNotificationEventResolverTest {
109110
)
110111

111112
val notificationData = aNotificationData(
112-
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.NOTIFY)
113+
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.NOTIFY, 0)
113114
)
114115
val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
115116
assertThat(result.getOrNull()).isEqualTo(expectedResult)
@@ -153,7 +154,7 @@ class DefaultCallNotificationEventResolverTest {
153154
)
154155

155156
val notificationData = aNotificationData(
156-
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING)
157+
content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING, 0)
157158
)
158159
val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
159160
assertThat(result.getOrNull()).isEqualTo(expectedResult)

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,8 @@ class DefaultNotifiableEventResolverTest {
695695
AN_EVENT_ID to Result.success(aNotificationData(
696696
content = NotificationContent.MessageLike.CallNotify(
697697
A_USER_ID_2,
698-
CallNotifyType.NOTIFY
698+
CallNotifyType.NOTIFY,
699+
0
699700
),
700701
))
701702
)
@@ -719,7 +720,7 @@ class DefaultNotifiableEventResolverTest {
719720
isRedacted = false,
720721
imageUriString = null,
721722
imageMimeType = null,
722-
type = EventType.CALL_NOTIFY,
723+
type = EventType.RTC_NOTIFICATION,
723724
)
724725
)
725726
callNotificationEventResolver.resolveEventLambda = { _, _, _ -> Result.success(expectedResult.notifiableEvent) }

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ fun aNotifiableCallEvent(
121121
senderAvatarUrl: String? = AN_AVATAR_URL,
122122
callNotifyType: CallNotifyType = CallNotifyType.NOTIFY,
123123
timestamp: Long = 0L,
124+
expirationTimestamp: Long = 0L,
124125
) = NotifiableRingingCallEvent(
125126
sessionId = sessionId,
126127
eventId = eventId,
@@ -129,6 +130,7 @@ fun aNotifiableCallEvent(
129130
editedEventId = null,
130131
description = "description",
131132
timestamp = timestamp,
133+
expirationTimestamp = expirationTimestamp,
132134
canBeReplaced = false,
133135
isRedacted = false,
134136
isUpdated = false,

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ class DefaultPushHandlerTest {
440440
onNotifiableEventsReceived = onNotifiableEventsReceived,
441441
notifiableEventsResult = { _, _ ->
442442
val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, A_PUSHER_INFO)
443-
Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent(type = EventType.CALL_NOTIFY)))))
443+
Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent(type = EventType.RTC_NOTIFICATION)))))
444444
},
445445
incrementPushCounterResult = {},
446446
pushClientSecret = FakePushClientSecret(

0 commit comments

Comments
 (0)