duckduckgo · CrisBarreiro · May 5, 2025 · May 5, 2025 · May 6, 2025
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -1307,7 +1307,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenDuckDuckGoUrlContainingQueryLoadedThenAtbRefreshed() {
+    fun whenDuckDuckGoUrlContainingQueryLoadedThenAtbRefreshed() = runTest {
         loadUrl("http://duckduckgo.com?q=test")
         verify(mockStatisticsUpdater).refreshSearchRetentionAtb()
     }
@@ -3489,7 +3489,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenConsumeAliasAndCopyToClipboardThenCopyAliasToClipboardCommandSent() {
+    fun whenConsumeAliasAndCopyToClipboardThenCopyAliasToClipboardCommandSent() = runTest {
         whenever(mockEmailManager.getAlias()).thenReturn("alias")
 
         testee.consumeAliasAndCopyToClipboard()
@@ -3498,7 +3498,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenConsumeAliasAndCopyToClipboardThenSetNewLastUsedDateCalled() {
+    fun whenConsumeAliasAndCopyToClipboardThenSetNewLastUsedDateCalled() = runTest {
         whenever(mockEmailManager.getAlias()).thenReturn("alias")
 
         testee.consumeAliasAndCopyToClipboard()
@@ -3507,7 +3507,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenConsumeAliasAndCopyToClipboardThenPixelSent() {
+    fun whenConsumeAliasAndCopyToClipboardThenPixelSent() = runTest {
         whenever(mockEmailManager.getAlias()).thenReturn("alias")
         whenever(mockEmailManager.getCohort()).thenReturn("cohort")
         whenever(mockEmailManager.getLastUsedDate()).thenReturn("2021-01-01")
@@ -3550,7 +3550,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenConsumeAliasThenInjectAddressCommandSent() {
+    fun whenConsumeAliasThenInjectAddressCommandSent() = runTest {
         whenever(mockEmailManager.getAlias()).thenReturn("alias")
 
         testee.usePrivateDuckAddress("", "alias")
@@ -3561,7 +3561,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenUseAddressThenInjectAddressCommandSent() {
+    fun whenUseAddressThenInjectAddressCommandSent() = runTest {
         whenever(mockEmailManager.getEmailAddress()).thenReturn("address")
 
         testee.usePersonalDuckAddress("", "address")
@@ -3572,7 +3572,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenShowEmailTooltipIfAddressExistsThenShowEmailTooltipCommandSent() {
+    fun whenShowEmailTooltipIfAddressExistsThenShowEmailTooltipCommandSent() = runTest {
         whenever(mockEmailManager.getEmailAddress()).thenReturn("address")
 
         testee.showEmailProtectionChooseEmailPrompt()
@@ -3583,7 +3583,7 @@ class BrowserTabViewModelTest {
     }
 
     @Test
-    fun whenShowEmailTooltipIfAddressDoesNotExistThenCommandNotSent() {
+    fun whenShowEmailTooltipIfAddressDoesNotExistThenCommandNotSent() = runTest {
         whenever(mockEmailManager.getEmailAddress()).thenReturn(null)
 
         testee.showEmailProtectionChooseEmailPrompt()

diff --git a/app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt b/app/src/androidTest/java/com/duckduckgo/app/di/StubStatisticsModule.kt
@@ -58,13 +58,13 @@ class StubStatisticsModule {
     fun stubStatisticsUpdater(): StatisticsUpdater {
         return object : StatisticsUpdater {
 
-            override fun initializeAtb() {
+            override suspend fun initializeAtb() {
             }
 
-            override fun refreshAppRetentionAtb() {
+            override suspend fun refreshAppRetentionAtb() {
             }
 
-            override fun refreshSearchRetentionAtb() {
+            override suspend fun refreshSearchRetentionAtb() {
             }
         }
     }

diff --git a/app/src/androidTest/java/com/duckduckgo/app/email/EmailInjectorJsTest.kt b/app/src/androidTest/java/com/duckduckgo/app/email/EmailInjectorJsTest.kt
@@ -19,6 +19,7 @@ package com.duckduckgo.app.email
 import android.annotation.SuppressLint
 import android.webkit.WebView
 import androidx.test.annotation.UiThreadTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.app.autofill.DefaultEmailProtectionJavascriptInjector
@@ -28,14 +29,19 @@ import com.duckduckgo.app.browser.R
 import com.duckduckgo.autofill.api.Autofill
 import com.duckduckgo.autofill.api.AutofillFeature
 import com.duckduckgo.autofill.api.email.EmailManager
+import com.duckduckgo.common.test.CoroutineTestRule
 import com.duckduckgo.common.utils.DispatcherProvider
 import com.duckduckgo.feature.toggles.api.FakeFeatureToggleFactory
 import com.duckduckgo.feature.toggles.api.Toggle
 import java.io.BufferedReader
+import kotlinx.coroutines.test.runTest
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
+import org.junit.runner.RunWith
 import org.mockito.kotlin.*
 
+@RunWith(AndroidJUnit4::class)
 class EmailInjectorJsTest {
 
     private val mockEmailManager: EmailManager = mock()
@@ -46,6 +52,9 @@ class EmailInjectorJsTest {
 
     lateinit var testee: EmailInjectorJs
 
+    @get:Rule
+    var coroutineRule = CoroutineTestRule()
+
     @Before
     fun setup() {
         testee =
@@ -56,6 +65,7 @@ class EmailInjectorJsTest {
                 autofillFeature,
                 javascriptInjector,
                 mockAutofill,
+                coroutineRule.testScope,
             )
         whenever(mockAutofill.isAnException(any())).thenReturn(false)
     }
@@ -107,7 +117,7 @@ class EmailInjectorJsTest {
     @UiThreadTest
     @Test
     @SdkSuppress(minSdkVersion = 24)
-    fun whenNotifyWebAppSignEventAndUrlIsNotFromDuckDuckGoAndEmailIsSignedInThenDoNotEvaluateJsCode() {
+    fun whenNotifyWebAppSignEventAndUrlIsNotFromDuckDuckGoAndEmailIsSignedInThenDoNotEvaluateJsCode() = runTest {
         whenever(mockEmailManager.isSignedIn()).thenReturn(true)
         val jsToEvaluate = getNotifySignOutJsToEvaluate()
         val webView = spy(WebView(InstrumentationRegistry.getInstrumentation().targetContext))
@@ -120,7 +130,7 @@ class EmailInjectorJsTest {
     @UiThreadTest
     @Test
     @SdkSuppress(minSdkVersion = 24)
-    fun whenNotifyWebAppSignEventAndUrlIsNotFromDuckDuckGoAndEmailIsNotSignedInThenDoNotEvaluateJsCode() {
+    fun whenNotifyWebAppSignEventAndUrlIsNotFromDuckDuckGoAndEmailIsNotSignedInThenDoNotEvaluateJsCode() = runTest {
         whenever(mockEmailManager.isSignedIn()).thenReturn(false)
         val jsToEvaluate = getNotifySignOutJsToEvaluate()
         val webView = spy(WebView(InstrumentationRegistry.getInstrumentation().targetContext))
@@ -134,7 +144,7 @@ class EmailInjectorJsTest {
     @UiThreadTest
     @Test
     @SdkSuppress(minSdkVersion = 24)
-    fun whenNotifyWebAppSignEventAndUrlIsFromDuckDuckGoAndFeatureIsDisabledAndEmailIsNotSignedInThenDoNotEvaluateJsCode() {
+    fun whenNotifyWebAppSignEventAndUrlIsFromDuckDuckGoAndFeatureIsDisabledAndEmailIsNotSignedInThenDoNotEvaluateJsCode() = runTest {
         whenever(mockEmailManager.isSignedIn()).thenReturn(false)
         autofillFeature.self().setRawStoredState(Toggle.State(enable = false))
 
@@ -150,7 +160,7 @@ class EmailInjectorJsTest {
     @UiThreadTest
     @Test
     @SdkSuppress(minSdkVersion = 24)
-    fun whenNotifyWebAppSignEventAndUrlIsFromDuckDuckGoAndFeatureIsEnabledAndEmailIsNotSignedInThenEvaluateJsCode() {
+    fun whenNotifyWebAppSignEventAndUrlIsFromDuckDuckGoAndFeatureIsEnabledAndEmailIsNotSignedInThenEvaluateJsCode() = runTest {
         whenever(mockEmailManager.isSignedIn()).thenReturn(false)
         autofillFeature.self().setRawStoredState(Toggle.State(enable = true))
 

diff --git a/app/src/androidTest/java/com/duckduckgo/app/email/db/EmailEncryptedSharedPreferencesTest.kt b/app/src/androidTest/java/com/duckduckgo/app/email/db/EmailEncryptedSharedPreferencesTest.kt
@@ -19,6 +19,7 @@ package com.duckduckgo.app.email.db
 import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.common.test.CoroutineTestRule
+import javax.inject.Provider
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
@@ -36,23 +37,34 @@ class EmailEncryptedSharedPreferencesTest {
 
     private val mockPixel: Pixel = mock()
     lateinit var testee: EmailEncryptedSharedPreferences
+    private val createPreferencesAsyncProvider = object : Provider<Boolean> {
+        override fun get(): Boolean {
+            return true
+        }
+    }
 
     @Before
     fun before() {
-        testee = EmailEncryptedSharedPreferences(InstrumentationRegistry.getInstrumentation().targetContext, mockPixel)
+        testee = EmailEncryptedSharedPreferences(
+            InstrumentationRegistry.getInstrumentation().targetContext,
+            mockPixel,
+            coroutineRule.testScope,
+            coroutineRule.testDispatcherProvider,
+            createPreferencesAsyncProvider,
+        )
     }
 
     @Test
     fun whenNextAliasEqualsValueThenValueIsSentToNextAliasChannel() = runTest {
-        testee.nextAlias = "test"
+        testee.setNextAlias("test")
 
-        assertEquals("test", testee.nextAlias)
+        assertEquals("test", testee.getNextAlias())
     }
 
     @Test
     fun whenNextAliasEqualsNullThenNullIsSentToNextAliasChannel() = runTest {
-        testee.nextAlias = null
+        testee.setNextAlias(null)
 
-        assertNull(testee.nextAlias)
+        assertNull(testee.getNextAlias())
     }
 }
diff --git a/app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt b/app/src/androidTest/java/com/duckduckgo/app/integration/AtbIntegrationTest.kt
@@ -31,6 +31,7 @@ import com.duckduckgo.common.test.InstantSchedulersRule
 import com.duckduckgo.common.utils.plugins.PluginPoint
 import com.duckduckgo.experiments.api.VariantManager
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Rule
@@ -85,7 +86,7 @@ class AtbIntegrationTest {
     }
 
     @Test
-    fun whenNoStatisticsStoredThenAtbInitializationSuccessfullyStoresAtb() {
+    fun whenNoStatisticsStoredThenAtbInitializationSuccessfullyStoresAtb() = runTest {
         testee.initializeAtb()
         assertTrue(statisticsStore.hasInstallationStatistics)
         val atb = statisticsStore.atb
@@ -94,7 +95,7 @@ class AtbIntegrationTest {
     }
 
     @Test
-    fun whenStatisticsAlreadyStoredThenRefreshSearchSuccessfullyUpdatesSearchRetentionAtbOnly() {
+    fun whenStatisticsAlreadyStoredThenRefreshSearchSuccessfullyUpdatesSearchRetentionAtbOnly() = runTest {
         statisticsStore.saveAtb(Atb("v100-1"))
         assertTrue(statisticsStore.hasInstallationStatistics)
 
@@ -111,7 +112,7 @@ class AtbIntegrationTest {
     }
 
     @Test
-    fun whenStatisticsAlreadyStoredThenRefreshAppSuccessfullyUpdatesAppRetentionAtbOnly() {
+    fun whenStatisticsAlreadyStoredThenRefreshAppSuccessfullyUpdatesAppRetentionAtbOnly() = runTest {
         statisticsStore.saveAtb(Atb("v100-1"))
         assertTrue(statisticsStore.hasInstallationStatistics)