Fix dependencies on test

appnav/build.gradle.kts

@@ -55,15 +55,13 @@ dependencies {
     testImplementation(libs.test.turbine)
     testImplementation(projects.features.login.test)
     testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.libraries.oidc.impl)
+    testImplementation(projects.libraries.oidc.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.libraries.pushproviders.test)
     testImplementation(projects.features.networkmonitor.test)
-    testImplementation(projects.features.login.impl)
     testImplementation(projects.tests.testutils)
     testImplementation(projects.features.rageshake.test)
-    testImplementation(projects.features.rageshake.impl)
     testImplementation(projects.features.share.test)
     testImplementation(projects.services.appnavstate.test)
     testImplementation(projects.services.analytics.test)

appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt

@@ -22,13 +22,10 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
-import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.oidc.api.OidcAction
-import io.element.android.libraries.oidc.impl.DefaultOidcIntentResolver
-import io.element.android.libraries.oidc.impl.DefaultOidcUrlParser
+import io.element.android.libraries.oidc.test.FakeOidcIntentResolver
 import io.element.android.tests.testutils.lambda.lambdaError
-import org.junit.Assert.assertThrows
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -118,8 +115,10 @@ class IntentResolverTest {
     }
 
     @Test
-    fun `test resolve oidc go back`() {
-        val sut = createIntentResolver()
+    fun `test resolve oidc`() {
+        val sut = createIntentResolver(
+            oidcIntentResolverResult = { OidcAction.GoBack },
+        )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
             data = "io.element.android:/?error=access_denied&state=IFF1UETGye2ZA8pO".toUri()
@@ -132,43 +131,15 @@ class IntentResolverTest {
         )
     }
 
-    @Test
-    fun `test resolve oidc success`() {
-        val sut = createIntentResolver()
-        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
-            action = Intent.ACTION_VIEW
-            data = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB".toUri()
-        }
-        val result = sut.resolve(intent)
-        assertThat(result).isEqualTo(
-            ResolvedIntent.Oidc(
-                oidcAction = OidcAction.Success(
-                    url = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
-                )
-            )
-        )
-    }
-
-    @Test
-    fun `test resolve oidc invalid`() {
-        val sut = createIntentResolver()
-        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
-            action = Intent.ACTION_VIEW
-            data = "io.element.android:/invalid".toUri()
-        }
-        assertThrows(IllegalStateException::class.java) {
-            sut.resolve(intent)
-        }
-    }
-
     @Test
     fun `test resolve external permalink`() {
         val permalinkData = PermalinkData.UserLink(
             userId = UserId("@alice:matrix.org")
         )
         val sut = createIntentResolver(
             loginIntentResolverResult = { null },
-            permalinkParserResult = { permalinkData }
+            permalinkParserResult = { permalinkData },
+            oidcIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -187,6 +158,7 @@ class IntentResolverTest {
         val sut = createIntentResolver(
             permalinkParserResult = { PermalinkData.FallbackLink(Uri.parse("https://matrix.org")) },
             loginIntentResolverResult = { null },
+            oidcIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -202,7 +174,8 @@ class IntentResolverTest {
             userId = UserId("@alice:matrix.org")
         )
         val sut = createIntentResolver(
-            permalinkParserResult = { permalinkData }
+            permalinkParserResult = { permalinkData },
+            oidcIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_BATTERY_LOW
@@ -214,7 +187,9 @@ class IntentResolverTest {
 
     @Test
     fun `test incoming share simple`() {
-        val sut = createIntentResolver()
+        val sut = createIntentResolver(
+            oidcIntentResolverResult = { null },
+        )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_SEND
         }
@@ -224,7 +199,9 @@ class IntentResolverTest {
 
     @Test
     fun `test incoming share multiple`() {
-        val sut = createIntentResolver()
+        val sut = createIntentResolver(
+            oidcIntentResolverResult = { null },
+        )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_SEND_MULTIPLE
         }
@@ -237,6 +214,7 @@ class IntentResolverTest {
         val sut = createIntentResolver(
             permalinkParserResult = { PermalinkData.FallbackLink(Uri.parse("https://matrix.org")) },
             loginIntentResolverResult = { null },
+            oidcIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -251,6 +229,7 @@ class IntentResolverTest {
         val aLoginParams = LoginParams("accountProvider", null)
         val sut = createIntentResolver(
             loginIntentResolverResult = { aLoginParams },
+            oidcIntentResolverResult = { null },
         )
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
@@ -263,16 +242,15 @@ class IntentResolverTest {
     private fun createIntentResolver(
         permalinkParserResult: (String) -> PermalinkData = { lambdaError() },
         loginIntentResolverResult: (String) -> LoginParams? = { lambdaError() },
+        oidcIntentResolverResult: (Intent) -> OidcAction? = { lambdaError() },
     ): IntentResolver {
         return IntentResolver(
             deeplinkParser = DeeplinkParser(),
             loginIntentResolver = FakeLoginIntentResolver(
                 parseResult = loginIntentResolverResult,
             ),
-            oidcIntentResolver = DefaultOidcIntentResolver(
-                oidcUrlParser = DefaultOidcUrlParser(
-                    oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
-                )
+            oidcIntentResolver = FakeOidcIntentResolver(
+                resolveResult = oidcIntentResolverResult,
             ),
             permalinkParser = FakePermalinkParser(
                 result = permalinkParserResult

features/ftue/impl/build.gradle.kts

@@ -57,7 +57,6 @@ dependencies {
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.analytics.noop)
-    testImplementation(projects.libraries.permissions.impl)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.preferences.test)
     testImplementation(projects.features.lockscreen.test)

features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/DefaultFtueServiceTest.kt

@@ -19,7 +19,7 @@ import io.element.android.libraries.matrix.api.verification.SessionVerificationS
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
 import io.element.android.libraries.permissions.api.PermissionStateProvider
-import io.element.android.libraries.permissions.impl.FakePermissionStateProvider
+import io.element.android.libraries.permissions.test.FakePermissionStateProvider
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.services.analytics.api.AnalyticsService

features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenterTest.kt

@@ -14,7 +14,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.permissions.api.PermissionStateProvider
 import io.element.android.libraries.permissions.api.PermissionsPresenter
-import io.element.android.libraries.permissions.impl.FakePermissionStateProvider
+import io.element.android.libraries.permissions.test.FakePermissionStateProvider
 import io.element.android.libraries.permissions.test.FakePermissionsPresenter
 import io.element.android.libraries.permissions.test.FakePermissionsPresenterFactory
 import io.element.android.services.toolbox.test.sdk.FakeBuildVersionSdkIntProvider

features/login/impl/build.gradle.kts

@@ -62,7 +62,7 @@ dependencies {
     testImplementation(projects.features.enterprise.test)
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.libraries.oidc.impl)
+    testImplementation(projects.libraries.oidc.test)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.tests.testutils)
     testReleaseImplementation(libs.androidx.compose.ui.test.manifest)

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt

@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.api.OidcActionFlow
-import io.element.android.libraries.oidc.impl.customtab.DefaultOidcActionFlow
+import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.waitForPredicate
 import kotlinx.coroutines.test.runTest
@@ -100,7 +100,7 @@ class ConfirmAccountProviderPresenterTest {
     @Test
     fun `present - oidc - cancel with failure`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService()
-        val defaultOidcActionFlow = DefaultOidcActionFlow()
+        val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
@@ -128,7 +128,7 @@ class ConfirmAccountProviderPresenterTest {
     @Test
     fun `present - oidc - cancel with success`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService()
-        val defaultOidcActionFlow = DefaultOidcActionFlow()
+        val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
@@ -155,7 +155,7 @@ class ConfirmAccountProviderPresenterTest {
     @Test
     fun `present - oidc - success with failure`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService()
-        val defaultOidcActionFlow = DefaultOidcActionFlow()
+        val defaultOidcActionFlow = FakeOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
             defaultOidcActionFlow = defaultOidcActionFlow,
@@ -185,7 +185,7 @@ class ConfirmAccountProviderPresenterTest {
     @Test
     fun `present - oidc - success with success`() = runTest {
         val authenticationService = FakeMatrixAuthenticationService()
-        val defaultOidcActionFlow = DefaultOidcActionFlow()
+        val defaultOidcActionFlow = FakeOidcActionFlow()
         val defaultLoginUserStory = DefaultLoginUserStory().apply {
             setLoginFlowIsDone(false)
         }
@@ -356,7 +356,7 @@ class ConfirmAccountProviderPresenterTest {
         params: ConfirmAccountProviderPresenter.Params = ConfirmAccountProviderPresenter.Params(isAccountCreation = false),
         accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(FakeEnterpriseService()),
         matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
-        defaultOidcActionFlow: OidcActionFlow = DefaultOidcActionFlow(),
+        defaultOidcActionFlow: OidcActionFlow = FakeOidcActionFlow(),
         defaultLoginUserStory: DefaultLoginUserStory = DefaultLoginUserStory(),
         webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever(),
     ) = ConfirmAccountProviderPresenter(

features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingPresenterTest.kt

@@ -30,7 +30,7 @@ import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.oidc.api.OidcActionFlow
-import io.element.android.libraries.oidc.impl.customtab.DefaultOidcActionFlow
+import io.element.android.libraries.oidc.test.customtab.FakeOidcActionFlow
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
@@ -226,7 +226,7 @@ private fun createPresenter(
 )
 
 fun createLoginHelper(
-    oidcActionFlow: OidcActionFlow = DefaultOidcActionFlow(),
+    oidcActionFlow: OidcActionFlow = FakeOidcActionFlow(),
     authenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
     defaultLoginUserStory: DefaultLoginUserStory = DefaultLoginUserStory(),
     webClientUrlForAuthenticationRetriever: WebClientUrlForAuthenticationRetriever = FakeWebClientUrlForAuthenticationRetriever(),

features/messages/impl/build.gradle.kts

@@ -93,7 +93,6 @@ dependencies {
     testImplementation(libs.test.mockk)
     testImplementation(libs.test.robolectric)
     testImplementation(projects.features.poll.test)
-    testImplementation(projects.features.poll.impl)
     testImplementation(libs.androidx.compose.ui.test.junit)
     testImplementation(projects.libraries.eventformatter.test)
     testReleaseImplementation(libs.androidx.compose.ui.test.manifest)

features/preferences/impl/build.gradle.kts

@@ -107,14 +107,11 @@ dependencies {
     testImplementation(projects.features.ftue.test)
     testImplementation(projects.features.invite.test)
     testImplementation(projects.features.rageshake.test)
-    testImplementation(projects.features.rageshake.impl)
     testImplementation(projects.features.logout.test)
-    testImplementation(projects.libraries.indicator.impl)
+    testImplementation(projects.libraries.indicator.test)
     testImplementation(projects.libraries.pushproviders.test)
-    testImplementation(projects.features.logout.impl)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.services.toolbox.test)
-    testImplementation(projects.features.analytics.impl)
     testImplementation(projects.tests.testutils)
     testImplementation(libs.androidx.compose.ui.test.junit)
     testReleaseImplementation(libs.androidx.compose.ui.test.manifest)

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootPresenterTest.kt

@@ -17,14 +17,14 @@ import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.libraries.core.meta.BuildType
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
-import io.element.android.libraries.indicator.impl.DefaultIndicatorService
+import io.element.android.libraries.indicator.api.IndicatorService
+import io.element.android.libraries.indicator.test.FakeIndicatorService
 import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.core.aBuildMeta
-import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
@@ -71,7 +71,7 @@ class PreferencesRootPresenterTest {
             )
             assertThat(initialState.version).isEqualTo("A Version")
             assertThat(loadedState.showSecureBackup).isFalse()
-            assertThat(loadedState.showSecureBackupBadge).isTrue()
+            assertThat(loadedState.showSecureBackupBadge).isFalse()
             assertThat(loadedState.accountManagementUrl).isNull()
             assertThat(loadedState.devicesManagementUrl).isNull()
             assertThat(loadedState.showAnalyticsSettings).isFalse()
@@ -110,6 +110,27 @@ class PreferencesRootPresenterTest {
         }
     }
 
+    @Test
+    fun `present - secure backup badge`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            canDeactivateAccountResult = { true },
+            accountManagementUrlResult = { Result.success("") },
+        )
+        val indicatorService = FakeIndicatorService()
+        createPresenter(
+            matrixClient = matrixClient,
+            rageshakeFeatureAvailability = { false },
+            indicatorService = indicatorService,
+        ).test {
+            skipItems(1)
+            val initialState = awaitItem()
+            assertThat(initialState.showSecureBackupBadge).isFalse()
+            indicatorService.setShowSettingChatBackupIndicator(true)
+            val finalState = awaitItem()
+            assertThat(finalState.showSecureBackupBadge).isTrue()
+        }
+    }
+
     @Test
     fun `present - can deactivate account is false if the Matrix client say so`() = runTest {
         createPresenter(
@@ -165,17 +186,15 @@ class PreferencesRootPresenterTest {
         sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
         showDeveloperSettingsProvider: ShowDeveloperSettingsProvider = ShowDeveloperSettingsProvider(aBuildMeta(BuildType.DEBUG)),
         rageshakeFeatureAvailability: RageshakeFeatureAvailability = RageshakeFeatureAvailability { true },
+        indicatorService: IndicatorService = FakeIndicatorService(),
     ) = PreferencesRootPresenter(
         matrixClient = matrixClient,
         sessionVerificationService = sessionVerificationService,
         analyticsService = FakeAnalyticsService(),
         versionFormatter = FakeVersionFormatter(),
         snackbarDispatcher = SnackbarDispatcher(),
         featureFlagService = FakeFeatureFlagService(),
-        indicatorService = DefaultIndicatorService(
-            sessionVerificationService = sessionVerificationService,
-            encryptionService = FakeEncryptionService(),
-        ),
+        indicatorService = indicatorService,
         directLogoutPresenter = { aDirectLogoutState() },
         showDeveloperSettingsProvider = showDeveloperSettingsProvider,
         rageshakeFeatureAvailability = rageshakeFeatureAvailability,

features/roomlist/impl/build.gradle.kts

@@ -69,7 +69,7 @@ dependencies {
     testImplementation(projects.libraries.featureflag.test)
     testImplementation(projects.libraries.dateformatter.test)
     testImplementation(projects.libraries.eventformatter.test)
-    testImplementation(projects.libraries.indicator.impl)
+    testImplementation(projects.libraries.indicator.test)
     testImplementation(projects.libraries.permissions.noop)
     testImplementation(projects.libraries.permissions.test)
     testImplementation(projects.libraries.preferences.test)