tor-browser

commit 04f729c8bcd02791254cd15380e4969503602af6
parent b548ef12c0740c3ead00519a7c7fe8d9562e8e11
Author: mcarare <48995920+mcarare@users.noreply.github.com>
Date:   Thu,  6 Nov 2025 12:15:17 +0000

Bug 1996624 - Remove mockkStatic usage in DefaultToolbarIntegrationTest. r=android-reviewers,giorga

The `mockkStatic` call for `ContextKt` is no longer necessary. This change replaces it by using a spied `Context` object directly, simplifying the test setup.

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

Diffstat:
M
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultToolbarIntegrationTest.kt
 | 
17
++++++-----------

1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultToolbarIntegrationTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultToolbarIntegrationTest.kt
@@ -7,12 +7,10 @@ package org.mozilla.fenix.components.toolbar
 import android.content.Context
 import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkStatic
-import io.mockk.unmockkStatic
+import io.mockk.spyk
 import io.mockk.verify
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.support.test.robolectric.testContext
-import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -22,11 +20,13 @@ import org.robolectric.RobolectricTestRunner
 @RunWith(RobolectricTestRunner::class)
 class DefaultToolbarIntegrationTest {
     private lateinit var feature: DefaultToolbarIntegration
+    private lateinit var context: Context
 
     @Before
     fun setup() {
-        mockkStatic("org.mozilla.fenix.ext.ContextKt")
-        every { any<Context>().components } returns mockk {
+        context = spyk(testContext)
+
+        every { context.components } returns mockk {
             every { core } returns mockk {
                 every { store } returns BrowserStore()
             }
@@ -35,7 +35,7 @@ class DefaultToolbarIntegrationTest {
         }
 
         feature = DefaultToolbarIntegration(
-            context = testContext,
+            context = context,
             toolbar = mockk(relaxed = true),
             scrollableToolbar = mockk(relaxed = true),
             toolbarMenu = mockk(relaxed = true),
@@ -46,11 +46,6 @@ class DefaultToolbarIntegrationTest {
         )
     }
 
-    @After
-    fun teardown() {
-        unmockkStatic("org.mozilla.fenix.ext.ContextKt")
-    }
-
     @Test
     fun `WHEN the feature starts THEN start the cfr presenter`() {
         feature.cfrPresenter = mockk(relaxed = true)