commit aa94cbaf83f276260d0fea9031a7abe9f899da44 parent a5a26cb1c8bdde42eb116ed6330e85f6b489140a Author: mcarare <48995920+mcarare@users.noreply.github.com> Date: Fri, 9 Jan 2026 16:21:43 +0000 Bug 2008000- Refactor Fenix browser store tests to remove runners and MainCoroutineRule. r=android-reviewers,giorga Differential Revision: https://phabricator.services.mozilla.com/D278501 Diffstat:
4 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenMiddlewareTest.kt @@ -4,8 +4,8 @@ package org.mozilla.fenix.browser.store +import android.content.Context import androidx.fragment.app.FragmentManager -import androidx.test.ext.junit.runners.AndroidJUnit4 import io.mockk.every import io.mockk.mockk import io.mockk.spyk @@ -14,17 +14,16 @@ import mozilla.components.feature.downloads.ui.DownloadCancelDialogFragment import mozilla.components.lib.crash.CrashReporter import mozilla.components.lib.state.Middleware import mozilla.components.support.test.middleware.CaptureActionsMiddleware -import mozilla.components.support.test.robolectric.testContext import org.junit.Test -import org.junit.runner.RunWith import org.mozilla.fenix.browser.store.BrowserScreenAction.CancelPrivateDownloadsOnPrivateTabsClosedAccepted import org.mozilla.fenix.browser.store.BrowserScreenMiddleware.Companion.CANCEL_PRIVATE_DOWNLOADS_DIALOG_FRAGMENT_TAG -@RunWith(AndroidJUnit4::class) class BrowserScreenMiddlewareTest { private val fragmentManager: FragmentManager = mockk(relaxed = true) private val crashReporter: CrashReporter = mockk(relaxed = true) + private val testContext: Context = mockk() + @Test fun `WHEN the last private tab is closing THEN record a breadcrumb and show a warning dialog`() { val middleware = spyk(BrowserScreenMiddleware(testContext, crashReporter, fragmentManager)) diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenStoreKtTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenStoreKtTest.kt @@ -4,30 +4,20 @@ package org.mozilla.fenix.browser.store -import androidx.fragment.app.FragmentManager -import io.mockk.mockk import mozilla.components.concept.engine.translate.Language import mozilla.components.lib.state.Middleware -import mozilla.components.support.test.rule.MainCoroutineRule import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue -import org.junit.Rule import org.junit.Test -import org.junit.runner.RunWith import org.mozilla.fenix.browser.PageTranslationStatus import org.mozilla.fenix.browser.ReaderModeStatus import org.mozilla.fenix.browser.store.BrowserScreenAction.CancelPrivateDownloadsOnPrivateTabsClosedAccepted import org.mozilla.fenix.browser.store.BrowserScreenAction.ClosingLastPrivateTab import org.mozilla.fenix.browser.store.BrowserScreenAction.PageTranslationStatusUpdated import org.mozilla.fenix.browser.store.BrowserScreenAction.ReaderModeStatusUpdated -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) class BrowserScreenStoreKtTest { - @get:Rule - val mainCoroutineRule = MainCoroutineRule() - private val fragmentManager: FragmentManager = mockk() @Test fun `WHEN the last private tab is closed THEN reset whether cancelling all private downloads was accepted`() { diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenStoreReducerTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenStoreReducerTest.kt @@ -9,13 +9,10 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test -import org.junit.runner.RunWith import org.mozilla.fenix.browser.store.BrowserScreenAction.CancelPrivateDownloadsOnPrivateTabsClosedAccepted import org.mozilla.fenix.browser.store.BrowserScreenAction.ClosingLastPrivateTab import org.mozilla.fenix.browser.store.BrowserScreenAction.CustomTabColorsUpdated -import org.robolectric.RobolectricTestRunner -@RunWith(RobolectricTestRunner::class) class BrowserScreenStoreReducerTest { @Test fun `WHEN closing the last private tab THEN reset the state of accepting the risks`() { diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenStoreTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/store/BrowserScreenStoreTest.kt @@ -4,23 +4,13 @@ package org.mozilla.fenix.browser.store -import androidx.lifecycle.Lifecycle -import androidx.test.ext.junit.runners.AndroidJUnit4 -import mozilla.components.support.test.rule.MainCoroutineRule import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue -import org.junit.Rule import org.junit.Test -import org.junit.runner.RunWith import org.mozilla.fenix.browser.store.BrowserScreenAction.CancelPrivateDownloadsOnPrivateTabsClosedAccepted import org.mozilla.fenix.browser.store.BrowserScreenAction.ClosingLastPrivateTab -import org.mozilla.fenix.helpers.lifecycle.TestLifecycleOwner -@RunWith(AndroidJUnit4::class) class BrowserScreenStoreTest { - @get:Rule - val coroutinesTestRule = MainCoroutineRule() - private val lifecycleOwner = TestLifecycleOwner(Lifecycle.State.RESUMED) @Test fun `WHEN closing the last private tab THEN remember this in state`() {