androiddev2019
diff --git a/‎app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
Lines changed: 4 additions & 2 deletions b/‎app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
Lines changed: 4 additions & 2 deletions
diff --git a/‎app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt
Lines changed: 1 addition & 1 deletion b/‎app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/src/androidTest/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt
Lines changed: 1 addition & 1 deletion b/‎app/src/androidTest/java/com/duckduckgo/app/settings/SettingsViewModelTest.kt
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/src/androidTest/java/com/duckduckgo/app/statistics/ApiBasedPixelTest.kt
Lines changed: 3 additions & 3 deletions b/‎app/src/androidTest/java/com/duckduckgo/app/statistics/ApiBasedPixelTest.kt
Lines changed: 3 additions & 3 deletions
diff --git a/‎app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
Lines changed: 24 additions & 6 deletions b/‎app/src/androidTest/java/com/duckduckgo/app/statistics/ExperimentationVariantManagerTest.kt
Lines changed: 24 additions & 6 deletions
diff --git a/‎app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterJsonTest.kt
Lines changed: 1 addition & 1 deletion b/‎app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterJsonTest.kt
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt
+1Lines changed: 1 addition & 1 deletion b/‎app/src/androidTest/java/com/duckduckgo/app/statistics/api/StatisticsRequesterTest.kt
+1Lines changed: 1 addition & 1 deletion
diff --git a/‎app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
Lines changed: 22 additions & 7 deletions b/‎app/src/main/java/com/duckduckgo/app/statistics/VariantManager.kt
Lines changed: 22 additions & 7 deletions
@@ -218,7 +218,7 @@ class BrowserTabViewModelTest {
         testee.command.observeForever(mockCommandObserver)
 
         whenever(mockOmnibarConverter.convertQueryToUrl(any())).thenReturn("duckduckgo.com")
-        whenever(mockVariantManager.getVariant()).thenReturn(VariantManager.DEFAULT_VARIANT)
+        whenever(mockVariantManager.getVariant()).thenReturn(DEFAULT_VARIANT)
     }
 
     @After
@@ -481,7 +481,9 @@ class BrowserTabViewModelTest {
 
     @Test
     fun whenProgressChangesToFinishedAndImprovedTabUxVariantActiveThenWebViewPreviewGenerated() {
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("mx", 1.0, listOf(VariantManager.VariantFeature.TabSwitcherGrid)))
+        whenever(mockVariantManager.getVariant()).thenReturn(
+            Variant("mx", 1.0, listOf(VariantManager.VariantFeature.TabSwitcherGrid), filterBy = { true })
+        )
         updateUrl("https://example.com", "https://example.com", true)
         testee.progressChanged(100)
         val command = captureCommands().lastValue as Command.GenerateWebViewPreviewImage
 
@@ -57,7 +57,7 @@ class AtbIntegrationTest {
         statisticsStore = StatisticsSharedPreferences(InstrumentationRegistry.getInstrumentation().targetContext)
         statisticsStore.clearAtb()
 
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0))
+        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0, filterBy = { true }))
         service = getDaggerComponent().retrofit().create(StatisticsService::class.java)
         testee = StatisticsRequester(statisticsStore, service, mockVariantManager)
     }
 
