Cleanup tests.

features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration02Test.kt

@@ -20,12 +20,12 @@ import org.junit.Test
 class AppMigration02Test {
     @Test
     fun `test migration`() = runTest {
-        val sessionStore = InMemorySessionStore().apply {
+        val sessionStore = InMemorySessionStore(
-            updateData(aSessionData())
+            initialList = listOf(aSessionData()),
-        }
+        )
         val sessionPreferencesStore = InMemorySessionPreferencesStore(isSessionVerificationSkipped = false)
         val sessionPreferencesStoreFactory = FakeSessionPreferencesStoreFactory(
-            getLambda = lambdaRecorder { _, _, -> sessionPreferencesStore },
+            getLambda = lambdaRecorder { _, _ -> sessionPreferencesStore },
             removeLambda = lambdaRecorder { _ -> }
         )
         val migration = AppMigration02(sessionStore = sessionStore, sessionPreferenceStoreFactory = sessionPreferencesStoreFactory)

features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration05Test.kt

@@ -18,14 +18,14 @@ import java.io.File
 class AppMigration05Test {
     @Test
     fun `empty session path should be set to an expected path`() = runTest {
-        val sessionStore = InMemorySessionStore().apply {
+        val sessionStore = InMemorySessionStore(
-            updateData(
+            initialList = listOf(
                 aSessionData(
                     sessionId = A_SESSION_ID.value,
                     sessionPath = "",
                 )
             )
-        }
+        )
         val migration = AppMigration05(sessionStore = sessionStore, baseDirectory = File("/a/path"))
         migration.migrate()
         val storedData = sessionStore.getSession(A_SESSION_ID.value)!!
@@ -34,14 +34,14 @@ class AppMigration05Test {
 
     @Test
     fun `non empty session path should not be impacted by the migration`() = runTest {
-        val sessionStore = InMemorySessionStore().apply {
+        val sessionStore = InMemorySessionStore(
-            updateData(
+            initialList = listOf(
                 aSessionData(
                     sessionId = A_SESSION_ID.value,
                     sessionPath = "/a/path/existing",
                 )
             )
-        }
+        )
         val migration = AppMigration05(sessionStore = sessionStore, baseDirectory = File("/a/path"))
         migration.migrate()
         val storedData = sessionStore.getSession(A_SESSION_ID.value)!!

features/migration/impl/src/test/kotlin/io/element/android/features/migration/impl/migrations/AppMigration06Test.kt

@@ -18,15 +18,15 @@ import java.io.File
 class AppMigration06Test {
     @Test
     fun `empty cache path should be set to an expected path`() = runTest {
-        val sessionStore = InMemorySessionStore().apply {
+        val sessionStore = InMemorySessionStore(
-            updateData(
+            initialList = listOf(
                 aSessionData(
                     sessionId = A_SESSION_ID.value,
                     sessionPath = "/a/path/to/a/session/AN_ID",
                     cachePath = "",
                 )
             )
-        }
+        )
         val migration = AppMigration06(sessionStore = sessionStore, cacheDirectory = File("/a/path/cache"))
         migration.migrate()
         val storedData = sessionStore.getSession(A_SESSION_ID.value)!!
@@ -35,14 +35,14 @@ class AppMigration06Test {
 
     @Test
     fun `non empty cache path should not be impacted by the migration`() = runTest {
-        val sessionStore = InMemorySessionStore().apply {
+        val sessionStore = InMemorySessionStore(
-            updateData(
+            initialList = listOf(
                 aSessionData(
                     sessionId = A_SESSION_ID.value,
                     cachePath = "/a/path/existing",
                 )
             )
-        }
+        )
         val migration = AppMigration05(sessionStore = sessionStore, baseDirectory = File("/a/path/cache"))
         migration.migrate()
         val storedData = sessionStore.getSession(A_SESSION_ID.value)!!

features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt

@@ -104,9 +104,9 @@ class DefaultBugReporterTest {
         )
         server.start()
 
-        val mockSessionStore = InMemorySessionStore().apply {
+        val mockSessionStore = InMemorySessionStore(
-            storeData(aSessionData(sessionId = "@foo:example.com", deviceId = "ABCDEFGH"))
+            initialList = listOf(aSessionData(sessionId = "@foo:example.com", deviceId = "ABCDEFGH"))
-        }
+        )
 
         val fakeEncryptionService = FakeEncryptionService()
         val matrixClient = FakeMatrixClient(encryptionService = fakeEncryptionService)
@@ -165,9 +165,9 @@ class DefaultBugReporterTest {
         )
         server.start()
 
-        val mockSessionStore = InMemorySessionStore().apply {
+        val mockSessionStore = InMemorySessionStore(
-            storeData(aSessionData("@foo:example.com", "ABCDEFGH"))
+            initialList = listOf(aSessionData("@foo:example.com", "ABCDEFGH"))
-        }
+        )
 
         val fakeEncryptionService = FakeEncryptionService()
         val matrixClient = FakeMatrixClient(encryptionService = fakeEncryptionService)
@@ -308,9 +308,9 @@ class DefaultBugReporterTest {
     fun `the log directory is initialized using the last session store data`() = runTest {
         val sut = createDefaultBugReporter(
             buildMeta = aBuildMeta(isEnterpriseBuild = true),
-            sessionStore = InMemorySessionStore().apply {
+            sessionStore = InMemorySessionStore(
-                storeData(aSessionData(sessionId = "@alice:domain.com"))
+                initialList = listOf(aSessionData(sessionId = "@alice:domain.com"))
-            }
+            )
         )
         assertThat(sut.logDirectory().absolutePath).endsWith("/cache/logs/domain.com")
     }
@@ -318,9 +318,9 @@ class DefaultBugReporterTest {
     @Test
     fun `foss build - the log directory is initialized to the root log directory`() = runTest {
         val sut = createDefaultBugReporter(
-            sessionStore = InMemorySessionStore().apply {
+            sessionStore = InMemorySessionStore(
-                storeData(aSessionData(sessionId = "@alice:domain.com"))
+                initialList = listOf(aSessionData(sessionId = "@alice:domain.com"))
-            }
+            )
         )
         assertThat(sut.logDirectory().absolutePath).endsWith("/cache/logs")
     }

features/signedout/impl/src/test/kotlin/io/element/android/features/signedout/impl/SignedOutPresenterTest.kt

@@ -31,9 +31,9 @@ class SignedOutPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val aSessionData = aSessionData()
-        val sessionStore = InMemorySessionStore().apply {
+        val sessionStore = InMemorySessionStore(
-            storeData(aSessionData)
+            initialList = listOf(aSessionData)
-        }
+        )
         val presenter = createSignedOutPresenter(sessionStore = sessionStore)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -48,9 +48,9 @@ class SignedOutPresenterTest {
     @Test
     fun `present - sign in again`() = runTest {
         val aSessionData = aSessionData()
-        val sessionStore = InMemorySessionStore().apply {
+        val sessionStore = InMemorySessionStore(
-            storeData(aSessionData)
+            initialList = listOf(aSessionData)
-        }
+        )
         val presenter = createSignedOutPresenter(sessionStore = sessionStore)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/RustClientSessionDelegateTest.kt

@@ -23,11 +23,12 @@ import org.junit.Test
 class RustClientSessionDelegateTest {
     @Test
     fun `saveSessionInKeychain should update the store`() = runTest {
-        val sessionStore = InMemorySessionStore()
+        val sessionStore = InMemorySessionStore(
-        sessionStore.storeData(
+            initialList = listOf(
-            aSessionData(
+                aSessionData(
-                accessToken = "anAccessToken",
+                    accessToken = "anAccessToken",
-                refreshToken = "aRefreshToken",
+                    refreshToken = "aRefreshToken",
+                )
             )
         )
         val sut = aRustClientSessionDelegate(sessionStore)

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/util/SessionPathsProviderTest.kt

@@ -24,14 +24,15 @@ class SessionPathsProviderTest {
 
     @Test
     fun `if session is found, provides returns the data`() = runTest {
-        val store = InMemorySessionStore()
+        val store = InMemorySessionStore(
-        val sut = SessionPathsProvider(store)
+            initialList = listOf(
-        store.storeData(
+                aSessionData(
-            aSessionData(
+                    sessionPath = "/a/path/to/a/session",
-                sessionPath = "/a/path/to/a/session",
+                    cachePath = "/a/path/to/a/cache",
-                cachePath = "/a/path/to/a/cache",
+                )
             )
         )
+        val sut = SessionPathsProvider(store)
         val result = sut.provides(A_SESSION_ID)!!
         assertThat(result.fileDirectory.absolutePath).isEqualTo("/a/path/to/a/session")
         assertThat(result.cacheDirectory.absolutePath).isEqualTo("/a/path/to/a/cache")

libraries/pushproviders/firebase/src/test/kotlin/io/element/android/libraries/pushproviders/firebase/DefaultFirebaseNewTokenHandlerTest.kt

@@ -49,11 +49,13 @@ class DefaultFirebaseNewTokenHandlerTest {
         val registerPusherResult = lambdaRecorder<MatrixClient, String, String, Result<Unit>> { _, _, _ -> Result.success(Unit) }
         val pusherSubscriber = FakePusherSubscriber(registerPusherResult = registerPusherResult)
         val firebaseNewTokenHandler = createDefaultFirebaseNewTokenHandler(
-            sessionStore = InMemorySessionStore().apply {
+            sessionStore = InMemorySessionStore(
-                storeData(aSessionData(A_USER_ID.value))
+                initialList = listOf(
-                storeData(aSessionData(A_USER_ID_2.value))
+                    aSessionData(A_USER_ID.value),
-                storeData(aSessionData(A_USER_ID_3.value))
+                    aSessionData(A_USER_ID_2.value),
-            },
+                    aSessionData(A_USER_ID_3.value),
+                )
+            ),
             matrixClientProvider = FakeMatrixClientProvider { sessionId ->
                 when (sessionId) {
                     A_USER_ID -> Result.success(aMatrixClient1)
@@ -88,9 +90,9 @@ class DefaultFirebaseNewTokenHandlerTest {
         val registerPusherResult = lambdaRecorder<MatrixClient, String, String, Result<Unit>> { _, _, _ -> Result.success(Unit) }
         val pusherSubscriber = FakePusherSubscriber(registerPusherResult = registerPusherResult)
         val firebaseNewTokenHandler = createDefaultFirebaseNewTokenHandler(
-            sessionStore = InMemorySessionStore().apply {
+            sessionStore = InMemorySessionStore(
-                storeData(aSessionData(A_USER_ID.value))
+                initialList = listOf(aSessionData(A_USER_ID.value))
-            },
+            ),
             matrixClientProvider = FakeMatrixClientProvider {
                 Result.failure(IllegalStateException())
             },
@@ -112,9 +114,9 @@ class DefaultFirebaseNewTokenHandlerTest {
         val registerPusherResult = lambdaRecorder<MatrixClient, String, String, Result<Unit>> { _, _, _ -> Result.failure(AN_EXCEPTION) }
         val pusherSubscriber = FakePusherSubscriber(registerPusherResult = registerPusherResult)
         val firebaseNewTokenHandler = createDefaultFirebaseNewTokenHandler(
-            sessionStore = InMemorySessionStore().apply {
+            sessionStore = InMemorySessionStore(
-                storeData(aSessionData(A_USER_ID.value))
+                initialList = listOf(aSessionData(A_USER_ID.value))
-            },
+            ),
             matrixClientProvider = FakeMatrixClientProvider {
                 Result.success(aMatrixClient1)
             },

libraries/session-storage/test/src/main/kotlin/io/element/android/libraries/sessionstorage/test/InMemorySessionStore.kt

@@ -15,8 +15,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.map
 
-class InMemorySessionStore : SessionStore {
+class InMemorySessionStore(
-    private val sessionDataListFlow = MutableStateFlow<List<SessionData>>(emptyList())
+    initialList: List<SessionData> = emptyList(),
+) : SessionStore {
+    private val sessionDataListFlow = MutableStateFlow(initialList)
 
     override fun isLoggedIn(): Flow<LoggedInState> {
         return sessionDataListFlow.map {