tor-browser

commit 41c41a54ffabe4e7b4ae970ae9bbf277196ccaca
parent 98d509c53f528a59307e640cc4ec7856b70c2a51
Author: mcarare <48995920+mcarare@users.noreply.github.com>
Date:   Fri, 14 Nov 2025 13:35:43 +0000

Bug 1996621 - Remove `isKeyboardVisible` mocking in `BaseBrowserFragmentTest`. r=android-reviewers,avirvara

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

Diffstat:
M
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
 | 
102
+++++++++----------------------------------------------------------------------

1 file changed, 11 insertions(+), 91 deletions(-)
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt
@@ -14,9 +14,7 @@ import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
-import io.mockk.mockkStatic
 import io.mockk.spyk
-import io.mockk.unmockkStatic
 import io.mockk.verify
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
@@ -40,10 +38,8 @@ import org.mozilla.fenix.components.toolbar.BrowserToolbarView
 import org.mozilla.fenix.components.toolbar.ToolbarContainerView
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.ext.isKeyboardVisible
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.Settings
-import kotlin.reflect.KFunction
 
 class BaseBrowserFragmentTest {
     private lateinit var fragment: TestBaseBrowserFragment
@@ -360,13 +356,7 @@ class BaseBrowserFragmentTest {
         every { settings.toolbarPosition } returns ToolbarPosition.BOTTOM
         every { settings.isDynamicToolbarEnabled } returns false
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify { (swipeRefreshLayout.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = 11 }
     }
@@ -386,13 +376,7 @@ class BaseBrowserFragmentTest {
         every { settings.isDynamicToolbarEnabled } returns true
         every { settings.shouldUseFixedTopToolbar } returns false
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify { engineView.setDynamicToolbarMaxHeight(11) }
     }
@@ -415,13 +399,7 @@ class BaseBrowserFragmentTest {
         every { settings.isDynamicToolbarEnabled } returns true
         every { settings.shouldUseFixedTopToolbar } returns false
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify(exactly = 0) { engineView.setDynamicToolbarMaxHeight(any()) }
     }
@@ -446,13 +424,7 @@ class BaseBrowserFragmentTest {
         every { settings.isDynamicToolbarEnabled } returns true
         every { settings.shouldUseFixedTopToolbar } returns false
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify(exactly = 0) { engineView.setDynamicToolbarMaxHeight(any()) }
     }
@@ -480,13 +452,7 @@ class BaseBrowserFragmentTest {
         every { settings.isDynamicToolbarEnabled } returns true
         every { settings.shouldUseFixedTopToolbar } returns false
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify(exactly = 0) { engineView.setDynamicToolbarMaxHeight(any()) }
     }
@@ -506,13 +472,7 @@ class BaseBrowserFragmentTest {
         every { settings.isDynamicToolbarEnabled } returns true
         every { settings.shouldUseFixedTopToolbar } returns false
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify { engineView.setDynamicToolbarMaxHeight(22) }
     }
@@ -535,13 +495,7 @@ class BaseBrowserFragmentTest {
         every { settings.isDynamicToolbarEnabled } returns true
         every { settings.shouldUseFixedTopToolbar } returns false
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify(exactly = 0) { engineView.setDynamicToolbarMaxHeight(any()) }
     }
@@ -563,13 +517,7 @@ class BaseBrowserFragmentTest {
         every { settings.shouldUseFixedTopToolbar } returns false
         every { testContext.resources.getDimensionPixelSize(R.dimen.browser_microsurvey_height) } returns 131
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify { engineView.setDynamicToolbarMaxHeight(142) }
     }
@@ -593,13 +541,7 @@ class BaseBrowserFragmentTest {
         every { settings.shouldUseFixedTopToolbar } returns false
         every { testContext.resources.getDimensionPixelSize(R.dimen.browser_navbar_height) } returns 10
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns false
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify(exactly = 0) { engineView.setDynamicToolbarMaxHeight(any()) }
     }
@@ -626,13 +568,7 @@ class BaseBrowserFragmentTest {
         every { testContext.resources.getDimensionPixelSize(R.dimen.browser_navbar_height) } returns 22
         every { testContext.resources.configuration } returns configuration
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns true
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify { engineView.setDynamicToolbarMaxHeight(33) }
     }
@@ -656,13 +592,7 @@ class BaseBrowserFragmentTest {
         every { settings.shouldUseFixedTopToolbar } returns false
         every { testContext.resources.getDimensionPixelSize(R.dimen.browser_navbar_height) } returns 10
 
-        safeMockkStatic(
-            View::isKeyboardVisible,
-        ) {
-            every { any<View>().isKeyboardVisible() } returns true
-
-            fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
-        }
+        fragment.configureEngineViewWithDynamicToolbarsMaxHeight()
 
         verify(exactly = 0) { engineView.setDynamicToolbarMaxHeight(any()) }
     }
@@ -781,16 +711,6 @@ class BaseBrowserFragmentTest {
     }
 }
 
-@Suppress("NoStaticMocking")
-private inline fun safeMockkStatic(vararg objects: KFunction<*>, block: () -> Unit) {
-    try {
-        mockkStatic(*objects)
-        block()
-    } finally {
-        unmockkStatic(*objects)
-    }
-}
-
 private class TestBaseBrowserFragment : BaseBrowserFragment() {
     override fun getContextMenuCandidates(
         context: Context,