tor-browser

commit ab583895c529217b7c544f2019c7df6b8ce02682
parent 8558e13b9d6d7ce9ba4d018066b2c971708d6b35
Author: mcarare <48995920+mcarare@users.noreply.github.com>
Date:   Tue,  7 Oct 2025 17:26:23 +0000

Bug 1993010 - Migrate GleanMetricsServiceTest from runBlocking to runTest. r=android-reviewers,rebecatudor273

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

Diffstat:
M
mobile/android/focus-android/app/src/test/java/org/mozilla/focus/telemetry/GleanMetricsServiceTest.kt
 | 
37
++++++++++++++++++-------------------

1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/mobile/android/focus-android/app/src/test/java/org/mozilla/focus/telemetry/GleanMetricsServiceTest.kt b/mobile/android/focus-android/app/src/test/java/org/mozilla/focus/telemetry/GleanMetricsServiceTest.kt
@@ -6,7 +6,7 @@ package org.mozilla.focus.telemetry
 
 import android.content.Context
 import android.content.res.Resources
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.test.runTest
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.engine.Engine
 import mozilla.components.feature.search.telemetry.SearchProviderModel
@@ -21,28 +21,27 @@ import org.mozilla.focus.Components
 
 class GleanMetricsServiceTest {
     @Test
-    fun `WHEN installSearchTelemetryExtensions is called THEN install the ads and search telemetry extensions`() {
-        val components = mock(Components::class.java)
-        val store = mock(BrowserStore::class.java)
-        val engine = mock(Engine::class.java)
-        val adsExtension = mock(AdsTelemetry::class.java)
-        val searchExtension = mock(InContentTelemetry::class.java)
-        val providerList: List<SearchProviderModel> = mock()
-        val context = mock(Context::class.java)
-        val resources = mock(Resources::class.java)
-        doReturn(engine).`when`(components).engine
-        doReturn(store).`when`(components).store
-        doReturn(adsExtension).`when`(components).adsTelemetry
-        doReturn(searchExtension).`when`(components).searchTelemetry
-        doReturn(resources).`when`(context).resources
-        doReturn("").`when`(resources).getString(anyInt())
-        val glean = GleanMetricsService(context)
+    fun `WHEN installSearchTelemetryExtensions is called THEN install the ads and search telemetry extensions`() =
+        runTest {
+            val components = mock(Components::class.java)
+            val store = mock(BrowserStore::class.java)
+            val engine = mock(Engine::class.java)
+            val adsExtension = mock(AdsTelemetry::class.java)
+            val searchExtension = mock(InContentTelemetry::class.java)
+            val providerList: List<SearchProviderModel> = mock()
+            val context = mock(Context::class.java)
+            val resources = mock(Resources::class.java)
+            doReturn(engine).`when`(components).engine
+            doReturn(store).`when`(components).store
+            doReturn(adsExtension).`when`(components).adsTelemetry
+            doReturn(searchExtension).`when`(components).searchTelemetry
+            doReturn(resources).`when`(context).resources
+            doReturn("").`when`(resources).getString(anyInt())
+            val glean = GleanMetricsService(context)
 
-        runBlocking {
             glean.installSearchTelemetryExtensions(components, providerList)
 
             verify(adsExtension).install(engine, store, providerList)
             verify(searchExtension).install(engine, store, providerList)
         }
-    }
 }