From 4113bae938408701b0873b1a07da03d77f53b40b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 10:47:31 +0200
Subject: [PATCH 01/13] Add Konsist test `Fake classes must be named using Fake
 and the interface it fakes`

---
 .../android/tests/konsist/KonsistClassNameTest.kt   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
index 9ecf90ebe6d..092901e1e39 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
@@ -20,6 +20,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import com.bumble.appyx.core.node.Node
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.withAllParentsOf
+import com.lemonappdev.konsist.api.ext.list.withNameContaining
 import com.lemonappdev.konsist.api.verify.assertTrue
 import io.element.android.libraries.architecture.Presenter
 import org.junit.Test
@@ -62,4 +63,16 @@ class KonsistClassNameTest {
                 it.name.endsWith("Provider") && (it.name.contains("IconList") || it.name.contains(providedType))
             }
     }
+
+    @Test
+    fun `Fake classes must be named using Fake and the interface it fakes`() {
+        Konsist.scopeFromProject()
+            .classes()
+            .withNameContaining("Fake")
+            .assertTrue {
+                val interfaceName = it.name.replace("Fake", "")
+                it.name.startsWith("Fake") &&
+                    it.parents.any { parent -> parent.name.replace(".", "") == interfaceName }
+            }
+    }
 }

From d79fcb3aaa7d926ddf1dbb4254c63daabfb8767f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 10:51:48 +0200
Subject: [PATCH 02/13] Rename class (code quality)

---
 .../state/{FakeWelcomeState.kt => FakeWelcomeScreenState.kt}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/{FakeWelcomeState.kt => FakeWelcomeScreenState.kt} (94%)

diff --git a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeState.kt b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeScreenState.kt
similarity index 94%
rename from features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeState.kt
rename to features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeScreenState.kt
index 6b4d4b2287e..66ffe242858 100644
--- a/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeState.kt
+++ b/features/ftue/impl/src/test/kotlin/io/element/android/features/ftue/impl/welcome/state/FakeWelcomeScreenState.kt
@@ -16,7 +16,7 @@
 
 package io.element.android.features.ftue.impl.welcome.state
 
