From 9d6f68ac82aac2bcf1e13114580a0d2872af4d32 Mon Sep 17 00:00:00 2001 From: ganfra Date: Wed, 13 Mar 2024 12:44:59 +0100 Subject: [PATCH] Tests: raise default timeout of consumeItemsUntilPredicate to 3 seconds (like awaitItem) --- .../android/features/roomlist/impl/RoomListPresenterTests.kt | 3 +-- .../io/element/android/tests/testutils/ReceiveTurbine.kt | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt index aa89c4fac2..beffffa8ef 100644 --- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt +++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt @@ -85,7 +85,6 @@ import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runTest import org.junit.Rule import org.junit.Test -import kotlin.time.Duration.Companion.seconds class RoomListPresenterTests { @get:Rule @@ -167,7 +166,7 @@ class RoomListPresenterTests { moleculeFlow(RecompositionMode.Immediate) { presenter.present() }.test { - val initialState = consumeItemsUntilPredicate(timeout = 3.seconds) { state -> state.contentState is RoomListContentState.Skeleton }.last() + val initialState = consumeItemsUntilPredicate { state -> state.contentState is RoomListContentState.Skeleton }.last() assertThat(initialState.contentState).isInstanceOf(RoomListContentState.Skeleton::class.java) roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1)) roomListService.postAllRooms( diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt index 0c8bd89951..abac27a14f 100644 --- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt +++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/ReceiveTurbine.kt @@ -22,6 +22,7 @@ import app.cash.turbine.withTurbineTimeout import io.element.android.libraries.core.bool.orFalse import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds +import kotlin.time.Duration.Companion.seconds /** * Consume all items until timeout is reached waiting for an event or we receive terminal event. @@ -48,7 +49,7 @@ suspend fun ReceiveTurbine.awaitLastSequentialItem(): T { * @return the list of consumed items. */ suspend fun ReceiveTurbine.consumeItemsUntilPredicate( - timeout: Duration = 100.milliseconds, + timeout: Duration = 3.seconds, ignoreTimeoutError: Boolean = false, predicate: (T) -> Boolean, ): List {