Stronger lambda error

appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt

@@ -30,7 +30,7 @@ import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.services.appnavstate.api.ActiveRoomsHolder
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -98,19 +98,18 @@ class JoinedRoomLoadedFlowNodeTest {
         }
     }
 
-    private fun createJoinedRoomLoadedFlowNode(
+    private fun TestScope.createJoinedRoomLoadedFlowNode(
         plugins: List<Plugin>,
         messagesEntryPoint: MessagesEntryPoint = FakeMessagesEntryPoint(),
         roomDetailsEntryPoint: RoomDetailsEntryPoint = FakeRoomDetailsEntryPoint(),
         activeRoomsHolder: ActiveRoomsHolder = ActiveRoomsHolder(),
-        coroutineScope: CoroutineScope,
     ) = JoinedRoomLoadedFlowNode(
         buildContext = BuildContext.root(savedStateMap = null),
         plugins = plugins,
         messagesEntryPoint = messagesEntryPoint,
         roomDetailsEntryPoint = roomDetailsEntryPoint,
         appNavigationStateService = FakeAppNavigationStateService(),
-        appCoroutineScope = coroutineScope,
+        appCoroutineScope = this,
         roomComponentFactory = FakeRoomComponentFactory(),
         matrixClient = FakeMatrixClient(),
         activeRoomsHolder = activeRoomsHolder,
@@ -125,7 +124,6 @@ class JoinedRoomLoadedFlowNodeTest {
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
             plugins = listOf(inputs),
             messagesEntryPoint = fakeMessagesEntryPoint,
-            coroutineScope = this
         )
         // WHEN
         val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper()
@@ -148,7 +146,6 @@ class JoinedRoomLoadedFlowNodeTest {
             plugins = listOf(inputs),
             messagesEntryPoint = fakeMessagesEntryPoint,
             roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
-            coroutineScope = this
         )
         val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper()
         // WHEN
@@ -171,7 +168,6 @@ class JoinedRoomLoadedFlowNodeTest {
             plugins = listOf(inputs),
             messagesEntryPoint = fakeMessagesEntryPoint,
             roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
-            coroutineScope = this,
             activeRoomsHolder = activeRoomsHolder,
         )
 
@@ -197,7 +193,6 @@ class JoinedRoomLoadedFlowNodeTest {
             plugins = listOf(inputs),
             messagesEntryPoint = fakeMessagesEntryPoint,
             roomDetailsEntryPoint = fakeRoomDetailsEntryPoint,
-            coroutineScope = this,
             activeRoomsHolder = activeRoomsHolder,
         )
         val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper()

features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt

@@ -87,13 +87,19 @@ class DefaultCallWidgetProviderTest {
         }
         val activeRoomsHolder = ActiveRoomsHolder().apply {
             // A current active room with the same room id
-            addRoom(FakeJoinedRoom(baseRoom = FakeBaseRoom(roomId = A_ROOM_ID)))
+            addRoom(
+                FakeJoinedRoom(
+                    baseRoom = FakeBaseRoom(roomId = A_ROOM_ID),
+                    generateWidgetWebViewUrlResult = { _, _, _, _ -> Result.success("url") },
+                    getWidgetDriverResult = { Result.success(FakeMatrixWidgetDriver()) },
+                )
+            )
         }
         val provider = createProvider(
             matrixClientProvider = FakeMatrixClientProvider { Result.success(client) },
             activeRoomsHolder = activeRoomsHolder
         )
-        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").isFailure).isTrue()
+        assertThat(provider.getWidget(A_SESSION_ID, A_ROOM_ID, "clientId", "languageTag", "theme").isSuccess).isTrue()
     }
 
     @Test

features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsPresenterTest.kt

@@ -20,14 +20,14 @@ import io.element.android.features.lockscreen.impl.storage.LockScreenStore
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
 import io.element.android.tests.testutils.test
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class LockScreenSettingsPresenterTest {
     @Test
     fun `present - remove pin option is hidden when mandatory`() = runTest {
-        val presenter = createLockScreenSettingsPresenter(this, lockScreenConfig = aLockScreenConfig(isPinMandatory = true))
+        val presenter = createLockScreenSettingsPresenter(lockScreenConfig = aLockScreenConfig(isPinMandatory = true))
         presenter.test {
             awaitItem().also { state ->
                 assertThat(state.showRemovePinOption).isFalse()
@@ -37,7 +37,7 @@ class LockScreenSettingsPresenterTest {
 
     @Test
     fun `present - remove pin flow`() = runTest {
-        val presenter = createLockScreenSettingsPresenter(this)
+        val presenter = createLockScreenSettingsPresenter()
         presenter.test {
             consumeItemsUntilPredicate { state ->
                 state.showRemovePinOption
@@ -71,7 +71,6 @@ class LockScreenSettingsPresenterTest {
             isDeviceSecured = true,
         )
         val presenter = createLockScreenSettingsPresenter(
-            coroutineScope = this,
             biometricAuthenticatorManager = fakeBiometricAuthenticatorManager
         )
         presenter.test {
@@ -88,7 +87,6 @@ class LockScreenSettingsPresenterTest {
             }
         )
         val presenter = createLockScreenSettingsPresenter(
-            coroutineScope = this,
             biometricAuthenticatorManager = fakeBiometricAuthenticatorManager
         )
         presenter.test {
@@ -110,7 +108,6 @@ class LockScreenSettingsPresenterTest {
             }
         )
         val presenter = createLockScreenSettingsPresenter(
-            coroutineScope = this,
             biometricAuthenticatorManager = fakeBiometricAuthenticatorManager
         )
         presenter.test {
@@ -130,7 +127,6 @@ class LockScreenSettingsPresenterTest {
         )
         val lockScreenStore = InMemoryLockScreenStore()
         val presenter = createLockScreenSettingsPresenter(
-            coroutineScope = this,
             lockScreenStore = lockScreenStore,
             biometricAuthenticatorManager = fakeBiometricAuthenticatorManager
         )
@@ -148,8 +144,7 @@ class LockScreenSettingsPresenterTest {
         }
     }
 
-    private suspend fun createLockScreenSettingsPresenter(
-        coroutineScope: CoroutineScope,
+    private suspend fun TestScope.createLockScreenSettingsPresenter(
         lockScreenConfig: LockScreenConfig = aLockScreenConfig(),
         biometricAuthenticatorManager: BiometricAuthenticatorManager = FakeBiometricAuthenticatorManager(),
         lockScreenStore: LockScreenStore = InMemoryLockScreenStore(),
@@ -160,7 +155,7 @@ class LockScreenSettingsPresenterTest {
         return LockScreenSettingsPresenter(
             lockScreenStore = lockScreenStore,
             pinCodeManager = pinCodeManager,
-            coroutineScope = coroutineScope,
+            coroutineScope = this,
             lockScreenConfig = lockScreenConfig,
             biometricAuthenticatorManager = biometricAuthenticatorManager,
         )

features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockPresenterTest.kt

@@ -24,7 +24,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -34,7 +34,7 @@ class PinUnlockPresenterTest {
 
     @Test
     fun `present - success verify flow`() = runTest {
-        val presenter = createPinUnlockPresenter(this)
+        val presenter = createPinUnlockPresenter()
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -71,7 +71,7 @@ class PinUnlockPresenterTest {
 
     @Test
     fun `present - failure verify flow`() = runTest {
-        val presenter = createPinUnlockPresenter(this)
+        val presenter = createPinUnlockPresenter()
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -100,7 +100,7 @@ class PinUnlockPresenterTest {
     fun `present - forgot pin flow`() = runTest {
         val signOutLambda = lambdaRecorder<Boolean, Unit> {}
         val signOut = FakeLogoutUseCase(signOutLambda)
-        val presenter = createPinUnlockPresenter(this, logoutUseCase = signOut)
+        val presenter = createPinUnlockPresenter(logoutUseCase = signOut)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -135,8 +135,7 @@ class PinUnlockPresenterTest {
         dataOrNull()?.assertText(text)
     }
 
-    private suspend fun createPinUnlockPresenter(
-        scope: CoroutineScope,
+    private suspend fun TestScope.createPinUnlockPresenter(
         biometricAuthenticatorManager: BiometricAuthenticatorManager = FakeBiometricAuthenticatorManager(),
         callback: PinCodeManager.Callback = DefaultPinCodeManagerCallback(),
         logoutUseCase: FakeLogoutUseCase = FakeLogoutUseCase(logoutLambda = { "" }),
@@ -149,7 +148,7 @@ class PinUnlockPresenterTest {
             pinCodeManager = pinCodeManager,
             biometricAuthenticatorManager = biometricAuthenticatorManager,
             logoutUseCase = logoutUseCase,
-            coroutineScope = scope,
+            coroutineScope = this,
             pinUnlockHelper = PinUnlockHelper(biometricAuthenticatorManager, pinCodeManager),
         )
     }

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt

@@ -513,7 +513,17 @@ class AttachmentsPreviewPresenterTest {
     @Test
     fun `present - dismissing the progress dialog stops media upload with media queue`() = runTest {
         val onDoneListenerResult = lambdaRecorder<Unit> {}
-        val presenter = createAttachmentsPreviewPresenter(mediaUploadOnSendQueueEnabled = true, onDoneListener = onDoneListenerResult)
+        val presenter = createAttachmentsPreviewPresenter(
+            room = FakeJoinedRoom(
+                liveTimeline = FakeTimeline().apply {
+                    sendFileLambda = { _, _, _, _, _, _ ->
+                        Result.success(FakeMediaUploadHandler())
+                    }
+                }
+            ),
+            mediaUploadOnSendQueueEnabled = true,
+            onDoneListener = onDoneListenerResult,
+        )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt

@@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.LiveTimelineProvider
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -91,13 +91,12 @@ class ForwardMessagesPresenterTest {
         }
     }
 
-    private fun CoroutineScope.aForwardMessagesPresenter(
+    private fun TestScope.aForwardMessagesPresenter(
         eventId: EventId = AN_EVENT_ID,
         fakeRoom: FakeJoinedRoom = FakeJoinedRoom(),
-        coroutineScope: CoroutineScope = this,
     ) = ForwardMessagesPresenter(
         eventId = eventId.value,
         timelineProvider = LiveTimelineProvider(fakeRoom),
-        appCoroutineScope = coroutineScope,
+        appCoroutineScope = this,
     )
 }