Bug 1944956 - Part 4: Renaming the new repository and fixing tests r=android-reviewers,gmalekpour,twhite

Differential Revision: https://phabricator.services.mozilla.com/D236297

Author: mavduevskiy

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/store/PrivacyPreferencesMiddleware.kt

@@ -13,7 +13,7 @@ import mozilla.components.lib.state.MiddlewareContext
  * @param repository [PrivacyPreferencesRepository] used to access the privacy preferences.
  */
 class PrivacyPreferencesMiddleware(
-    private val repository: SimplePrivacyPreferencesRepository,
+    private val repository: PrivacyPreferencesRepository,
 ) : Middleware<PrivacyPreferencesState, PrivacyPreferencesAction> {
 
     override fun invoke(

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/store/SimplePrivacyPreferencesRepository.kt renamed to mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/store/PrivacyPreferencesRepository.kt

@@ -9,7 +9,7 @@ import org.mozilla.fenix.utils.Settings
 /**
  * The repository for managing user privacy preferences set during onboarding.
  */
-interface SimplePrivacyPreferencesRepository {
+interface PrivacyPreferencesRepository {
 
     /**
      * Retrieves the state of a specific preference.
@@ -36,13 +36,13 @@ enum class PreferenceType {
 }
 
 /**
- * The default implementation of [SimplePrivacyPreferencesRepository].
+ * The default implementation of [PrivacyPreferencesRepository].
  *
  * @param settings The [Settings] instance for accessing and modifying privacy-related settings.
  */
-class DefaultSimplePrivacyPreferencesRepository(
+class DefaultPrivacyPreferencesRepository(
     private val settings: Settings,
-) : SimplePrivacyPreferencesRepository {
+) : PrivacyPreferencesRepository {
 
     override fun getPreference(type: PreferenceType): Boolean {
         return when (type) {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/ManagePrivacyPreferencesDialogFragment.kt

@@ -13,7 +13,7 @@ import androidx.fragment.app.DialogFragment
 import org.mozilla.fenix.components.lazyStore
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.onboarding.ManagePrivacyPreferencesDialog
-import org.mozilla.fenix.onboarding.store.DefaultSimplePrivacyPreferencesRepository
+import org.mozilla.fenix.onboarding.store.DefaultPrivacyPreferencesRepository
 import org.mozilla.fenix.onboarding.store.PreferenceType
 import org.mozilla.fenix.onboarding.store.PrivacyPreferencesAction
 import org.mozilla.fenix.onboarding.store.PrivacyPreferencesMiddleware
@@ -30,7 +30,7 @@ import org.mozilla.fenix.theme.FirefoxTheme
 class ManagePrivacyPreferencesDialogFragment : DialogFragment() {
 
     private val store by lazyStore {
-        val repository = DefaultSimplePrivacyPreferencesRepository(
+        val repository = DefaultPrivacyPreferencesRepository(
             settings = requireContext().settings(),
         )
         PrivacyPreferencesStore(

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/store/DefaultPrivacyPreferencesRepositoryTest.kt

@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.fenix.onboarding.store
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
+import mozilla.components.support.test.robolectric.testContext
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mozilla.fenix.utils.Settings
+
+@RunWith(AndroidJUnit4::class)
+class DefaultPrivacyPreferencesRepositoryTest {
+
+    @Test
+    fun `GIVEN crash reporting flag is updated in settings WHEN getPreference is called THEN updated value is returned `() {
+        val settings = Settings(testContext)
+        val repository = DefaultPrivacyPreferencesRepository(settings)
+        assertFalse(settings.crashReportAlwaysSend)
+        assertFalse(repository.getPreference(PreferenceType.CrashReporting))
+
+        settings.crashReportAlwaysSend = true
+        assertTrue(repository.getPreference(PreferenceType.CrashReporting))
+
+        settings.crashReportAlwaysSend = false
+        assertFalse(repository.getPreference(PreferenceType.CrashReporting))
+    }
+
+    @Test
+    fun `GIVEN telemetry flag is updated in settings WHEN getPreference is called THEN updated value is returned `() {
+        val settings = Settings(testContext)
+        val repository = DefaultPrivacyPreferencesRepository(settings)
+        assertTrue(settings.isTelemetryEnabled)
+        assertTrue(repository.getPreference(PreferenceType.UsageData))
+
+        settings.isTelemetryEnabled = false
+        assertFalse(repository.getPreference(PreferenceType.UsageData))
+
+        settings.isTelemetryEnabled = true
+        assertTrue(repository.getPreference(PreferenceType.UsageData))
+    }
+}

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/store/PrivacyPreferencesMiddlewareTest.kt

@@ -5,17 +5,14 @@
 package org.mozilla.fenix.onboarding.store
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import kotlinx.coroutines.flow.emptyFlow
+import junit.framework.TestCase.assertEquals
 import mozilla.components.lib.state.MiddlewareContext
 import mozilla.components.support.test.mock
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito.verify
 import org.mockito.Mockito.verifyNoInteractions
-import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.`when`
 import org.mockito.MockitoAnnotations
 
 @RunWith(AndroidJUnit4::class)
@@ -37,47 +34,41 @@ class PrivacyPreferencesMiddlewareTest {
     }
 
     @Test
-    fun `GIVEN init called with no preferences WHEN middleware is invoked THEN only the repo is initialized`() {
-        `when`(repository.privacyPreferenceUpdates).thenReturn(emptyFlow())
-
-        middleware.invoke(context, {}, PrivacyPreferencesAction.Init)
-
-        verifyNoInteractions(context)
-        verify(repository).init()
-    }
+    fun `WHEN data usage update action is invoked THEN new value is set in repository`() {
+        var dataUsageEnabled = true
+        val middleware = PrivacyPreferencesMiddleware(
+            repository = object : PrivacyPreferencesRepository {
+                override fun getPreference(type: PreferenceType) = false
+
+                override fun setPreference(type: PreferenceType, enabled: Boolean) {
+                    dataUsageEnabled = enabled
+                }
+            },
+        )
 
-    @Test
-    fun `GIVEN init called with preferences WHEN middleware is invoked THEN the repo is initialized`() {
-        middleware.invoke(context, {}, PrivacyPreferencesAction.Init)
+        val updatedDataUsageEnabled = !dataUsageEnabled
+        middleware.invoke(context, {}, PrivacyPreferencesAction.UsageDataPreferenceUpdatedTo(enabled = updatedDataUsageEnabled))
 
-        verify(repository).init()
-        verifyNoMoreInteractions(repository)
+        assertEquals(updatedDataUsageEnabled, dataUsageEnabled)
     }
 
     @Test
-    fun `GIVEN crash reporting called WHEN middleware is invoked THEN the repo is updated`() {
-        val action = PrivacyPreferencesAction.CrashReportingPreferenceUpdatedTo(true)
-        middleware.invoke(context, {}, action)
-
-        verify(repository).updatePrivacyPreference(
-            PrivacyPreferencesRepository.PrivacyPreferenceUpdate(
-                preferenceType = PrivacyPreferencesRepository.PrivacyPreference.CrashReporting,
-                value = action.enabled,
-            ),
+    fun `WHEN crash reporting update action is invoked THEN new value is set in repository`() {
+        var crashReportEnabled = true
+        val middleware = PrivacyPreferencesMiddleware(
+            repository = object : PrivacyPreferencesRepository {
+                override fun getPreference(type: PreferenceType) = false
+
+                override fun setPreference(type: PreferenceType, enabled: Boolean) {
+                    crashReportEnabled = enabled
+                }
+            },
         )
-    }
 
-    @Test
-    fun `GIVEN usage data called WHEN middleware is invoked THEN the repo is updated`() {
-        val action = PrivacyPreferencesAction.UsageDataPreferenceUpdatedTo(true)
-        middleware.invoke(context, {}, action)
+        val updatedCrashReportEnabled = !crashReportEnabled
+        middleware.invoke(context, {}, PrivacyPreferencesAction.UsageDataPreferenceUpdatedTo(enabled = updatedCrashReportEnabled))
 
-        verify(repository).updatePrivacyPreference(
-            PrivacyPreferencesRepository.PrivacyPreferenceUpdate(
-                preferenceType = PrivacyPreferencesRepository.PrivacyPreference.UsageData,
-                value = action.enabled,
-            ),
-        )
+        assertEquals(updatedCrashReportEnabled, crashReportEnabled)
     }
 
     @Test