Make experimental features testable (#21902)

* Moved feature enum inside of ExperimentalFeatures class

* Adjusted other experimental features classes to adjust for previous commit

* Adjusted EditPostActivity and SelectedSiteRepository for changes to experimental features

* Fixed missing param in SelectedSiteRepositoryTest

* Updated SelectedSiteRepositoryTest to no longer mock shared prefs

---------

Co-authored-by: Adalberto Plaza <[email protected]>

Author: nbradbury

WordPress/src/main/java/org/wordpress/android/ui/mysite/SelectedSiteRepository.kt

@@ -12,8 +12,9 @@ import org.wordpress.android.fluxc.store.EditorSettingsStore.FetchEditorSettings
 import org.wordpress.android.fluxc.store.EditorThemeStore
 import org.wordpress.android.ui.prefs.AppPrefs
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
-import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeature
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 import org.wordpress.android.ui.prefs.SiteSettingsInterfaceWrapper
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures
 import org.wordpress.android.util.config.GutenbergKitFeature
 import org.wordpress.android.util.mapSafe
 import javax.inject.Inject
@@ -24,6 +25,7 @@ class SelectedSiteRepository @Inject constructor(
     private val dispatcher: Dispatcher,
     private val siteSettingsInterfaceFactory: SiteSettingsInterfaceWrapper.Factory,
     private val appPrefsWrapper: AppPrefsWrapper,
+    private val experimentalFeatures: ExperimentalFeatures,
 ) {
     private var siteSettings: SiteSettingsInterfaceWrapper? = null
 
@@ -136,7 +138,8 @@ class SelectedSiteRepository @Inject constructor(
         }
 
         // Fetch the site's editor theme and settings
-        if (ExperimentalFeature.EXPERIMENTAL_BLOCK_EDITOR.isEnabled() || gutenbergKitFeature.isEnabled()) {
+        if (experimentalFeatures.isEnabled(Feature.EXPERIMENTAL_BLOCK_EDITOR) ||
+            gutenbergKitFeature.isEnabled()) {
             fetchEditorSettings(selectedSite)
         } else {
             fetchEditorTheme(selectedSite)

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt

@@ -198,9 +198,10 @@ import org.wordpress.android.ui.posts.services.AztecVideoLoader
 import org.wordpress.android.ui.posts.sharemessage.EditJetpackSocialShareMessageActivity
 import org.wordpress.android.ui.posts.sharemessage.EditJetpackSocialShareMessageActivity.Companion.createIntent
 import org.wordpress.android.ui.prefs.AppPrefs
-import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeature
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 import org.wordpress.android.ui.prefs.SiteSettingsInterface
 import org.wordpress.android.ui.prefs.SiteSettingsInterface.SiteSettingsListener
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.suggestion.SuggestionActivity
 import org.wordpress.android.ui.suggestion.SuggestionType
@@ -421,12 +422,7 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
 
     @Inject lateinit var gutenbergKitFeature: GutenbergKitFeature
     @Inject lateinit var gutenbergKitPluginsFeature: GutenbergKitPluginsFeature
-
-    private val disableGutenbergKitFeatureConfig: ExperimentalFeature =
-        ExperimentalFeature.DISABLE_EXPERIMENTAL_BLOCK_EDITOR
-    private val gutenbergKitFeatureConfig: ExperimentalFeature = ExperimentalFeature.EXPERIMENTAL_BLOCK_EDITOR
-    private val gutenbergKitThemeStylesConfig: ExperimentalFeature =
-        ExperimentalFeature.EXPERIMENTAL_BLOCK_EDITOR_THEME_STYLES
+    @Inject lateinit var experimentalFeatures: ExperimentalFeatures
 
     @Inject lateinit var storePostViewModel: StorePostViewModel
     @Inject lateinit var storageUtilsViewModel: StorageUtilsViewModel
@@ -531,8 +527,10 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
         }
         onBackPressedDispatcher.addCallback(this, callback)
         dispatcher.register(this)
-        isGutenbergKitEditor = (gutenbergKitFeatureConfig.isEnabled() || gutenbergKitFeature.isEnabled())
-                && !disableGutenbergKitFeatureConfig.isEnabled()
+        val isGutenbergEnabled = experimentalFeatures.isEnabled(Feature.EXPERIMENTAL_BLOCK_EDITOR) ||
+                gutenbergKitFeature.isEnabled()
+        val isGutenbergDisabled = experimentalFeatures.isEnabled(Feature.DISABLE_EXPERIMENTAL_BLOCK_EDITOR)
+        isGutenbergKitEditor = isGutenbergEnabled && !isGutenbergDisabled
 
         createEditShareMessageActivityResultLauncher()
 
@@ -2532,7 +2530,7 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
                 "namespaceExcludedPaths" to arrayOf("/wpcom/v2/following/recommendations", "/wpcom/v2/following/mine"),
                 "authHeader" to authHeader,
                 "siteApiNamespace" to siteApiNamespace,
-                "themeStyles" to gutenbergKitThemeStylesConfig.isEnabled(),
+                "themeStyles" to experimentalFeatures.isEnabled(Feature.EXPERIMENTAL_BLOCK_EDITOR_THEME_STYLES),
                 // Limited to Simple sites until application passwords are supported
                 "plugins" to (gutenbergKitPluginsFeature.isEnabled() && site.isWPCom),
                 "locale" to wpcomLocaleSlug,

WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt

@@ -197,6 +197,10 @@ class AppPrefsWrapper @Inject constructor(val buildConfigWrapper: BuildConfigWra
         return AppPrefs.getExperimentalFeatureConfig(featureKey)
     }
 
+    fun setExperimentalFeatureConfig(isEnabled: Boolean, featureKey: String) {
+        AppPrefs.setExperimentalFeatureConfig(isEnabled, featureKey)
+    }
+
     fun incrementPublishedPostCount() {
         AppPrefs.incrementPublishedPostCount()
     }

WordPress/src/main/java/org/wordpress/android/ui/prefs/experimentalfeatures/ExperimentalFeature.kt

@@ -0,0 +1,44 @@
+package org.wordpress.android.ui.prefs.experimentalfeatures
+
+import org.wordpress.android.R
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
+import javax.inject.Inject
+
+class ExperimentalFeatures @Inject constructor(
+    private val appPrefsWrapper: AppPrefsWrapper
+) {
+    fun isEnabled(feature: Feature) : Boolean {
+        return appPrefsWrapper.getExperimentalFeatureConfig(feature.prefKey)
+    }
+
+    fun setEnabled(feature: Feature, isEnabled: Boolean) {
+        appPrefsWrapper.setExperimentalFeatureConfig(isEnabled, feature.prefKey)
+    }
+
+    enum class Feature(
+        val prefKey: String,
+        val labelResId: Int,
+        val descriptionResId: Int
+    ) {
+        DISABLE_EXPERIMENTAL_BLOCK_EDITOR(
+            "disable_experimental_block_editor",
+            R.string.disable_experimental_block_editor,
+            R.string.disable_experimental_block_editor_description
+        ),
+        EXPERIMENTAL_BLOCK_EDITOR(
+            "experimental_block_editor",
+            R.string.experimental_block_editor,
+            R.string.experimental_block_editor_description
+        ),
+        EXPERIMENTAL_BLOCK_EDITOR_THEME_STYLES(
+            "experimental_block_editor_theme_styles",
+            R.string.experimental_block_editor_theme_styles,
+            R.string.experimental_block_editor_theme_styles_description
+        ),
+        EXPERIMENTAL_SUBSCRIBERS_FEATURE(
+            "experimental_subscribers_feature",
+            R.string.experimental_subscribers_feature,
+            R.string.experimental_subscribers_feature_description
+        );
+    }
+}

WordPress/src/main/java/org/wordpress/android/ui/prefs/experimentalfeatures/ExperimentalFeatures.kt

@@ -37,7 +37,7 @@ class ExperimentalFeaturesActivity : BaseAppCompatActivity() {
                 ExperimentalFeaturesScreen(
                     features = features,
                     onFeatureToggled = { feature, enabled ->
-                        if (feature == ExperimentalFeature.EXPERIMENTAL_BLOCK_EDITOR && !enabled) {
+                        if (feature == ExperimentalFeatures.Feature.EXPERIMENTAL_BLOCK_EDITOR && !enabled) {
                             showDialog.value = true
                         }
                         viewModel.onFeatureToggled(feature, enabled)

WordPress/src/main/java/org/wordpress/android/ui/prefs/experimentalfeatures/ExperimentalFeaturesActivity.kt

@@ -28,12 +28,13 @@ import androidx.compose.ui.tooling.preview.Preview
 import org.wordpress.android.R
 import org.wordpress.android.ui.compose.theme.AppThemeM3
 import org.wordpress.android.ui.compose.unit.Margin
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ExperimentalFeaturesScreen(
-    features: Map<ExperimentalFeature, Boolean>,
-    onFeatureToggled: (feature: ExperimentalFeature, enabled: Boolean) -> Unit,
+    features: Map<Feature, Boolean>,
+    onFeatureToggled: (feature: Feature, enabled: Boolean) -> Unit,
     onNavigateBack: () -> Unit
 ) {
     Scaffold(
@@ -91,9 +92,9 @@ fun ExperimentalFeaturesScreen(
 
 @Composable
 fun FeatureToggle(
-    feature: ExperimentalFeature,
+    feature: Feature,
     enabled: Boolean,
-    onChange: (ExperimentalFeature, Boolean) -> Unit,
+    onChange: (Feature, Boolean) -> Unit,
 ) {
     ListItem(
         headlineContent = {
@@ -145,7 +146,7 @@ fun FeedbackDialog(onDismiss: () -> Unit, onSendFeedback: () -> Unit) {
 fun ExperimentalFeaturesScreenPreview() {
     AppThemeM3 {
         val featuresStatusAlternated = remember {
-            ExperimentalFeature.entries.toTypedArray().mapIndexed { index, feature ->
+            ExperimentalFeatures.Feature.entries.toTypedArray().mapIndexed { index, feature ->
                 feature to (index % 2 == 0)
             }.toMap()
         }

WordPress/src/main/java/org/wordpress/android/ui/prefs/experimentalfeatures/ExperimentalFeaturesScreen.kt

@@ -9,40 +9,42 @@ import kotlinx.coroutines.flow.update
 import org.wordpress.android.BuildConfig
 import org.wordpress.android.util.config.GutenbergKitFeature
 import javax.inject.Inject
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 
 @HiltViewModel
 internal class ExperimentalFeaturesViewModel @Inject constructor(
+    private val experimentalFeatures: ExperimentalFeatures,
     private val gutenbergKitFeature: GutenbergKitFeature
 ) : ViewModel() {
-    private val _switchStates = MutableStateFlow<Map<ExperimentalFeature, Boolean>>(emptyMap())
-    val switchStates: StateFlow<Map<ExperimentalFeature, Boolean>> = _switchStates.asStateFlow()
+    private val _switchStates = MutableStateFlow<Map<Feature, Boolean>>(emptyMap())
+    val switchStates: StateFlow<Map<Feature, Boolean>> = _switchStates.asStateFlow()
 
     init {
-        val initialStates = ExperimentalFeature.entries
+        val initialStates = Feature.entries
             .filter { feature ->
                 shouldShowFeature(feature)
             }.associateWith { feature ->
-                feature.isEnabled()
+                experimentalFeatures.isEnabled(feature)
             }
         _switchStates.value = initialStates
     }
 
-    private fun shouldShowFeature(feature: ExperimentalFeature): Boolean {
+    private fun shouldShowFeature(feature: Feature): Boolean {
         // only show subscribers in debug builds
-        return if (BuildConfig.DEBUG.not() && feature == ExperimentalFeature.EXPERIMENTAL_SUBSCRIBERS_FEATURE) {
+        return if (BuildConfig.DEBUG.not() && feature == Feature.EXPERIMENTAL_SUBSCRIBERS_FEATURE) {
             false
         } else if (gutenbergKitFeature.isEnabled()) {
-            feature != ExperimentalFeature.EXPERIMENTAL_BLOCK_EDITOR
+            feature != Feature.EXPERIMENTAL_BLOCK_EDITOR
         } else {
-            feature != ExperimentalFeature.DISABLE_EXPERIMENTAL_BLOCK_EDITOR
+            feature != Feature.DISABLE_EXPERIMENTAL_BLOCK_EDITOR
         }
     }
 
-    fun onFeatureToggled(feature: ExperimentalFeature, enabled: Boolean) {
+    fun onFeatureToggled(feature: Feature, enabled: Boolean) {
         _switchStates.update { currentStates ->
             currentStates.toMutableMap().apply {
                 this[feature] = enabled
-                feature.setEnabled(enabled)
+                experimentalFeatures.setEnabled(feature, enabled)
             }
         }
     }

WordPress/src/main/java/org/wordpress/android/ui/prefs/experimentalfeatures/ExperimentalFeaturesViewModel.kt

@@ -1,8 +1,6 @@
 package org.wordpress.android.ui.mysite
 
 import android.content.Context
-import android.content.SharedPreferences
-import android.content.SharedPreferences.Editor
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -27,6 +25,8 @@ import org.wordpress.android.ui.prefs.SiteSettingsInterfaceWrapper
 import org.wordpress.android.util.config.GutenbergKitFeature
 import org.wordpress.android.AppInitializer
 import org.wordpress.android.fluxc.action.EditorSettingsAction
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures
+import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 
 @ExperimentalCoroutinesApi
 class SelectedSiteRepositoryTest : BaseUnitTest() {
@@ -46,13 +46,10 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
     lateinit var gutenbergKitFeature: GutenbergKitFeature
 
     @Mock
-    lateinit var context: Context
-
-    @Mock
-    lateinit var sharedPreferences: SharedPreferences
+    lateinit var experimentalFeatures: ExperimentalFeatures
 
     @Mock
-    lateinit var editor: Editor
+    lateinit var context: Context
 
     private lateinit var siteModel: SiteModel
     private var siteIconProgressBarVisible: Boolean = false
@@ -72,9 +69,6 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
             set(null, context)
         }
 
-        // Mock shared preferences
-        whenever(context.getSharedPreferences(any(), any())).thenReturn(sharedPreferences)
-
         // Mock AppPrefsWrapper
         whenever(appPrefsWrapper.setSelectedSite(any())).then { }
 
@@ -85,6 +79,7 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
             dispatcher,
             siteSettingsInterfaceFactory,
             appPrefsWrapper,
+            experimentalFeatures,
         )
         selectedSiteRepository.gutenbergKitFeature = gutenbergKitFeature
         selectedSiteRepository.showSiteIconProgressBar.observeForever { siteIconProgressBarVisible = it == true }
@@ -279,12 +274,9 @@ class SelectedSiteRepositoryTest : BaseUnitTest() {
 
     @Test
     fun `Should fetch EditorSettings when ExperimentalBlockEditor is enabled`() {
-        // Mocking via the specific key is required as ExperimentalFeature currently relies upon AppPrefs rather than
-        // AppPrefsWrapper, making mocking a bit more difficult
-        whenever(sharedPreferences.getBoolean(
-            eq("EXPERIMENTAL_FEATURE_CONFIGexperimental_block_editor"),
-            eq(false)
-        )).thenReturn(true)
+        whenever(
+            experimentalFeatures.isEnabled(Feature.EXPERIMENTAL_BLOCK_EDITOR)
+        ).thenReturn(true)
         initializeSiteAndSiteSettings()
 
         selectedSiteRepository.updateSiteSettingsIfNecessary()