From f09b77f72f68254b18d875d55bef2b406b966f46 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 18 Jun 2024 10:33:07 +0200 Subject: [PATCH] Update test after merging develop. --- .../impl/tasks/DefaultClearCacheUseCaseTest.kt | 12 +++++++++++- .../android/libraries/push/test/FakePushService.kt | 4 +++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt index 4b576bf3d1..6be7775f5b 100644 --- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt +++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/tasks/DefaultClearCacheUseCaseTest.kt @@ -22,8 +22,11 @@ import com.google.common.truth.Truth.assertThat import io.element.android.features.ftue.test.FakeFtueService import io.element.android.features.preferences.impl.DefaultCacheService import io.element.android.features.roomlist.impl.migration.InMemoryMigrationScreenStore +import io.element.android.libraries.matrix.api.core.SessionId import io.element.android.libraries.matrix.test.FakeMatrixClient +import io.element.android.libraries.push.test.FakePushService import io.element.android.tests.testutils.lambda.lambdaRecorder +import io.element.android.tests.testutils.lambda.value import io.element.android.tests.testutils.testCoroutineDispatchers import kotlinx.coroutines.test.runTest import okhttp3.OkHttpClient @@ -48,6 +51,10 @@ class DefaultClearCacheUseCaseTest { val migrationScreenStore = InMemoryMigrationScreenStore( resetLambda = resetMigrationLambda, ) + val setIgnoreRegistrationErrorLambda = lambdaRecorder { _, _ -> } + val pushService = FakePushService( + setIgnoreRegistrationErrorLambda = setIgnoreRegistrationErrorLambda + ) val sut = DefaultClearCacheUseCase( context = InstrumentationRegistry.getInstrumentation().context, matrixClient = matrixClient, @@ -55,13 +62,16 @@ class DefaultClearCacheUseCaseTest { defaultCacheService = defaultCacheService, okHttpClient = { OkHttpClient.Builder().build() }, ftueService = ftueService, - migrationScreenStore = migrationScreenStore + migrationScreenStore = migrationScreenStore, + pushService = pushService, ) defaultCacheService.clearedCacheEventFlow.test { sut.invoke() clearCacheLambda.assertions().isCalledOnce() resetFtueLambda.assertions().isCalledOnce() resetMigrationLambda.assertions().isCalledOnce() + setIgnoreRegistrationErrorLambda.assertions().isCalledOnce() + .with(value(matrixClient.sessionId), value(false)) assertThat(awaitItem()).isEqualTo(matrixClient.sessionId) } } diff --git a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt index 8f3e45c4ce..1736bb9ccf 100644 --- a/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt +++ b/libraries/push/test/src/main/kotlin/io/element/android/libraries/push/test/FakePushService.kt @@ -33,7 +33,8 @@ class FakePushService( Result.success(Unit) }, private val currentPushProvider: () -> PushProvider? = { availablePushProviders.firstOrNull() }, - private val selectPushProviderLambda: suspend (MatrixClient, PushProvider) -> Unit = { _, _ -> lambdaError() } + private val selectPushProviderLambda: suspend (MatrixClient, PushProvider) -> Unit = { _, _ -> lambdaError() }, + private val setIgnoreRegistrationErrorLambda: (SessionId, Boolean) -> Unit = { _, _ -> lambdaError() }, ) : PushService { override suspend fun getCurrentPushProvider(): PushProvider? { return registeredPushProvider ?: currentPushProvider() @@ -70,6 +71,7 @@ class FakePushService( override suspend fun setIgnoreRegistrationError(sessionId: SessionId, ignore: Boolean) { ignoreRegistrationError.value = ignore + setIgnoreRegistrationErrorLambda(sessionId, ignore) } override suspend fun testPush(): Boolean = simulateLongTask {