@@ -51,7 +51,7 @@ class ApiBasedPixelTest {
     fun whenPixelFiredThenPixelServiceCalledWithCorrectAtbAndVariant() {
         whenever(mockPixelService.fire(any(), any(), any(), anyOrNull())).thenReturn(Completable.complete())
         whenever(mockStatisticsDataStore.atb).thenReturn(Atb("atb"))
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant"))
+        whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant", filterBy = { true }))
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
 
         val pixel = ApiBasedPixel(mockPixelService, mockStatisticsDataStore, mockVariantManager, mockDeviceInfo)
@@ -99,7 +99,7 @@ class ApiBasedPixelTest {
     fun whenPixelFiredWithAdditionalParametersThenPixelServiceCalledWithDefaultAndAdditionalParameters() {
         whenever(mockPixelService.fire(any(), any(), any(), any())).thenReturn(Completable.complete())
         whenever(mockStatisticsDataStore.atb).thenReturn(Atb("atb"))
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant"))
+        whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant", filterBy = { true }))
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
         whenever(mockDeviceInfo.appVersion).thenReturn("1.0.0")
 
@@ -115,7 +115,7 @@ class ApiBasedPixelTest {
     fun whenPixelFiredWithoutAdditionalParametersThenPixelServiceCalledWithOnlyDefaultParameters() {
         whenever(mockPixelService.fire(any(), any(), any(), any())).thenReturn(Completable.complete())
         whenever(mockStatisticsDataStore.atb).thenReturn(Atb("atb"))
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant"))
+        whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant", filterBy = { true }))
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
         whenever(mockDeviceInfo.appVersion).thenReturn("1.0.0")
 
 
@@ -43,15 +43,15 @@ class ExperimentationVariantManagerTest {
 
     @Test
     fun whenVariantAlreadyPersistedThenVariantReturned() {
-        activeVariants.add(Variant("foo", 100.0))
+        activeVariants.add(Variant("foo", 100.0, filterBy = { true }))
         whenever(mockStore.variant).thenReturn("foo")
 
         assertEquals("foo", testee.getVariant(activeVariants).key)
     }
 
     @Test
     fun whenVariantAlreadyPersistedThenVariantAllocatorNeverInvoked() {
-        activeVariants.add(Variant("foo", 100.0))
+        activeVariants.add(Variant("foo", 100.0, filterBy = { true }))
         whenever(mockStore.variant).thenReturn("foo")
 
         testee.getVariant(activeVariants)
@@ -77,15 +77,15 @@ class ExperimentationVariantManagerTest {
 
     @Test
     fun whenVariantPersistedIsNotFoundInActiveVariantListThenRestoredToDefaultVariant() {
-        activeVariants.add(Variant("foo", 100.0))
+        activeVariants.add(Variant("foo", 100.0, filterBy = { true }))
         whenever(mockStore.variant).thenReturn("bar")
 
         assertEquals(VariantManager.DEFAULT_VARIANT, testee.getVariant(activeVariants))
     }
 
     @Test
     fun whenVariantPersistedIsNotFoundInActiveVariantListThenNewVariantIsPersisted() {
-        activeVariants.add(Variant("foo", 100.0))
+        activeVariants.add(Variant("foo", 100.0, filterBy = { true }))
 
         whenever(mockStore.variant).thenReturn("bar")
         testee.getVariant(activeVariants)
@@ -96,7 +96,7 @@ class ExperimentationVariantManagerTest {
 
     @Test
     fun whenNoVariantPersistedThenNewVariantAllocated() {
-        activeVariants.add(Variant("foo", 100.0))
+        activeVariants.add(Variant("foo", 100.0, filterBy = { true }))
 
         testee.getVariant(activeVariants)
 
@@ -105,7 +105,25 @@ class ExperimentationVariantManagerTest {
 
     @Test
     fun whenNoVariantPersistedThenNewVariantKeyIsAllocatedAndPersisted() {
-        activeVariants.add(Variant("foo", 100.0))
+        activeVariants.add(Variant("foo", 100.0, filterBy = { true }))
+
+        testee.getVariant(activeVariants)
+
+        verify(mockStore).variant = "foo"
+    }
+
+    @Test
+    fun whenVariantDoesNotComplyWithFiltersThenDefaultVariantIsPersisted() {
+        activeVariants.add(Variant("foo", 100.0, filterBy = { false }))
+
+        testee.getVariant(activeVariants)
+
+        verify(mockStore).variant = VariantManager.DEFAULT_VARIANT.key
+    }
+
+    @Test
+    fun whenVariantDoesComplyWithFiltersThenNewVariantKeyIsAllocatedAndPersisted() {
+        activeVariants.add(Variant("foo", 100.0, filterBy = { true }))
 
         testee.getVariant(activeVariants)
 
 
@@ -70,7 +70,7 @@ class StatisticsRequesterJsonTest {
         statisticsStore.clearAtb()
 
         testee = StatisticsRequester(statisticsStore, statisticsService, mockVariantManager)
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0))
+        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0, filterBy = { true }))
     }
 
     @After
 
@@ -44,7 +44,7 @@ class StatisticsRequesterTest {
 
     @Before
     fun before() {
-        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0))
+        whenever(mockVariantManager.getVariant()).thenReturn(Variant("ma", 100.0, filterBy = { true }))
         whenever(mockService.atb(any())).thenReturn(Observable.just(ATB))
         whenever(mockService.updateSearchAtb(any(), any(), any())).thenReturn(Observable.just(Atb(NEW_ATB)))
         whenever(mockService.exti(any(), any())).thenReturn(Observable.just(mockResponseBody))
 
@@ -20,6 +20,7 @@ import androidx.annotation.WorkerThread
 import com.duckduckgo.app.statistics.VariantManager.Companion.DEFAULT_VARIANT
 import com.duckduckgo.app.statistics.store.StatisticsDataStore
 import timber.log.Timber
+import java.util.Locale
 
 @WorkerThread
 interface VariantManager {
@@ -32,18 +33,26 @@ interface VariantManager {
     companion object {
 
         // this will be returned when there are no other active experiments
-        val DEFAULT_VARIANT = Variant(key = "", features = emptyList())
+        val DEFAULT_VARIANT = Variant(key = "", features = emptyList(), filterBy = { noFilter() })
 
         val ACTIVE_VARIANTS = listOf(
 
             // SERP variants. "sc" may also be used as a shared control for mobile experiments in
             // the future if we can filter by app version
-            Variant(key = "sc", weight = 0.0, features = emptyList()),
-            Variant(key = "se", weight = 0.0, features = emptyList()),
+            Variant(key = "sc", weight = 0.0, features = emptyList(), filterBy = { noFilter() }),
+            Variant(key = "se", weight = 0.0, features = emptyList(), filterBy = { noFilter() }),
 
-            Variant(key = "mw", weight = 1.0, features = emptyList()),
-            Variant(key = "mx", weight = 1.0, features = listOf(VariantFeature.TabSwitcherGrid))
+            // All groups in an experiment (control and variants) MUST use the same filters
+            Variant(key = "mw", weight = 1.0, features = emptyList(), filterBy = { noFilter() }),
+            Variant(key = "mx", weight = 1.0, features = listOf(Varia
FD03
ntFeature.TabSwitcherGrid), filterBy = { noFilter() })
         )
+
+        private fun noFilter(): Boolean = true
+
+        private fun isEnglishLocale(): Boolean {
+            val locale = Locale.getDefault()
+            return locale != null && locale.language == "en"
+        }
     }
 
     fun getVariant(activeVariants: List<Variant> = ACTIVE_VARIANTS): Variant
@@ -65,7 +74,12 @@ class ExperimentationVariantManager(
         }
 
         if (currentVariantKey == null) {
-            val newVariant = generateVariant(activeVariants)
+            var newVariant = generateVariant(activeVariants)
+            val compliesWithFilters = newVariant.filterBy()
+
+            if (!compliesWithFilters) {
+                newVariant = DEFAULT_VARIANT
+            }
             Timber.i("Current variant is null; allocating new one $newVariant")
             persistVariant(newVariant)
             return newVariant
@@ -108,7 +122,8 @@ class ExperimentationVariantManager(
 data class Variant(
     val key: String,
     override val weight: Double = 0.0,
-    val features: List<VariantManager.VariantFeature> = emptyList()
+    val features: List<VariantManager.VariantFeature> = emptyList(),
+    val filterBy: () -> Boolean
 ) : Probabilistic {
 
     fun hasFeature(feature: VariantManager.VariantFeature) = features.contains(feature)