Fix tests

Author: bmarty

services/analytics/impl/src/main/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsService.kt

@@ -17,6 +17,7 @@ import im.vector.app.features.analytics.itf.VectorAnalyticsScreen
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
 import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.api.observer.SessionListener
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
 import io.element.android.services.analytics.api.AnalyticsService
@@ -40,6 +41,7 @@ class DefaultAnalyticsService(
     @AppCoroutineScope
     private val coroutineScope: CoroutineScope,
     private val sessionObserver: SessionObserver,
+    private val sessionStore: SessionStore,
 ) : AnalyticsService, SessionListener {
     // Cache for the store values
     private val userConsent = AtomicBoolean(false)
@@ -84,8 +86,10 @@ class DefaultAnalyticsService(
     }
 
     override suspend fun onSessionDeleted(userId: String) {
-        // Delete the store
-        // analyticsStore.reset()
+        // Delete the store when the last session is deleted
+        if (sessionStore.getAllSessions().isEmpty()) {
+            analyticsStore.reset()
+        }
     }
 
     private fun observeUserConsent() {

services/analytics/impl/src/test/kotlin/io/element/android/services/analytics/impl/DefaultAnalyticsServiceTest.kt

@@ -16,7 +16,10 @@ import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.plan.PollEnd
 import im.vector.app.features.analytics.plan.SuperProperties
 import im.vector.app.features.analytics.plan.UserProperties
+import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
+import io.element.android.libraries.sessionstorage.test.InMemorySessionStore
+import io.element.android.libraries.sessionstorage.test.aSessionData
 import io.element.android.libraries.sessionstorage.test.observer.NoOpSessionObserver
 import io.element.android.services.analytics.impl.store.AnalyticsStore
 import io.element.android.services.analytics.impl.store.FakeAnalyticsStore
@@ -167,7 +170,7 @@ class DefaultAnalyticsServiceTest {
     }
 
     @Test
-    fun `when a session is deleted, the store is reset`() = runTest {
+    fun `when the last session is deleted, the store is reset`() = runTest {
         val resetLambda = lambdaRecorder<Unit> { }
         val store = FakeAnalyticsStore(
             resetLambda = resetLambda,
@@ -180,6 +183,23 @@ class DefaultAnalyticsServiceTest {
         resetLambda.assertions().isCalledOnce()
     }
 
+    @Test
+    fun `when a session is deleted, the store is not reset`() = runTest {
+        val resetLambda = lambdaRecorder<Unit> { }
+        val store = FakeAnalyticsStore(
+            resetLambda = resetLambda,
+        )
+        val sut = createDefaultAnalyticsService(
+            coroutineScope = backgroundScope,
+            analyticsStore = store,
+            sessionStore = InMemorySessionStore(
+                initialList = listOf(aSessionData()),
+            )
+        )
+        sut.onSessionDeleted("userId")
+        resetLambda.assertions().isNeverCalled()
+    }
+
     @Test
     fun `when reset is invoked, the user consent is reset`() = runTest {
         val store = FakeAnalyticsStore(
@@ -272,11 +292,13 @@ class DefaultAnalyticsServiceTest {
         ),
         analyticsStore: AnalyticsStore = FakeAnalyticsStore(),
         sessionObserver: SessionObserver = NoOpSessionObserver(),
+        sessionStore: SessionStore = InMemorySessionStore(),
     ) = DefaultAnalyticsService(
         analyticsProviders = analyticsProviders,
         analyticsStore = analyticsStore,
         coroutineScope = coroutineScope,
         sessionObserver = sessionObserver,
+        sessionStore = sessionStore,
     ).also {
         // Wait for the service to be ready
         delay(1)