fix tests

2026-03-04 19:07:53 +01:00
parent c1171c5074
commit b26728309a
12 changed files with 89 additions and 27 deletions
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
@@ -146,7 +146,6 @@ class DefaultActiveCallManager(
                callType = CallType.RoomCall(
                    sessionId = notificationData.sessionId,
                    roomId = notificationData.roomId,
-                    // TODO
                    isAudioCall = notificationData.audioOnly,
                ),
                callState = CallState.Ringing(notificationData),
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/DefaultElementCallEntryPointTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/DefaultElementCallEntryPointTest.kt
@@ -37,7 +37,7 @@ class DefaultElementCallEntryPointTest {
    @Test
    fun `startCall - starts ElementCallActivity setup with the needed extras`() = runTest {
        val entryPoint = createEntryPoint()
-        entryPoint.startCall(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID))
+        entryPoint.startCall(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, isAudioCall = false))

        val expectedIntent = Intent(InstrumentationRegistry.getInstrumentation().targetContext, ElementCallActivity::class.java)
        val intent = shadowOf(RuntimeEnvironment.getApplication()).nextStartedActivity
@@ -53,7 +53,7 @@ class DefaultElementCallEntryPointTest {
        val entryPoint = createEntryPoint(activeCallManager = activeCallManager)

        entryPoint.handleIncomingCall(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, isAudioCall = false),
            eventId = AN_EVENT_ID,
            senderId = A_USER_ID_2,
            roomName = "roomName",
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/notifications/RingingCallNotificationCreatorTest.kt
@@ -65,7 +65,33 @@ class RingingCallNotificationCreatorTest {
        getUserIconLambda.assertions().isCalledOnce()
    }

-    private suspend fun RingingCallNotificationCreator.createTestNotification() = createNotification(
+    @Test
+    fun `createNotification - use the correct style for video call`() = runTest {
+        val notificationCreator = createRingingCallNotificationCreator(
+            matrixClientProvider = FakeMatrixClientProvider(getClient = { Result.success(FakeMatrixClient()) }),
+        )
+
+        val notification = notificationCreator.createTestNotification()
+        assertThat(notification?.category).isEqualTo("call")
+
+        val acceptAction = notification?.actions?.get(1)
+        assertThat(acceptAction?.title?.toString()).isEqualTo("Video")
+    }
+
+    @Test
+    fun `createNotification - use the correct style for audio call`() = runTest {
+        val notificationCreator = createRingingCallNotificationCreator(
+            matrixClientProvider = FakeMatrixClientProvider(getClient = { Result.success(FakeMatrixClient()) }),
+        )
+
+        val notification = notificationCreator.createTestNotification(audioOnly = true)
+        assertThat(notification?.category).isEqualTo("call")
+
+        val acceptAction = notification?.actions?.get(1)
+        assertThat(acceptAction?.title?.toString()).isEqualTo("Answer")
+    }
+
+    private suspend fun RingingCallNotificationCreator.createTestNotification(audioOnly: Boolean = false) = createNotification(
        sessionId = A_SESSION_ID,
        roomId = A_ROOM_ID,
        eventId = AN_EVENT_ID,
@@ -77,6 +103,7 @@ class RingingCallNotificationCreatorTest {
        timestamp = 0L,
        expirationTimestamp = 20L,
        textContent = "textContent",
+        audioOnly = audioOnly
    )

    private fun createRingingCallNotificationCreator(
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
@@ -90,7 +90,7 @@ class CallScreenPresenterTest {
        val analyticsLambda = lambdaRecorder<MobileScreen.ScreenName, Unit> {}
        val joinedCallLambda = lambdaRecorder<CallType, Unit> {}
        val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
            widgetDriver = widgetDriver,
            widgetProvider = widgetProvider,
            screenTracker = FakeScreenTracker(analyticsLambda),
@@ -123,7 +123,7 @@ class CallScreenPresenterTest {
    fun `present - set message interceptor, send and receive messages`() = runTest {
        val widgetDriver = FakeMatrixWidgetDriver()
        val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
            widgetDriver = widgetDriver,
            screenTracker = FakeScreenTracker {},
        )
@@ -154,7 +154,7 @@ class CallScreenPresenterTest {
        val navigator = FakeCallScreenNavigator()
        val widgetDriver = FakeMatrixWidgetDriver()
        val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
            widgetDriver = widgetDriver,
            navigator = navigator,
            dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
@@ -188,7 +188,7 @@ class CallScreenPresenterTest {
        val navigator = FakeCallScreenNavigator()
        val widgetDriver = FakeMatrixWidgetDriver()
        val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
            widgetDriver = widgetDriver,
            navigator = navigator,
            dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
@@ -223,7 +223,7 @@ class CallScreenPresenterTest {
        val navigator = FakeCallScreenNavigator()
        val widgetDriver = FakeMatrixWidgetDriver()
        val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
            widgetDriver = widgetDriver,
            navigator = navigator,
            dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
@@ -260,7 +260,7 @@ class CallScreenPresenterTest {
        val navigator = FakeCallScreenNavigator()
        val widgetDriver = FakeMatrixWidgetDriver()
        val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
            widgetDriver = widgetDriver,
            navigator = navigator,
            dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
@@ -300,7 +300,7 @@ class CallScreenPresenterTest {
        val matrixClient = FakeMatrixClient(syncService = syncService)
        val appForegroundStateService = FakeAppForegroundStateService()
        val presenter = createCallScreenPresenter(
-            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
+            callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false),
            widgetDriver = widgetDriver,
            navigator = navigator,
            dispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallTypeTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallTypeTest.kt
@@ -27,6 +27,7 @@ class CallTypeTest {
            CallType.RoomCall(
                sessionId = A_SESSION_ID,
                roomId = A_ROOM_ID,
+                isAudioCall = false,
            ).getSessionId()
        ).isEqualTo(A_SESSION_ID)
    }
@@ -38,7 +39,7 @@ class CallTypeTest {

    @Test
    fun `RoomCall stringification does not contain the URL`() {
-        assertThat(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID).toString())
-            .isEqualTo("RoomCall(sessionId=$A_SESSION_ID, roomId=$A_ROOM_ID)")
+        assertThat(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, false).toString())
+            .isEqualTo("RoomCall(sessionId=$A_SESSION_ID, roomId=$A_ROOM_ID, isAudioCall=false)")
    }
 }
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
@@ -80,6 +80,7 @@ class DefaultActiveCallManagerTest {
                callType = CallType.RoomCall(
                    sessionId = callNotificationData.sessionId,
                    roomId = callNotificationData.roomId,
+                    isAudioCall = false,
                ),
                callState = CallState.Ringing(callNotificationData)
            )
@@ -91,6 +92,28 @@ class DefaultActiveCallManagerTest {
        verify { notificationManagerCompat.notify(notificationId, any()) }
    }

+    @OptIn(ExperimentalCoroutinesApi::class)
+    @Test
+    fun `registerIncomingCall - sets the incoming audio call as active`() = runTest {
+        setupShadowPowerManager()
+        val notificationManagerCompat = mockk<NotificationManagerCompat>(relaxed = true)
+        val manager = createActiveCallManager(notificationManagerCompat = notificationManagerCompat)
+
+        val callNotificationData = aCallNotificationData(audioOnly = true)
+        manager.registerIncomingCall(callNotificationData)
+
+        assertThat(manager.activeCall.value).isEqualTo(
+            ActiveCall(
+                callType = CallType.RoomCall(
+                    sessionId = callNotificationData.sessionId,
+                    roomId = callNotificationData.roomId,
+                    isAudioCall = true,
+                ),
+                callState = CallState.Ringing(callNotificationData)
+            )
+        )
+    }
+
    @OptIn(ExperimentalCoroutinesApi::class)
    @Test
    fun `registerIncomingCall - when there is an already active call adds missed call notification`() = runTest {
@@ -165,7 +188,7 @@ class DefaultActiveCallManagerTest {
        assertThat(manager.activeCall.value).isNotNull()
        assertThat(manager.activeWakeLock?.isHeld).isTrue()

-        manager.hangUpCall(CallType.RoomCall(notificationData.sessionId, notificationData.roomId))
+        manager.hangUpCall(CallType.RoomCall(notificationData.sessionId, notificationData.roomId, false))
        assertThat(manager.activeCall.value).isNull()
        assertThat(manager.activeWakeLock?.isHeld).isFalse()

@@ -192,7 +215,7 @@ class DefaultActiveCallManagerTest {
        val notificationData = aCallNotificationData(roomId = A_ROOM_ID)
        manager.registerIncomingCall(notificationData)

-        manager.hangUpCall(CallType.RoomCall(notificationData.sessionId, notificationData.roomId))
+        manager.hangUpCall(CallType.RoomCall(notificationData.sessionId, notificationData.roomId, false))

        coVerify {
            room.declineCall(notificationEventId = notificationData.eventId)
@@ -219,7 +242,7 @@ class DefaultActiveCallManagerTest {
        val notificationData = aCallNotificationData(roomId = A_ROOM_ID)
        // Do not register the incoming call, so the manager doesn't know about it
        manager.hangUpCall(
-            callType = CallType.RoomCall(notificationData.sessionId, notificationData.roomId),
+            callType = CallType.RoomCall(notificationData.sessionId, notificationData.roomId, false),
            notificationData = notificationData,
        )
        coVerify {
@@ -321,12 +344,13 @@ class DefaultActiveCallManagerTest {
        val manager = createActiveCallManager(notificationManagerCompat = notificationManagerCompat)
        assertThat(manager.activeCall.value).isNull()

-        manager.joinedCall(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID))
+        manager.joinedCall(CallType.RoomCall(A_SESSION_ID, A_ROOM_ID, true))
        assertThat(manager.activeCall.value).isEqualTo(
            ActiveCall(
                callType = CallType.RoomCall(
                    sessionId = A_SESSION_ID,
                    roomId = A_ROOM_ID,
+                    isAudioCall = true,
                ),
                callState = CallState.InCall,
            )
@@ -429,6 +453,7 @@ class DefaultActiveCallManagerTest {
                callType = CallType.RoomCall(
                    sessionId = callNotificationData.sessionId,
                    roomId = callNotificationData.roomId,
+                    isAudioCall = false,
                ),
                callState = CallState.Ringing(callNotificationData)
            )
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
@@ -31,7 +31,7 @@ class DefaultCallWidgetProviderTest {
    @Test
    fun `getWidget - fails if the session does not exist`() = runTest {
        val provider = createProvider(matrixClientProvider = FakeMatrixClientProvider { Result.failure(Exception("Session not found")) })
-        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").isFailure).isTrue()
+        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, false, "clientId", "languageTag", "theme").isFailure).isTrue()
    }

    @Test
@@ -40,7 +40,7 @@ class DefaultCallWidgetProviderTest {
            givenGetRoomResult(A_ROOM_ID, null)
        }
        val provider = createProvider(matrixClientProvider = FakeMatrixClientProvider { Result.success(client) })
-        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").isFailure).isTrue()
+        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, true, "clientId", "languageTag", "theme").isFailure).isTrue()
    }

    @Test
@@ -52,7 +52,7 @@ class DefaultCallWidgetProviderTest {
            givenGetRoomResult(A_ROOM_ID, room)
        }
        val provider = createProvider(matrixClientProvider = FakeMatrixClientProvider { Result.success(client) })
-        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").isFailure).isTrue()
+        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, false, "clientId", "languageTag", "theme").isFailure).isTrue()
    }

    @Test
@@ -65,7 +65,7 @@ class DefaultCallWidgetProviderTest {
            givenGetRoomResult(A_ROOM_ID, room)
        }
        val provider = createProvider(matrixClientProvider = FakeMatrixClientProvider { Result.success(client) })
-        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").isFailure).isTrue()
+        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, false, "clientId", "languageTag", "theme").isFailure).isTrue()
    }

    @Test
@@ -78,7 +78,7 @@ class DefaultCallWidgetProviderTest {
            givenGetRoomResult(A_ROOM_ID, room)
        }
        val provider = createProvider(matrixClientProvider = FakeMatrixClientProvider { Result.success(client) })
-        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").getOrNull()).isNotNull()
+        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, false, "clientId", "languageTag", "theme").getOrNull()).isNotNull()
    }

    @Test
@@ -101,7 +101,7 @@ class DefaultCallWidgetProviderTest {
            matrixClientProvider = FakeMatrixClientProvider { Result.success(client) },
            activeRoomsHolder = activeRoomsHolder
        )
-        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").isSuccess).isTrue()
+        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, false, "clientId", "languageTag", "theme").isSuccess).isTrue()
    }

    @Test
