From 0bbe549e744d2817bf5654f6acfb0a0d136a8bcb Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 26 Sep 2023 11:06:49 +0200 Subject: [PATCH] Navigation: fix test and update log. --- .../appnavstate/impl/DefaultAppNavigationStateService.kt | 2 +- .../appnavstate/impl/DefaultNavigationStateServiceTest.kt | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt index 8aeadbede0..b39360c698 100644 --- a/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt +++ b/services/appnavstate/impl/src/main/kotlin/io/element/android/services/appnavstate/impl/DefaultAppNavigationStateService.kt @@ -167,7 +167,7 @@ class DefaultAppNavigationStateService @Inject constructor( } private fun logError(logPrefix: String) { - Timber.tag(loggerTag.value).w("$logPrefix must be call first, can't leave.") + Timber.tag(loggerTag.value).w("$logPrefix must be call first.") } private fun NavigationState.assertOwner(owner: String): Boolean { diff --git a/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt b/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt index dd0e576c79..ab272478cc 100644 --- a/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt +++ b/services/appnavstate/impl/src/test/kotlin/io/element/android/services/appnavstate/impl/DefaultNavigationStateServiceTest.kt @@ -29,7 +29,6 @@ import io.element.android.services.appnavstate.test.A_THREAD_OWNER import io.element.android.tests.testutils.runCancellableScopeTest import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.first -import org.junit.Assert.assertThrows import org.junit.Test class DefaultNavigationStateServiceTest { @@ -63,8 +62,8 @@ class DefaultNavigationStateServiceTest { @Test fun testFailure() = runCancellableScopeTest { scope -> val service = createStateService(scope) - - assertThrows(IllegalStateException::class.java) { service.onNavigateToSpace(A_SPACE_OWNER, A_SPACE_ID) } + service.onNavigateToSpace(A_SPACE_OWNER, A_SPACE_ID) + assertThat(service.appNavigationState.value.navigationState).isEqualTo(NavigationState.Root) } private fun createStateService(