-class FakeWelcomeState : WelcomeScreenState {
+class FakeWelcomeScreenState : WelcomeScreenState {
     private var isWelcomeScreenNeeded = true
 
     override fun isWelcomeScreenNeeded(): Boolean {

From f930796f572d1ebcfcfe24467aaf6915ff69f92f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 10:55:22 +0200
Subject: [PATCH 03/13] Move FakeBugReporterMode to FakeBugReporter.Mode

---
 .../impl/bugreport/BugReportPresenterTest.kt  |  6 +++---
 .../impl/bugreport/FakeBugReporter.kt         | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt
index 69617f30f82..9b07b1c9428 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportPresenterTest.kt
@@ -144,7 +144,7 @@ class BugReportPresenterTest {
     @Test
     fun `present - send success`() = runTest {
         val presenter = createPresenter(
-            FakeBugReporter(mode = FakeBugReporterMode.Success),
+            FakeBugReporter(mode = FakeBugReporter.Mode.Success),
             FakeCrashDataStore(crashData = A_CRASH_DATA, appHasCrashed = true),
             FakeScreenshotHolder(screenshotUri = A_SCREENSHOT_URI),
         )
@@ -170,7 +170,7 @@ class BugReportPresenterTest {
     @Test
     fun `present - send failure`() = runTest {
         val presenter = createPresenter(
-            FakeBugReporter(mode = FakeBugReporterMode.Failure),
+            FakeBugReporter(mode = FakeBugReporter.Mode.Failure),
             FakeCrashDataStore(crashData = A_CRASH_DATA, appHasCrashed = true),
             FakeScreenshotHolder(screenshotUri = A_SCREENSHOT_URI),
         )
@@ -219,7 +219,7 @@ class BugReportPresenterTest {
     @Test
     fun `present - send cancel`() = runTest {
         val presenter = createPresenter(
-            FakeBugReporter(mode = FakeBugReporterMode.Cancel),
+            FakeBugReporter(mode = FakeBugReporter.Mode.Cancel),
             FakeCrashDataStore(crashData = A_CRASH_DATA, appHasCrashed = true),
             FakeScreenshotHolder(screenshotUri = A_SCREENSHOT_URI),
         )
diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt
index cce2d5d1448..a4d4f83da91 100644
--- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt
+++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/bugreport/FakeBugReporter.kt
@@ -22,7 +22,13 @@ import io.element.android.libraries.matrix.test.A_FAILURE_REASON
 import kotlinx.coroutines.delay
 import java.io.File
 
-class FakeBugReporter(val mode: FakeBugReporterMode = FakeBugReporterMode.Success) : BugReporter {
+class FakeBugReporter(val mode: Mode = Mode.Success) : BugReporter {
+    enum class Mode {
+        Success,
+        Failure,
+        Cancel
+    }
+
     override suspend fun sendBugReport(
         withDevicesLogs: Boolean,
         withCrashLogs: Boolean,
@@ -37,12 +43,12 @@ class FakeBugReporter(val mode: FakeBugReporterMode = FakeBugReporterMode.Succes
         listener?.onProgress(50)
         delay(100)
         when (mode) {
-            FakeBugReporterMode.Success -> Unit
-            FakeBugReporterMode.Failure -> {
+            Mode.Success -> Unit
+            Mode.Failure -> {
                 listener?.onUploadFailed(A_FAILURE_REASON)
                 return
             }
-            FakeBugReporterMode.Cancel -> {
+            Mode.Cancel -> {
                 listener?.onUploadCancelled()
                 return
             }
@@ -64,9 +70,3 @@ class FakeBugReporter(val mode: FakeBugReporterMode = FakeBugReporterMode.Succes
         // No op
     }
 }
-
-enum class FakeBugReporterMode {
-    Success,
-    Failure,
-    Cancel
-}

From c295cae7ff790497f9e5b12db398d4dccb909b8d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 10:56:35 +0200
Subject: [PATCH 04/13] Rename class (code quality)

---
 ...terFake.kt => FakePermissionsPresenter.kt} |  2 +-
 .../impl/send/SendLocationPresenterTest.kt    | 30 +++++++++----------
 .../impl/show/ShowLocationPresenterTest.kt    | 26 ++++++++--------
 3 files changed, 29 insertions(+), 29 deletions(-)
 rename features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/{PermissionsPresenterFake.kt => FakePermissionsPresenter.kt} (95%)

diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterFake.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt
similarity index 95%
rename from features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterFake.kt
rename to features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt
index e79ac9e453e..8bbaf5c428c 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/PermissionsPresenterFake.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/permissions/FakePermissionsPresenter.kt
@@ -18,7 +18,7 @@ package io.element.android.features.location.impl.common.permissions
 
 import androidx.compose.runtime.Composable
 
-class PermissionsPresenterFake : PermissionsPresenter {
+class FakePermissionsPresenter : PermissionsPresenter {
     val events = mutableListOf<PermissionsEvents>()
 
     private fun handleEvent(event: PermissionsEvents) {
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
index b6b469c44aa..af4ac6c9c7c 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
@@ -24,9 +24,9 @@ import im.vector.app.features.analytics.plan.Composer
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.aPermissionsState
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
+import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
 import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
-import io.element.android.features.location.impl.common.permissions.PermissionsPresenterFake
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.features.messages.test.FakeMessageComposerContext
 import io.element.android.libraries.matrix.api.room.location.AssetType
@@ -45,7 +45,7 @@ class SendLocationPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
-    private val permissionsPresenterFake = PermissionsPresenterFake()
+    private val fakePermissionsPresenter = FakePermissionsPresenter()
     private val fakeMatrixRoom = FakeMatrixRoom()
     private val fakeAnalyticsService = FakeAnalyticsService()
     private val fakeMessageComposerContext = FakeMessageComposerContext()
@@ -53,7 +53,7 @@ class SendLocationPresenterTest {
     private val fakeBuildMeta = aBuildMeta(applicationName = "app name")
     private val sendLocationPresenter: SendLocationPresenter = SendLocationPresenter(
         permissionsPresenterFactory = object : PermissionsPresenter.Factory {
-            override fun create(permissions: List<String>): PermissionsPresenter = permissionsPresenterFake
+            override fun create(permissions: List<String>): PermissionsPresenter = fakePermissionsPresenter
         },
         room = fakeMatrixRoom,
         analyticsService = fakeAnalyticsService,
@@ -64,7 +64,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions granted`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.AllGranted,
                 shouldShowRationale = false,
@@ -90,7 +90,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions partially granted`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.SomeGranted,
                 shouldShowRationale = false,
@@ -116,7 +116,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions denied`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -142,7 +142,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `initial state with permissions denied once`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -168,7 +168,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `rationale dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -199,7 +199,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `rationale dialog continue`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -221,13 +221,13 @@ class SendLocationPresenterTest {
 
             // Continue the dialog sends permission request to the permissions presenter
             myLocationState.eventSink(SendLocationEvents.RequestPermissions)
-            assertThat(permissionsPresenterFake.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
+            assertThat(fakePermissionsPresenter.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
         }
     }
 
     @Test
     fun `permission denied dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -258,7 +258,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `share sender location`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.AllGranted,
                 shouldShowRationale = false,
@@ -314,7 +314,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `share pin location`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -370,7 +370,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `composer context passes through analytics`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -418,7 +418,7 @@ class SendLocationPresenterTest {
 
     @Test
     fun `open settings activity`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
index ff80a3935de..dab964b6e1b 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenterTest.kt
@@ -23,9 +23,9 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.location.api.Location
 import io.element.android.features.location.impl.aPermissionsState
 import io.element.android.features.location.impl.common.actions.FakeLocationActions
+import io.element.android.features.location.impl.common.permissions.FakePermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsEvents
 import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
-import io.element.android.features.location.impl.common.permissions.PermissionsPresenterFake
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.tests.testutils.WarmUpRule
@@ -38,13 +38,13 @@ class ShowLocationPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
-    private val permissionsPresenterFake = PermissionsPresenterFake()
+    private val fakePermissionsPresenter = FakePermissionsPresenter()
     private val fakeLocationActions = FakeLocationActions()
     private val fakeBuildMeta = aBuildMeta(applicationName = "app name")
     private val location = Location(1.23, 4.56, 7.8f)
     private val presenter = ShowLocationPresenter(
         permissionsPresenterFactory = object : PermissionsPresenter.Factory {
-            override fun create(permissions: List<String>): PermissionsPresenter = permissionsPresenterFake
+            override fun create(permissions: List<String>): PermissionsPresenter = fakePermissionsPresenter
         },
         fakeLocationActions,
         fakeBuildMeta,
@@ -54,7 +54,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state with no location permission`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -74,7 +74,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state location permission denied once`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -94,7 +94,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state with location permission`() = runTest {
-        permissionsPresenterFake.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
+        fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
 
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -109,7 +109,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `emits initial state with partial location permission`() = runTest {
-        permissionsPresenterFake.givenState(aPermissionsState(permissions = PermissionsState.Permissions.SomeGranted))
+        fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.SomeGranted))
 
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -137,7 +137,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `centers on user location`() = runTest {
-        permissionsPresenterFake.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
+        fakePermissionsPresenter.givenState(aPermissionsState(permissions = PermissionsState.Permissions.AllGranted))
 
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -165,7 +165,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `rationale dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -196,7 +196,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `rationale dialog continue`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = true,
@@ -218,13 +218,13 @@ class ShowLocationPresenterTest {
 
             // Continue the dialog sends permission request to the permissions presenter
             trackLocationState.eventSink(ShowLocationEvents.RequestPermissions)
-            assertThat(permissionsPresenterFake.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
+            assertThat(fakePermissionsPresenter.events.last()).isEqualTo(PermissionsEvents.RequestPermissions)
         }
     }
 
     @Test
     fun `permission denied dialog dismiss`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,
@@ -255,7 +255,7 @@ class ShowLocationPresenterTest {
 
     @Test
     fun `open settings activity`() = runTest {
-        permissionsPresenterFake.givenState(
+        fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
                 shouldShowRationale = false,

From 7b372e24b4b669cb314c299f1694783f0b8124f2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 10:57:16 +0200
Subject: [PATCH 05/13] Rename class (code quality)

---
 .../features/migration/impl/MigrationPresenterTest.kt     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt
index 3ea0625f766..29be8682e34 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/MigrationPresenterTest.kt
@@ -37,7 +37,7 @@ class MigrationPresenterTest {
 
     @Test
     fun `present - no migration should occurs if ApplicationMigrationVersion is the last one`() = runTest {
-        val migrations = (1..10).map { FakeMigration(it) }
+        val migrations = (1..10).map { FakeAppMigration(it) }
         val store = InMemoryMigrationStore(migrations.maxOf { it.order })
         val presenter = createPresenter(
             migrationStore = store,
@@ -57,7 +57,7 @@ class MigrationPresenterTest {
     @Test
     fun `present - testing all migrations`() = runTest {
         val store = InMemoryMigrationStore(0)
-        val migrations = (1..10).map { FakeMigration(it) }
+        val migrations = (1..10).map { FakeAppMigration(it) }
         val presenter = createPresenter(
             migrationStore = store,
             migrations = migrations.toSet(),
@@ -81,13 +81,13 @@ class MigrationPresenterTest {
 
 private fun createPresenter(
     migrationStore: MigrationStore = InMemoryMigrationStore(0),
-    migrations: Set<AppMigration> = setOf(FakeMigration(1)),
+    migrations: Set<AppMigration> = setOf(FakeAppMigration(1)),
 ) = MigrationPresenter(
     migrationStore = migrationStore,
     migrations = migrations,
 )
 
-private class FakeMigration(
+private class FakeAppMigration(
     override val order: Int,
     var migrateLambda: LambdaNoParamRecorder<Unit> = lambdaRecorder { -> },
 ) : AppMigration {

From 8215661ada89f67194f285f41c3d763a8a843648 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 10:57:53 +0200
Subject: [PATCH 06/13] Rename class (code quality)

---
 .../features/migration/impl/migrations/AppMigration02Test.kt  | 4 ++--
 ...eStoreFactory.kt => FakeSessionPreferencesStoreFactory.kt} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/{FakeSessionPreferenceStoreFactory.kt => FakeSessionPreferencesStoreFactory.kt} (97%)

diff --git a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt
index 1a077fda2e7..6bb2f5babd0 100644
--- a/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt
+++ b/features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt
@@ -17,7 +17,7 @@
 package io.element.android.features.migration.impl.migrations
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.preferences.test.FakeSessionPreferenceStoreFactory
+import io.element.android.libraries.preferences.test.FakeSessionPreferencesStoreFactory
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
@@ -33,7 +33,7 @@ class AppMigration02Test {
             updateData(aSessionData())
         }
         val sessionPreferencesStore = InMemorySessionPreferencesStore(isSessionVerificationSkipped = false)
-        val sessionPreferencesStoreFactory = FakeSessionPreferenceStoreFactory(
+        val sessionPreferencesStoreFactory = FakeSessionPreferencesStoreFactory(
             getLambda = lambdaRecorder { _, _, -> sessionPreferencesStore },
         )
         val migration = AppMigration02(sessionStore = sessionStore, sessionPreferenceStoreFactory = sessionPreferencesStoreFactory)
diff --git a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferenceStoreFactory.kt b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferencesStoreFactory.kt
similarity index 97%
rename from libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferenceStoreFactory.kt
rename to libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferencesStoreFactory.kt
index 264ac4ec3a0..96761a9712c 100644
--- a/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferenceStoreFactory.kt
+++ b/libraries/preferences/test/src/main/kotlin/io/element/android/libraries/preferences/test/FakeSessionPreferencesStoreFactory.kt
@@ -24,7 +24,7 @@ import io.element.android.tests.testutils.lambda.LambdaTwoParamsRecorder
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.CoroutineScope
 
-class FakeSessionPreferenceStoreFactory(
+class FakeSessionPreferencesStoreFactory(
     var getLambda: LambdaTwoParamsRecorder<SessionId, CoroutineScope, SessionPreferencesStore> = lambdaRecorder { _, _ -> throw NotImplementedError() },
     var removeLambda: LambdaOneParamRecorder<SessionId, Unit> = lambdaRecorder { _ -> },
 ) : SessionPreferencesStoreFactory {

From 8e864adf728ff2065b1b5055431aae5417f2ba65 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 10:59:54 +0200
Subject: [PATCH 07/13] Exclude FakeImageLoader from this test.

---
 .../io/element/android/tests/konsist/KonsistClassNameTest.kt  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
index 092901e1e39..af7eb44618a 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
@@ -21,6 +21,7 @@ import com.bumble.appyx.core.node.Node
 import com.lemonappdev.konsist.api.Konsist
 import com.lemonappdev.konsist.api.ext.list.withAllParentsOf
 import com.lemonappdev.konsist.api.ext.list.withNameContaining
+import com.lemonappdev.konsist.api.ext.list.withoutName
 import com.lemonappdev.konsist.api.verify.assertTrue
 import io.element.android.libraries.architecture.Presenter
 import org.junit.Test
@@ -69,6 +70,9 @@ class KonsistClassNameTest {
         Konsist.scopeFromProject()
             .classes()
             .withNameContaining("Fake")
+            .withoutName(
+                "FakeImageLoader",
+            )
             .assertTrue {
                 val interfaceName = it.name.replace("Fake", "")
                 it.name.startsWith("Fake") &&

From 6e4c9d3171a870191432d5461037faa5c4ca20f5 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 11:00:54 +0200
Subject: [PATCH 08/13] Rename class (code quality)

---
 .../libraries/voicerecorder/impl/VoiceRecorderImplTest.kt     | 4 ++--
 ...{FakeAudioRecorderFactory.kt => FakeAudioReaderFactory.kt} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/{FakeAudioRecorderFactory.kt => FakeAudioReaderFactory.kt} (97%)

diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt
index 9bb1ace7b1f..022661bc117 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/impl/VoiceRecorderImplTest.kt
@@ -28,7 +28,7 @@ import io.element.android.libraries.voicerecorder.impl.audio.AudioConfig
 import io.element.android.libraries.voicerecorder.impl.audio.SampleRate
 import io.element.android.libraries.voicerecorder.impl.di.VoiceRecorderModule
 import io.element.android.libraries.voicerecorder.test.FakeAudioLevelCalculator
-import io.element.android.libraries.voicerecorder.test.FakeAudioRecorderFactory
+import io.element.android.libraries.voicerecorder.test.FakeAudioReaderFactory
 import io.element.android.libraries.voicerecorder.test.FakeEncoder
 import io.element.android.libraries.voicerecorder.test.FakeFileSystem
 import io.element.android.libraries.voicerecorder.test.FakeVoiceFileManager
@@ -136,7 +136,7 @@ class VoiceRecorderImplTest {
         return VoiceRecorderImpl(
             dispatchers = testCoroutineDispatchers(),
             timeSource = timeSource,
-            audioReaderFactory = FakeAudioRecorderFactory(
+            audioReaderFactory = FakeAudioReaderFactory(
                 audio = AUDIO,
             ),
             encoder = FakeEncoder(fakeFileSystem),
diff --git a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioRecorderFactory.kt b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReaderFactory.kt
similarity index 97%
rename from libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioRecorderFactory.kt
rename to libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReaderFactory.kt
index 02d8b4742c8..657b8d6ee9e 100644
--- a/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioRecorderFactory.kt
+++ b/libraries/voicerecorder/impl/src/test/kotlin/io/element/android/libraries/voicerecorder/test/FakeAudioReaderFactory.kt
@@ -21,7 +21,7 @@ import io.element.android.libraries.voicerecorder.impl.audio.Audio
 import io.element.android.libraries.voicerecorder.impl.audio.AudioConfig
 import io.element.android.libraries.voicerecorder.impl.audio.AudioReader
 
-class FakeAudioRecorderFactory(
+class FakeAudioReaderFactory(
     private val audio: List<Audio>
 ) : AudioReader.Factory {
     override fun create(config: AudioConfig, dispatchers: CoroutineDispatchers): AudioReader {

From 86f5a844b2ad71463d8e02cecf8071d19a27eace Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 11:01:44 +0200
Subject: [PATCH 09/13] Exclude FakeFileSystem from this test.

---
 .../io/element/android/tests/konsist/KonsistClassNameTest.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
index af7eb44618a..7bfb03f00c1 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
@@ -71,6 +71,7 @@ class KonsistClassNameTest {
             .classes()
             .withNameContaining("Fake")
             .withoutName(
+                "FakeFileSystem",
                 "FakeImageLoader",
             )
             .assertTrue {

From fc2d908f95df8537c99760a1ba58a2dae0c36342 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 11:02:38 +0200
Subject: [PATCH 10/13] Exclude FakeRustRoom from this test.

---
 .../io/element/android/tests/konsist/KonsistClassNameTest.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
index 7bfb03f00c1..dc47e1b76e7 100644
--- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
+++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistClassNameTest.kt
@@ -73,6 +73,7 @@ class KonsistClassNameTest {
             .withoutName(
                 "FakeFileSystem",
                 "FakeImageLoader",
+                "FakeRustRoom",
             )
             .assertTrue {
                 val interfaceName = it.name.replace("Fake", "")

From 6fe461f346d5f8fec45fccc3595232c401b7e14c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 11:03:22 +0200
Subject: [PATCH 11/13] Rename class (code quality)

---
 .../features/call/ui/CallScreenPresenterTest.kt  | 16 ++++++++--------
 .../call/utils/DefaultCallWidgetProviderTest.kt  |  6 +++---
 .../call/utils/FakeCallWidgetProvider.kt         |  4 ++--
 .../libraries/matrix/test/room/FakeMatrixRoom.kt |  4 ++--
 ...WidgetDriver.kt => FakeMatrixWidgetDriver.kt} |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/{FakeWidgetDriver.kt => FakeMatrixWidgetDriver.kt} (98%)

diff --git a/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
index 8eecc94e78f..a9ddb1bf6ba 100644
--- a/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
+++ b/features/call/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
@@ -30,7 +30,7 @@ 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.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.matrix.test.widget.FakeWidgetDriver
+import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 import io.element.android.libraries.network.useragent.UserAgentProvider
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import io.element.android.tests.testutils.WarmUpRule
@@ -68,7 +68,7 @@ class CallScreenPresenterTest {
 
     @Test
     fun `present - with CallType RoomCall loads URL and runs WidgetDriver`() = runTest {
-        val widgetDriver = FakeWidgetDriver()
+        val widgetDriver = FakeMatrixWidgetDriver()
         val widgetProvider = FakeCallWidgetProvider(widgetDriver)
         val presenter = createCallScreenPresenter(
             callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
@@ -91,7 +91,7 @@ class CallScreenPresenterTest {
 
     @Test
     fun `present - set message interceptor, send and receive messages`() = runTest {
-        val widgetDriver = FakeWidgetDriver()
+        val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
             callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
             widgetDriver = widgetDriver,
@@ -119,7 +119,7 @@ class CallScreenPresenterTest {
     @Test
     fun `present - hang up event closes the screen and stops the widget driver`() = runTest(UnconfinedTestDispatcher()) {
         val navigator = FakeCallScreenNavigator()
-        val widgetDriver = FakeWidgetDriver()
+        val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
             callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
             widgetDriver = widgetDriver,
@@ -149,7 +149,7 @@ class CallScreenPresenterTest {
     @Test
     fun `present - a received hang up message closes the screen and stops the widget driver`() = runTest(UnconfinedTestDispatcher()) {
         val navigator = FakeCallScreenNavigator()
-        val widgetDriver = FakeWidgetDriver()
+        val widgetDriver = FakeMatrixWidgetDriver()
         val presenter = createCallScreenPresenter(
             callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
             widgetDriver = widgetDriver,
@@ -178,7 +178,7 @@ class CallScreenPresenterTest {
     @Test
     fun `present - automatically starts the Matrix client sync when on RoomCall`() = runTest {
         val navigator = FakeCallScreenNavigator()
-        val widgetDriver = FakeWidgetDriver()
+        val widgetDriver = FakeMatrixWidgetDriver()
         val matrixClient = FakeMatrixClient()
         val presenter = createCallScreenPresenter(
             callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
@@ -201,7 +201,7 @@ class CallScreenPresenterTest {
     @Test
     fun `present - automatically stops the Matrix client sync on dispose`() = runTest {
         val navigator = FakeCallScreenNavigator()
-        val widgetDriver = FakeWidgetDriver()
+        val widgetDriver = FakeMatrixWidgetDriver()
         val matrixClient = FakeMatrixClient()
         val presenter = createCallScreenPresenter(
             callType = CallType.RoomCall(A_SESSION_ID, A_ROOM_ID),
@@ -229,7 +229,7 @@ class CallScreenPresenterTest {
     private fun TestScope.createCallScreenPresenter(
         callType: CallType,
         navigator: CallScreenNavigator = FakeCallScreenNavigator(),
-        widgetDriver: FakeWidgetDriver = FakeWidgetDriver(),
+        widgetDriver: FakeMatrixWidgetDriver = FakeMatrixWidgetDriver(),
         widgetProvider: FakeCallWidgetProvider = FakeCallWidgetProvider(widgetDriver),
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         matrixClientsProvider: FakeMatrixClientProvider = FakeMatrixClientProvider(),
diff --git a/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt b/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
index 368db19fcc9..0b7e2ce9534 100644
--- a/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
+++ b/features/call/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
@@ -26,7 +26,7 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.widget.FakeCallWidgetSettingsProvider
-import io.element.android.libraries.matrix.test.widget.FakeWidgetDriver
+import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -76,7 +76,7 @@ class DefaultCallWidgetProviderTest {
     fun `getWidget - returns a widget driver when all steps are successful`() = runTest {
         val room = FakeMatrixRoom().apply {
             givenGenerateWidgetWebViewUrlResult(Result.success("url"))
-            givenGetWidgetDriverResult(Result.success(FakeWidgetDriver()))
+            givenGetWidgetDriverResult(Result.success(FakeMatrixWidgetDriver()))
         }
         val client = FakeMatrixClient().apply {
             givenGetRoomResult(A_ROOM_ID, room)
@@ -89,7 +89,7 @@ class DefaultCallWidgetProviderTest {
     fun `getWidget - will use a custom base url if it exists`() = runTest {
         val room = FakeMatrixRoom().apply {
             givenGenerateWidgetWebViewUrlResult(Result.success("url"))
-            givenGetWidgetDriverResult(Result.success(FakeWidgetDriver()))
+            givenGetWidgetDriverResult(Result.success(FakeMatrixWidgetDriver()))
         }
         val client = FakeMatrixClient().apply {
             givenGetRoomResult(A_ROOM_ID, room)
diff --git a/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt b/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
index 27e47ee7080..c9e9ebb2ae4 100644
--- a/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
+++ b/features/call/src/test/kotlin/io/element/android/features/call/utils/FakeCallWidgetProvider.kt
@@ -19,10 +19,10 @@ package io.element.android.features.call.utils
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
-import io.element.android.libraries.matrix.test.widget.FakeWidgetDriver
+import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 
 class FakeCallWidgetProvider(
-    private val widgetDriver: FakeWidgetDriver = FakeWidgetDriver(),
+    private val widgetDriver: FakeMatrixWidgetDriver = FakeMatrixWidgetDriver(),
     private val url: String = "https://call.element.io",
 ) : CallWidgetProvider {
     var getWidgetCalled = false
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
index a780d33ecd1..4b4a8e1af00 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
@@ -55,7 +55,7 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
-import io.element.android.libraries.matrix.test.widget.FakeWidgetDriver
+import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 import io.element.android.tests.testutils.simulateLongTask
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentMapOf
@@ -125,7 +125,7 @@ class FakeMatrixRoom(
     private var endPollResult = Result.success(Unit)
     private var progressCallbackValues = emptyList<Pair<Long, Long>>()
     private var generateWidgetWebViewUrlResult = Result.success("https://call.element.io")
-    private var getWidgetDriverResult: Result<MatrixWidgetDriver> = Result.success(FakeWidgetDriver())
+    private var getWidgetDriverResult: Result<MatrixWidgetDriver> = Result.success(FakeMatrixWidgetDriver())
     private var canUserTriggerRoomNotificationResult: Result<Boolean> = Result.success(true)
     private var canUserJoinCallResult: Result<Boolean> = Result.success(true)
     private var setIsFavoriteResult = Result.success(Unit)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeWidgetDriver.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeMatrixWidgetDriver.kt
similarity index 98%
rename from libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeWidgetDriver.kt
rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeMatrixWidgetDriver.kt
index a64691fb406..be60b0011b5 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeWidgetDriver.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/widget/FakeMatrixWidgetDriver.kt
@@ -20,7 +20,7 @@ import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import kotlinx.coroutines.flow.MutableSharedFlow
 import java.util.UUID
 
-class FakeWidgetDriver(
+class FakeMatrixWidgetDriver(
     override val id: String = UUID.randomUUID().toString(),
 ) : MatrixWidgetDriver {
     private val _sentMessages = mutableListOf<String>()

From 6f44ef7a8f226a23c32298d3e9b950baf5d38639 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 23 May 2024 11:06:53 +0200
Subject: [PATCH 12/13] Rename class (code quality)

---
 .../DefaultVoiceMessageMediaRepoTest.kt       | 20 ++++++++---------
 .../libraries/matrix/test/FakeMatrixClient.kt |  4 ++--
 ...ediaLoader.kt => FakeMatrixMediaLoader.kt} |  2 +-
 .../mediaviewer/MediaViewerPresenterTest.kt   | 22 +++++++++----------
 4 files changed, 24 insertions(+), 24 deletions(-)
 rename libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/{FakeMediaLoader.kt => FakeMatrixMediaLoader.kt} (97%)

diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt
index a37f2e775f0..6e12756df74 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/timeline/DefaultVoiceMessageMediaRepoTest.kt
@@ -21,7 +21,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.mxc.MxcTools
-import io.element.android.libraries.matrix.test.media.FakeMediaLoader
+import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -34,12 +34,12 @@ class DefaultVoiceMessageMediaRepoTest {
 
     @Test
     fun `cache miss - downloads and returns cached file successfully`() = runTest {
-        val fakeMediaLoader = FakeMediaLoader().apply {
+        val matrixMediaLoader = FakeMatrixMediaLoader().apply {
             path = temporaryFolder.createRustMediaFile().path
         }
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
-            matrixMediaLoader = fakeMediaLoader,
+            matrixMediaLoader = matrixMediaLoader,
         )
 
         repo.getMediaFile().let { result ->
@@ -53,12 +53,12 @@ class DefaultVoiceMessageMediaRepoTest {
 
     @Test
     fun `cache miss - download fails`() = runTest {
-        val fakeMediaLoader = FakeMediaLoader().apply {
+        val matrixMediaLoader = FakeMatrixMediaLoader().apply {
             shouldFail = true
         }
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
-            matrixMediaLoader = fakeMediaLoader,
+            matrixMediaLoader = matrixMediaLoader,
         )
 
         repo.getMediaFile().let { result ->
@@ -71,7 +71,7 @@ class DefaultVoiceMessageMediaRepoTest {
 
     @Test
     fun `cache miss - download succeeds but file move fails`() = runTest {
-        val fakeMediaLoader = FakeMediaLoader().apply {
+        val matrixMediaLoader = FakeMatrixMediaLoader().apply {
             path = temporaryFolder.createRustMediaFile().path
         }
         File(temporaryFolder.cachedFilePath).apply {
@@ -83,7 +83,7 @@ class DefaultVoiceMessageMediaRepoTest {
         }
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
-            matrixMediaLoader = fakeMediaLoader,
+            matrixMediaLoader = matrixMediaLoader,
         )
 
         repo.getMediaFile().let { result ->
@@ -100,12 +100,12 @@ class DefaultVoiceMessageMediaRepoTest {
     @Test
     fun `cache hit - returns cached file successfully`() = runTest {
         temporaryFolder.createCachedFile()
-        val fakeMediaLoader = FakeMediaLoader().apply {
+        val matrixMediaLoader = FakeMatrixMediaLoader().apply {
             shouldFail = true // so that if we hit the media loader it will crash
         }
         val repo = createDefaultVoiceMessageMediaRepo(
             temporaryFolder = temporaryFolder,
-            matrixMediaLoader = fakeMediaLoader,
+            matrixMediaLoader = matrixMediaLoader,
         )
 
         repo.getMediaFile().let { result ->
@@ -135,7 +135,7 @@ class DefaultVoiceMessageMediaRepoTest {
 
 private fun createDefaultVoiceMessageMediaRepo(
     temporaryFolder: TemporaryFolder,
-    matrixMediaLoader: MatrixMediaLoader = FakeMediaLoader(),
+    matrixMediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
     mxcUri: String = MXC_URI,
 ) = DefaultVoiceMessageMediaRepo(
     cacheDir = temporaryFolder.root,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
index 17e9bedfcf3..be029705fb1 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
@@ -40,7 +40,7 @@ import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
-import io.element.android.libraries.matrix.test.media.FakeMediaLoader
+import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
 import io.element.android.libraries.matrix.test.notification.FakeNotificationService
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.pushers.FakePushersService
@@ -66,7 +66,7 @@ class FakeMatrixClient(
     private val userDisplayName: String? = A_USER_NAME,
     private val userAvatarUrl: String? = AN_AVATAR_URL,
     override val roomListService: RoomListService = FakeRoomListService(),
-    override val mediaLoader: MatrixMediaLoader = FakeMediaLoader(),
+    override val mediaLoader: MatrixMediaLoader = FakeMatrixMediaLoader(),
     private val sessionVerificationService: FakeSessionVerificationService = FakeSessionVerificationService(),
     private val pushersService: FakePushersService = FakePushersService(),
     private val notificationService: FakeNotificationService = FakeNotificationService(),
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaLoader.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt
similarity index 97%
rename from libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaLoader.kt
rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt
index c31beb8e4ae..b161a082e78 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMediaLoader.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/media/FakeMatrixMediaLoader.kt
@@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.api.media.MediaFile
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.tests.testutils.simulateLongTask
 
-class FakeMediaLoader : MatrixMediaLoader {
+class FakeMatrixMediaLoader : MatrixMediaLoader {
     var shouldFail = false
     var path: String = ""
 
diff --git a/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt b/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt
index 42a0a93c64b..67d8f7c3a1e 100644
--- a/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt
+++ b/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/MediaViewerPresenterTest.kt
@@ -25,7 +25,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
-import io.element.android.libraries.matrix.test.media.FakeMediaLoader
+import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
 import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.mediaviewer.api.local.anApkMediaInfo
 import io.element.android.libraries.mediaviewer.api.viewer.MediaViewerEvents
@@ -51,9 +51,9 @@ class MediaViewerPresenterTest {
 
     @Test
     fun `present - download media success scenario`() = runTest {
-        val mediaLoader = FakeMediaLoader()
+        val matrixMediaLoader = FakeMatrixMediaLoader()
         val mediaActions = FakeLocalMediaActions()
-        val presenter = createMediaViewerPresenter(mediaLoader, mediaActions)
+        val presenter = createMediaViewerPresenter(matrixMediaLoader, mediaActions)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -71,10 +71,10 @@ class MediaViewerPresenterTest {
 
     @Test
     fun `present - check all actions `() = runTest {
-        val mediaLoader = FakeMediaLoader()
+        val matrixMediaLoader = FakeMatrixMediaLoader()
         val mediaActions = FakeLocalMediaActions()
         val snackbarDispatcher = SnackbarDispatcher()
-        val presenter = createMediaViewerPresenter(mediaLoader, mediaActions, snackbarDispatcher)
+        val presenter = createMediaViewerPresenter(matrixMediaLoader, mediaActions, snackbarDispatcher)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -118,13 +118,13 @@ class MediaViewerPresenterTest {
 
     @Test
     fun `present - download media failure then retry with success scenario`() = runTest {
-        val mediaLoader = FakeMediaLoader()
+        val matrixMediaLoader = FakeMatrixMediaLoader()
         val mediaActions = FakeLocalMediaActions()
-        val presenter = createMediaViewerPresenter(mediaLoader, mediaActions)
+        val presenter = createMediaViewerPresenter(matrixMediaLoader, mediaActions)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            mediaLoader.shouldFail = true
+            matrixMediaLoader.shouldFail = true
             val initialState = awaitItem()
             assertThat(initialState.downloadedMedia).isEqualTo(AsyncData.Uninitialized)
             assertThat(initialState.mediaInfo).isEqualTo(TESTED_MEDIA_INFO)
@@ -132,7 +132,7 @@ class MediaViewerPresenterTest {
             assertThat(loadingState.downloadedMedia).isInstanceOf(AsyncData.Loading::class.java)
             val failureState = awaitItem()
             assertThat(failureState.downloadedMedia).isInstanceOf(AsyncData.Failure::class.java)
-            mediaLoader.shouldFail = false
+            matrixMediaLoader.shouldFail = false
             failureState.eventSink(MediaViewerEvents.RetryLoading)
             // There is one recomposition because of the retry mechanism
             skipItems(1)
@@ -146,7 +146,7 @@ class MediaViewerPresenterTest {
     }
 
     private fun createMediaViewerPresenter(
-        mediaLoader: FakeMediaLoader,
+        matrixMediaLoader: FakeMatrixMediaLoader,
         localMediaActions: FakeLocalMediaActions,
         snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
         canShare: Boolean = true,
@@ -161,7 +161,7 @@ class MediaViewerPresenterTest {
                 canDownload = canDownload,
             ),
             localMediaFactory = localMediaFactory,
-            mediaLoader = mediaLoader,
+            mediaLoader = matrixMediaLoader,
             localMediaActions = localMediaActions,
             snackbarDispatcher = snackbarDispatcher,
         )

From 7911fda1fa40f352cb7586a2291a5cf080dec5ba Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 23 May 2024 14:42:00 +0200
Subject: [PATCH 13/13] Rename class (code quality)

---
 .../appnav/di/MatrixClientsHolderTest.kt      | 12 +++++------
 .../impl/unlock/DefaultSignOutTest.kt         |  4 ++--
 .../changeserver/ChangeServerPresenterTest.kt |  8 ++++----
 .../impl/oidc/webview/OidcPresenterTest.kt    | 14 ++++++-------
 .../ChangeAccountProviderPresenterTest.kt     |  4 ++--
 .../ConfirmAccountProviderPresenterTest.kt    | 20 +++++++++----------
 .../LoginPasswordPresenterTest.kt             | 12 +++++------
 .../SearchAccountProviderPresenterTest.kt     | 12 +++++------
 .../waitlistscreen/WaitListPresenterTest.kt   |  8 ++++----
 ....kt => FakeMatrixAuthenticationService.kt} |  2 +-
 .../push/impl/push/DefaultPushHandlerTest.kt  |  8 ++++----
 .../DefaultFirebaseNewTokenHandlerTest.kt     | 10 +++++-----
 ...DefaultUnifiedPushNewGatewayHandlerTest.kt |  8 ++++----
 13 files changed, 61 insertions(+), 61 deletions(-)
 rename libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/{FakeAuthenticationService.kt => FakeMatrixAuthenticationService.kt} (99%)

diff --git a/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixClientsHolderTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixClientsHolderTest.kt
index 6dce8a63104..4fb518b0583 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixClientsHolderTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/di/MatrixClientsHolderTest.kt
@@ -20,21 +20,21 @@ import com.bumble.appyx.core.state.MutableSavedStateMapImpl
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
 class MatrixClientsHolderTest {
     @Test
     fun `test getOrNull`() {
-        val fakeAuthenticationService = FakeAuthenticationService()
+        val fakeAuthenticationService = FakeMatrixAuthenticationService()
         val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
         assertThat(matrixClientsHolder.getOrNull(A_SESSION_ID)).isNull()
     }
 
     @Test
     fun `test getOrRestore`() = runTest {
-        val fakeAuthenticationService = FakeAuthenticationService()
+        val fakeAuthenticationService = FakeMatrixAuthenticationService()
         val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
         val fakeMatrixClient = FakeMatrixClient()
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
@@ -47,7 +47,7 @@ class MatrixClientsHolderTest {
 
     @Test
     fun `test remove`() = runTest {
-        val fakeAuthenticationService = FakeAuthenticationService()
+        val fakeAuthenticationService = FakeMatrixAuthenticationService()
         val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
         val fakeMatrixClient = FakeMatrixClient()
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
@@ -60,7 +60,7 @@ class MatrixClientsHolderTest {
 
     @Test
     fun `test remove all`() = runTest {
-        val fakeAuthenticationService = FakeAuthenticationService()
+        val fakeAuthenticationService = FakeMatrixAuthenticationService()
         val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
         val fakeMatrixClient = FakeMatrixClient()
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
@@ -73,7 +73,7 @@ class MatrixClientsHolderTest {
 
     @Test
     fun `test save and restore`() = runTest {
-        val fakeAuthenticationService = FakeAuthenticationService()
+        val fakeAuthenticationService = FakeMatrixAuthenticationService()
         val matrixClientsHolder = MatrixClientsHolder(fakeAuthenticationService)
         val fakeMatrixClient = FakeMatrixClient()
         fakeAuthenticationService.givenMatrixClient(fakeMatrixClient)
diff --git a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/DefaultSignOutTest.kt b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/DefaultSignOutTest.kt
index 6870a336d3b..392693d9ef2 100644
--- a/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/DefaultSignOutTest.kt
+++ b/features/lockscreen/impl/src/test/kotlin/io/element/android/features/lockscreen/impl/unlock/DefaultSignOutTest.kt
@@ -20,7 +20,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.lockscreen.impl.unlock.signout.DefaultSignOut
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.test.runTest
@@ -28,7 +28,7 @@ import org.junit.Test
 
 class DefaultSignOutTest {
     private val matrixClient = FakeMatrixClient()
-    private val authenticationService = FakeAuthenticationService()
+    private val authenticationService = FakeMatrixAuthenticationService()
     private val matrixClientProvider = FakeMatrixClientProvider(getClient = { Result.success(matrixClient) })
     private val sut = DefaultSignOut(authenticationService, matrixClientProvider)
 
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
index f8518f6033e..e6969921f3c 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerPresenterTest.kt
@@ -25,7 +25,7 @@ import io.element.android.features.login.impl.accountprovider.AccountProviderDat
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.test.A_HOMESERVER
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -38,7 +38,7 @@ class ChangeServerPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = ChangeServerPresenter(
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
             AccountProviderDataSource()
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -51,7 +51,7 @@ class ChangeServerPresenterTest {
 
     @Test
     fun `present - change server ok`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = ChangeServerPresenter(
             authenticationService,
             AccountProviderDataSource()
@@ -72,7 +72,7 @@ class ChangeServerPresenterTest {
 
     @Test
     fun `present - change server error`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = ChangeServerPresenter(
             authenticationService,
             AccountProviderDataSource()
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt
index 34b497866a6..38d0506dd8d 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/oidc/webview/OidcPresenterTest.kt
@@ -26,7 +26,7 @@ import io.element.android.features.login.api.oidc.OidcAction
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.auth.A_OIDC_DATA
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
@@ -41,7 +41,7 @@ class OidcPresenterTest {
     fun `present - initial state`() = runTest {
         val presenter = OidcPresenter(
             A_OIDC_DATA,
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -56,7 +56,7 @@ class OidcPresenterTest {
     fun `present - go back`() = runTest {
         val presenter = OidcPresenter(
             A_OIDC_DATA,
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -72,7 +72,7 @@ class OidcPresenterTest {
 
     @Test
     fun `present - go back with failure`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = OidcPresenter(
             A_OIDC_DATA,
             authenticationService,
@@ -95,7 +95,7 @@ class OidcPresenterTest {
     fun `present - user cancels from webview`() = runTest {
         val presenter = OidcPresenter(
             A_OIDC_DATA,
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -113,7 +113,7 @@ class OidcPresenterTest {
     fun `present - login success`() = runTest {
         val presenter = OidcPresenter(
             A_OIDC_DATA,
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -128,7 +128,7 @@ class OidcPresenterTest {
 
     @Test
     fun `present - login error`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = OidcPresenter(
             A_OIDC_DATA,
             authenticationService,
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt
index 04680ede17b..f7696652d0a 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderPresenterTest.kt
@@ -23,7 +23,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.login.impl.accountprovider.AccountProvider
 import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource
 import io.element.android.features.login.impl.changeserver.ChangeServerPresenter
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -36,7 +36,7 @@ class ChangeAccountProviderPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val changeServerPresenter = ChangeServerPresenter(
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
             AccountProviderDataSource()
         )
         val presenter = ChangeAccountProviderPresenter(
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt
index 57f18d7eb42..5a02797bdb3 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderPresenterTest.kt
@@ -30,7 +30,7 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.test.A_HOMESERVER
 import io.element.android.libraries.matrix.test.A_HOMESERVER_OIDC
 import io.element.android.libraries.matrix.test.A_THROWABLE
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.waitForPredicate
 import kotlinx.coroutines.test.runTest
@@ -57,7 +57,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - continue password login`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
@@ -79,7 +79,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - continue oidc`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
@@ -101,7 +101,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - cancel with failure`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val defaultOidcActionFlow = DefaultOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
@@ -129,7 +129,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - cancel with success`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val defaultOidcActionFlow = DefaultOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
@@ -156,7 +156,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - success with failure`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val defaultOidcActionFlow = DefaultOidcActionFlow()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
@@ -186,7 +186,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - oidc - success with success`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val defaultOidcActionFlow = DefaultOidcActionFlow()
         val defaultLoginUserStory = DefaultLoginUserStory().apply {
             setLoginFlowIsDone(false)
@@ -219,7 +219,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - submit fails`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
@@ -238,7 +238,7 @@ class ConfirmAccountProviderPresenterTest {
 
     @Test
     fun `present - clear error`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val presenter = createConfirmAccountProviderPresenter(
             matrixAuthenticationService = authenticationService,
         )
@@ -267,7 +267,7 @@ class ConfirmAccountProviderPresenterTest {
     private fun createConfirmAccountProviderPresenter(
         params: ConfirmAccountProviderPresenter.Params = ConfirmAccountProviderPresenter.Params(isAccountCreation = false),
         accountProviderDataSource: AccountProviderDataSource = AccountProviderDataSource(),
-        matrixAuthenticationService: MatrixAuthenticationService = FakeAuthenticationService(),
+        matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
         defaultOidcActionFlow: DefaultOidcActionFlow = DefaultOidcActionFlow(),
         defaultLoginUserStory: DefaultLoginUserStory = DefaultLoginUserStory(),
     ) = ConfirmAccountProviderPresenter(
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt
index 4658df0ab94..db73c25687a 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordPresenterTest.kt
@@ -30,7 +30,7 @@ import io.element.android.libraries.matrix.test.A_PASSWORD
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.A_USER_NAME
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -42,7 +42,7 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - initial state`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val accountProviderDataSource = AccountProviderDataSource()
         val loginUserStory = DefaultLoginUserStory()
         val presenter = LoginPasswordPresenter(
@@ -63,7 +63,7 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - enter login and password`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val accountProviderDataSource = AccountProviderDataSource()
         val loginUserStory = DefaultLoginUserStory()
         val presenter = LoginPasswordPresenter(
@@ -89,7 +89,7 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - submit`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val accountProviderDataSource = AccountProviderDataSource()
         val loginUserStory = DefaultLoginUserStory().apply { setLoginFlowIsDone(false) }
         val presenter = LoginPasswordPresenter(
@@ -118,7 +118,7 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - submit with error`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val accountProviderDataSource = AccountProviderDataSource()
         val loginUserStory = DefaultLoginUserStory()
         val presenter = LoginPasswordPresenter(
@@ -146,7 +146,7 @@ class LoginPasswordPresenterTest {
 
     @Test
     fun `present - clear error`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val accountProviderDataSource = AccountProviderDataSource()
         val loginUserStory = DefaultLoginUserStory()
         val presenter = LoginPasswordPresenter(
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
index 28aa1090a96..52887465833 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt
@@ -29,7 +29,7 @@ import io.element.android.features.login.impl.resolver.network.WellKnownBaseConf
 import io.element.android.features.login.impl.resolver.network.WellKnownSlidingSyncConfig
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.test.runTest
@@ -44,7 +44,7 @@ class SearchAccountProviderPresenterTest {
     fun `present - initial state`() = runTest {
         val fakeWellknownRequest = FakeWellknownRequest()
         val changeServerPresenter = ChangeServerPresenter(
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
             AccountProviderDataSource()
         )
         val presenter = SearchAccountProviderPresenter(
@@ -64,7 +64,7 @@ class SearchAccountProviderPresenterTest {
     fun `present - enter text no result`() = runTest {
         val fakeWellknownRequest = FakeWellknownRequest()
         val changeServerPresenter = ChangeServerPresenter(
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
             AccountProviderDataSource()
         )
         val presenter = SearchAccountProviderPresenter(
@@ -88,7 +88,7 @@ class SearchAccountProviderPresenterTest {
     fun `present - enter valid url no wellknown`() = runTest {
         val fakeWellknownRequest = FakeWellknownRequest()
         val changeServerPresenter = ChangeServerPresenter(
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
             AccountProviderDataSource()
         )
         val presenter = SearchAccountProviderPresenter(
@@ -123,7 +123,7 @@ class SearchAccountProviderPresenterTest {
             )
         )
         val changeServerPresenter = ChangeServerPresenter(
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
             AccountProviderDataSource()
         )
         val presenter = SearchAccountProviderPresenter(
@@ -158,7 +158,7 @@ class SearchAccountProviderPresenterTest {
             )
         )
         val changeServerPresenter = ChangeServerPresenter(
-            FakeAuthenticationService(),
+            FakeMatrixAuthenticationService(),
             AccountProviderDataSource()
         )
         val presenter = SearchAccountProviderPresenter(
diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListPresenterTest.kt
index f88f47ae26c..4f751a5c9e6 100644
--- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListPresenterTest.kt
+++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListPresenterTest.kt
@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.test.A_HOMESERVER
 import io.element.android.libraries.matrix.test.A_HOMESERVER_URL
 import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
@@ -41,7 +41,7 @@ class WaitListPresenterTest {
 
     @Test
     fun `present - initial state`() = runTest {
-        val authenticationService = FakeAuthenticationService().apply {
+        val authenticationService = FakeMatrixAuthenticationService().apply {
             givenHomeserver(A_HOMESERVER)
         }
         val loginUserStory = DefaultLoginUserStory()
@@ -63,7 +63,7 @@ class WaitListPresenterTest {
 
     @Test
     fun `present - attempt login with error`() = runTest {
-        val authenticationService = FakeAuthenticationService().apply {
+        val authenticationService = FakeMatrixAuthenticationService().apply {
             givenLoginError(A_THROWABLE)
         }
         val loginUserStory = DefaultLoginUserStory()
@@ -94,7 +94,7 @@ class WaitListPresenterTest {
 
     @Test
     fun `present - attempt login with success`() = runTest {
-        val authenticationService = FakeAuthenticationService()
+        val authenticationService = FakeMatrixAuthenticationService()
         val loginUserStory = DefaultLoginUserStory().apply { setLoginFlowIsDone(false) }
         val presenter = WaitListPresenter(
             LoginFormState.Default,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeMatrixAuthenticationService.kt
similarity index 99%
rename from libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt
rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeMatrixAuthenticationService.kt
index b138c55acbf..9cec3cbecfc 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeAuthenticationService.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeMatrixAuthenticationService.kt
@@ -31,7 +31,7 @@ import kotlinx.coroutines.flow.flowOf
 
 val A_OIDC_DATA = OidcDetails(url = "a-url")
 
-class FakeAuthenticationService(
+class FakeMatrixAuthenticationService(
     private val matrixClientResult: ((SessionId) -> Result<MatrixClient>)? = null
 ) : MatrixAuthenticationService {
     private val homeserver = MutableStateFlow<MatrixHomeServerDetails?>(null)
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
index bae296a574e..7739efbd1dd 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt
@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SECRET
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.push.impl.notifications.FakeNotifiableEventResolver
 import io.element.android.libraries.push.impl.notifications.fixtures.aNotifiableMessageEvent
@@ -135,7 +135,7 @@ class DefaultPushHandlerTest {
                 pushClientSecret = FakePushClientSecret(
                     getUserIdFromSecretResult = { null }
                 ),
-                matrixAuthenticationService = FakeAuthenticationService().apply {
+                matrixAuthenticationService = FakeMatrixAuthenticationService().apply {
                     getLatestSessionIdLambda = { A_USER_ID }
                 },
                 incrementPushCounterResult = incrementPushCounterResult
@@ -171,7 +171,7 @@ class DefaultPushHandlerTest {
                 pushClientSecret = FakePushClientSecret(
                     getUserIdFromSecretResult = { null }
                 ),
-                matrixAuthenticationService = FakeAuthenticationService().apply {
+                matrixAuthenticationService = FakeMatrixAuthenticationService().apply {
                     getLatestSessionIdLambda = { null }
                 },
                 incrementPushCounterResult = incrementPushCounterResult
@@ -247,7 +247,7 @@ class DefaultPushHandlerTest {
         userPushStore: UserPushStore = FakeUserPushStore(),
         pushClientSecret: PushClientSecret = FakePushClientSecret(),
         buildMeta: BuildMeta = aBuildMeta(),
-        matrixAuthenticationService: MatrixAuthenticationService = FakeAuthenticationService(),
+        matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
         diagnosticPushHandler: DiagnosticPushHandler = DiagnosticPushHandler(),
     ): DefaultPushHandler {
         return DefaultPushHandler(
diff --git a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
index af2b98ea07c..585a5e2a089 100644
--- a/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
+++ b/libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt
@@ -25,7 +25,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID_3
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.push.test.FakePusherSubscriber
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
@@ -66,7 +66,7 @@ class DefaultFirebaseNewTokenHandlerTest {
                 storeData(aSessionData(A_USER_ID_2))
                 storeData(aSessionData(A_USER_ID_3))
             },
-            matrixAuthenticationService = FakeAuthenticationService(
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
                 matrixClientResult = { sessionId ->
                     when (sessionId) {
                         A_USER_ID -> Result.success(aMatrixClient1)
@@ -105,7 +105,7 @@ class DefaultFirebaseNewTokenHandlerTest {
             sessionStore = InMemoryMultiSessionsStore().apply {
                 storeData(aSessionData(A_USER_ID))
             },
-            matrixAuthenticationService = FakeAuthenticationService(
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
                 matrixClientResult = { _ ->
                     Result.failure(IllegalStateException())
                 }
@@ -131,7 +131,7 @@ class DefaultFirebaseNewTokenHandlerTest {
             sessionStore = InMemoryMultiSessionsStore().apply {
                 storeData(aSessionData(A_USER_ID))
             },
-            matrixAuthenticationService = FakeAuthenticationService(
+            matrixAuthenticationService = FakeMatrixAuthenticationService(
                 matrixClientResult = { _ ->
                     Result.success(aMatrixClient1)
                 }
@@ -154,7 +154,7 @@ class DefaultFirebaseNewTokenHandlerTest {
         pusherSubscriber: PusherSubscriber = FakePusherSubscriber(),
         sessionStore: SessionStore = InMemorySessionStore(),
         userPushStoreFactory: UserPushStoreFactory = FakeUserPushStoreFactory(),
-        matrixAuthenticationService: MatrixAuthenticationService = FakeAuthenticationService(),
+        matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService(),
         firebaseStore: FirebaseStore = InMemoryFirebaseStore(),
     ): FirebaseNewTokenHandler {
         return DefaultFirebaseNewTokenHandler(
diff --git a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt
index 3f0b7409cca..09637fcd219 100644
--- a/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt
+++ b/libraries/pushproviders/unifiedpush/src/test/kotlin/io/element/android/libraries/pushproviders/unifiedpush/DefaultUnifiedPushNewGatewayHandlerTest.kt
@@ -22,7 +22,7 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.test.A_SECRET
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService
+import io.element.android.libraries.matrix.test.auth.FakeMatrixAuthenticationService
 import io.element.android.libraries.push.test.FakePusherSubscriber
 import io.element.android.libraries.pushproviders.api.PusherSubscriber
 import io.element.android.libraries.pushstore.api.UserPushStoreFactory
@@ -86,7 +86,7 @@ class DefaultUnifiedPushNewGatewayHandlerTest {
             pusherSubscriber = FakePusherSubscriber(
                 registerPusherResult = { _, _, _ -> Result.failure(IllegalStateException("an error")) }
             ),
-            matrixAuthenticationService = FakeAuthenticationService(matrixClientResult = { Result.success(aMatrixClient) }),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(matrixClientResult = { Result.success(aMatrixClient) }),
         )
         val result = defaultUnifiedPushNewGatewayHandler.handle(
             endpoint = "aEndpoint",
@@ -114,7 +114,7 @@ class DefaultUnifiedPushNewGatewayHandlerTest {
             pusherSubscriber = FakePusherSubscriber(
                 registerPusherResult = lambda
             ),
-            matrixAuthenticationService = FakeAuthenticationService(matrixClientResult = { Result.success(aMatrixClient) }),
+            matrixAuthenticationService = FakeMatrixAuthenticationService(matrixClientResult = { Result.success(aMatrixClient) }),
         )
         val result = defaultUnifiedPushNewGatewayHandler.handle(
             endpoint = "aEndpoint",
@@ -131,7 +131,7 @@ class DefaultUnifiedPushNewGatewayHandlerTest {
         pusherSubscriber: PusherSubscriber = FakePusherSubscriber(),
         userPushStoreFactory: UserPushStoreFactory = FakeUserPushStoreFactory(),
         pushClientSecret: PushClientSecret = FakePushClientSecret(),
-        matrixAuthenticationService: MatrixAuthenticationService = FakeAuthenticationService()
+        matrixAuthenticationService: MatrixAuthenticationService = FakeMatrixAuthenticationService()
     ): DefaultUnifiedPushNewGatewayHandler {
         return DefaultUnifiedPushNewGatewayHandler(
             pusherSubscriber = pusherSubscriber,