Fix and update tests

Author: mikescamell

app/src/test/java/com/duckduckgo/app/browser/senseofprotection/SenseOfProtectionExperimentImplTest.kt

@@ -75,7 +75,7 @@ class SenseOfProtectionExperimentImplTest {
     }
 
     @Test
-    fun `when user is new and experiment is enabled for user's cohort then isEnabled returns true`() {
+    fun `when user is new and enrolUserInNewExperimentIfEligible then user is in enrolled`() {
         fakeUserBrowserProperties.setDaysSinceInstalled(28)
         fakeSenseOfProtectionToggles.senseOfProtectionNewUserExperimentApr25().setRawStoredState(
             State(
@@ -86,7 +86,9 @@ class SenseOfProtectionExperimentImplTest {
             ),
         )
 
-        assertTrue(testee.isEnabled(cohortName = MODIFIED_CONTROL))
+        testee.enrolUserInNewExperimentIfEligible()
+
+        assertTrue(testee.enrolUserInNewExperimentIfEligible())
     }
 
     @Test
@@ -101,7 +103,7 @@ class SenseOfProtectionExperimentImplTest {
             ),
         )
 
-        assertFalse(testee.isEnabled(MODIFIED_CONTROL))
+        assertFalse(testee.enrolUserInNewExperimentIfEligible())
     }
 
     @Test
@@ -116,53 +118,7 @@ class SenseOfProtectionExperimentImplTest {
             ),
         )
 
-        assertFalse(testee.isEnabled(MODIFIED_CONTROL))
-    }
-
-    @Test
-    fun `when user is existing and not enrolled in new user experiment then isEnabled returns true`() {
-        fakeUserBrowserProperties.setDaysSinceInstalled(29) // just above threshold
-        fakeSenseOfProtectionToggles.senseOfProtectionNewUserExperimentApr25().setRawStoredState(
-            State(
-                remoteEnableState = true,
-                enable = true,
-                assignedCohort = null,
-                cohorts = cohorts,
-            ),
-        )
-        fakeSenseOfProtectionToggles.senseOfProtectionExistingUserExperimentApr25().setRawStoredState(
-            State(
-                remoteEnableState = true,
-                enable = true,
-                assignedCohort = State.Cohort(MODIFIED_CONTROL.cohortName, weight = 1),
-                cohorts = cohorts,
-            ),
-        )
-
-        assertTrue(testee.isEnabled(MODIFIED_CONTROL))
-    }
-
-    @Test
-    fun `when user is existing and enrolled in existing user experiment but existing user experiment disabled then isEnabled returns false`() {
-        fakeUserBrowserProperties.setDaysSinceInstalled(100)
-        fakeSenseOfProtectionToggles.senseOfProtectionNewUserExperimentApr25().setRawStoredState(
-            State(
-                remoteEnableState = true,
-                enable = true,
-                assignedCohort = null,
-                cohorts = cohorts,
-            ),
-        )
-        fakeSenseOfProtectionToggles.senseOfProtectionExistingUserExperimentApr25().setRawStoredState(
-            State(
-                remoteEnableState = false,
-                enable = false,
-                assignedCohort = State.Cohort(MODIFIED_CONTROL.cohortName, weight = 1),
-                cohorts = cohorts,
-            ),
-        )
-
-        assertFalse(testee.isEnabled(MODIFIED_CONTROL))
+        assertFalse(testee.enrolUserInNewExperimentIfEligible())
     }
 
     @Test

app/src/test/java/com/duckduckgo/app/cta/ui/OnboardingDaxDialogTests.kt

@@ -18,6 +18,7 @@ package com.duckduckgo.app.cta.ui
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.duckduckgo.app.browser.DuckDuckGoUrlDetector
+import com.duckduckgo.app.browser.senseofprotection.SenseOfProtectionExperiment
 import com.duckduckgo.app.cta.db.DismissedCtaDao
 import com.duckduckgo.app.cta.model.CtaId.DAX_DIALOG_NETWORK
 import com.duckduckgo.app.cta.model.CtaId.DAX_DIALOG_OTHER
@@ -80,6 +81,7 @@ class OnboardingDaxDialogTests {
     private val mockBrokenSitePrompt: BrokenSitePrompt = mock()
     private val mockUserBrowserProperties: UserBrowserProperties = mock()
     private val mockSubscriptions: Subscriptions = mock()
+    private val mockSenseOfProtectionExperiment: SenseOfProtectionExperiment = mock()
 
     val mockEnabledToggle: Toggle = org.mockito.kotlin.mock { on { it.isEnabled() } doReturn true }
     val mockDisabledToggle: Toggle = org.mockito.kotlin.mock { on { it.isEnabled() } doReturn false }
@@ -107,6 +109,7 @@ class OnboardingDaxDialogTests {
             mockDuckPlayer,
             mockBrokenSitePrompt,
             mockUserBrowserProperties,
+            mockSenseOfProtectionExperiment,
         )
     }