@@ -122,7 +122,7 @@ class DefaultCallWidgetProviderTest {
            callWidgetSettingsProvider = settingsProvider,
            appPreferencesStore = preferencesStore,
        )
-        provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme")
+        provider.getWidget(A_SESSION_ID, A_ROOM_ID, false, "clientId", "languageTag", "theme")

        assertThat(settingsProvider.providedBaseUrls).containsExactly("https://custom.element.io")
    }
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
@@ -23,6 +23,7 @@ class FakeCallWidgetProvider(
    override suspend fun getWidget(
        sessionId: SessionId,
        roomId: RoomId,
+        voiceOnly: Boolean,
        clientId: String,
        languageTag: String?,
        theme: String?
--- a/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt
+++ b/features/call/test/src/main/kotlin/io/element/android/features/call/test/CallNotificationData.kt
@@ -33,6 +33,7 @@ fun aCallNotificationData(
    timestamp: Long = 0L,
    expirationTimestamp: Long = 30_000L,
    textContent: String? = null,
+    audioOnly: Boolean = false,
 ): CallNotificationData = CallNotificationData(
    sessionId = sessionId,
    roomId = roomId,
@@ -45,4 +46,5 @@ fun aCallNotificationData(
    timestamp = timestamp,
    expirationTimestamp = expirationTimestamp,
    textContent = textContent,
+    audioOnly = audioOnly
 )