diff --git a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt index e3263e917..ee409dcf4 100644 --- a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt @@ -21,11 +21,9 @@ import org.junit.runner.RunWith import org.mozilla.fenix.AppRequestInterceptor.Companion.HIGH_RISK_ERROR_PAGES import org.mozilla.fenix.AppRequestInterceptor.Companion.LOW_AND_MEDIUM_RISK_ERROR_PAGES import org.mozilla.fenix.ext.isOnline -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class AppRequestInterceptorTest { private lateinit var interceptor: RequestInterceptor diff --git a/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt b/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt index b1069493c..a919da928 100644 --- a/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt @@ -16,11 +16,9 @@ import org.mozilla.fenix.HomeActivity.Companion.PRIVATE_BROWSING_MODE import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.ext.settings -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class HomeActivityTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt b/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt index 02c29052f..8fcc4ee6e 100644 --- a/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt @@ -22,13 +22,11 @@ import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings import org.mozilla.fenix.shortcut.NewTabShortcutIntentProcessor import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.robolectric.Shadows.shadowOf -import org.robolectric.annotation.Config @ExperimentalCoroutinesApi -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class IntentReceiverActivityTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt index dcbe0ea11..181fcfecb 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationFragmentTest.kt @@ -4,7 +4,7 @@ package org.mozilla.fenix.collections -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import assertk.assertThat import assertk.assertions.isNotNull import assertk.assertions.isNull @@ -27,8 +27,6 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.annotation.Config private const val URL_MOZILLA = "www.mozilla.org" private const val SESSION_ID_MOZILLA = "0" @@ -40,8 +38,7 @@ private const val SESSION_ID_BAD_2 = "definitely not a real session id" @ExperimentalCoroutinesApi @ObsoleteCoroutinesApi -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class CollectionCreationFragmentTest { @MockK private lateinit var sessionManager: SessionManager diff --git a/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt b/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt index 7b707e781..41e8f2c4c 100644 --- a/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt @@ -4,7 +4,7 @@ package org.mozilla.fenix.components -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.runBlocking import mozilla.components.lib.crash.CrashReporter @@ -18,12 +18,9 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.verifyZeroInteractions import org.mockito.Mockito.verify -import org.mozilla.fenix.TestApplication -import org.robolectric.annotation.Config import kotlin.reflect.KClass -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class AccountAbnormalitiesTest { @Test fun `account manager must be configured`() { diff --git a/app/src/test/java/org/mozilla/fenix/components/IntentProcessorTypeTest.kt b/app/src/test/java/org/mozilla/fenix/components/IntentProcessorTypeTest.kt index c276a48a3..50274af81 100644 --- a/app/src/test/java/org/mozilla/fenix/components/IntentProcessorTypeTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/IntentProcessorTypeTest.kt @@ -16,14 +16,11 @@ import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity import org.mozilla.fenix.ext.components -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class IntentProcessorTypeTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/components/StoreProviderTest.kt b/app/src/test/java/org/mozilla/fenix/components/StoreProviderTest.kt index 7e874ba06..2f4a3ac21 100644 --- a/app/src/test/java/org/mozilla/fenix/components/StoreProviderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/StoreProviderTest.kt @@ -14,12 +14,9 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class StoreProviderTest { private class BasicState : State diff --git a/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt b/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt index d6a443345..b87d9cfd1 100644 --- a/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt @@ -11,13 +11,10 @@ import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.utils.Settings -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class TrackingProtectionPolicyFactoryTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt index 796b8b880..90820e47b 100644 --- a/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt @@ -16,12 +16,9 @@ import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.Metrics import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class GleanMetricsServiceTest { @get:Rule val gleanRule = GleanTestRule(testContext) diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt index b8052e642..d35407d23 100644 --- a/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/metrics/MetricsUtilsTest.kt @@ -7,12 +7,9 @@ import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class MetricsUtilsTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt index 8e79e2fb2..56c47c64f 100644 --- a/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/metrics/PerformedSearchTest.kt @@ -13,15 +13,12 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.components.metrics.Event.PerformedSearch import org.mozilla.fenix.components.metrics.Event.PerformedSearch.EngineSource import org.mozilla.fenix.components.metrics.Event.PerformedSearch.EventSource -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class PerformedSearchTest { private lateinit var searchEngines: List diff --git a/app/src/test/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProviderTest.kt b/app/src/test/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProviderTest.kt index 2bccbe7fe..1ba6b08e0 100644 --- a/app/src/test/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProviderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/searchengine/FenixSearchEngineProviderTest.kt @@ -17,13 +17,10 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.`when` import org.mockito.Mockito.mock -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @ExperimentalCoroutinesApi -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class FenixSearchEngineProviderTest { private lateinit var fenixSearchEngineProvider: FenixSearchEngineProvider diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt index 4e6cafce7..1a4245bdc 100644 --- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt @@ -39,7 +39,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.browser.BrowserAnimator import org.mozilla.fenix.browser.BrowserFragment import org.mozilla.fenix.browser.BrowserFragmentDirections @@ -57,12 +56,10 @@ import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.toTab import org.mozilla.fenix.home.Tab import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @ExperimentalCoroutinesApi -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class DefaultBrowserToolbarControllerTest { private val mainThreadSurrogate = newSingleThreadContext("UI thread") diff --git a/app/src/test/java/org/mozilla/fenix/customtabs/PoweredByNotificationTest.kt b/app/src/test/java/org/mozilla/fenix/customtabs/PoweredByNotificationTest.kt index 1b1b36564..f71ff95e5 100644 --- a/app/src/test/java/org/mozilla/fenix/customtabs/PoweredByNotificationTest.kt +++ b/app/src/test/java/org/mozilla/fenix/customtabs/PoweredByNotificationTest.kt @@ -13,12 +13,9 @@ import mozilla.components.support.test.mock import mozilla.components.support.test.robolectric.testContext import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class PoweredByNotificationTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt b/app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt index 8363710f9..5e22803e4 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt @@ -11,14 +11,11 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.robolectric.Shadows.shadowOf -import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class ActivityTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt b/app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt index 96f71232c..dbf38242a 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt @@ -13,12 +13,9 @@ import mozilla.components.browser.icons.IconRequest import mozilla.components.support.test.robolectric.testContext import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class BrowserIconsTest { @Test fun loadIntoViewTest() { diff --git a/app/src/test/java/org/mozilla/fenix/ext/ConnectivityManagerTest.kt b/app/src/test/java/org/mozilla/fenix/ext/ConnectivityManagerTest.kt index 55bb09a07..84c500004 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/ConnectivityManagerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/ConnectivityManagerTest.kt @@ -15,12 +15,9 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class ConnectivityManagerTest { private lateinit var connectivityManager: ConnectivityManager diff --git a/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt b/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt index 7b016be70..9eaa43849 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt @@ -12,12 +12,9 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class DrawableTest { @Test fun testSetBounds() { diff --git a/app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt b/app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt index 75a0c1b06..d9ffc99cb 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt @@ -23,12 +23,9 @@ import mozilla.components.support.test.robolectric.testContext import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class FragmentTest { private val navDirections: NavDirections = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/ext/ImageButtonTest.kt b/app/src/test/java/org/mozilla/fenix/ext/ImageButtonTest.kt index 06387db9c..e115551b6 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/ImageButtonTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/ImageButtonTest.kt @@ -6,18 +6,15 @@ package org.mozilla.fenix.ext import android.view.View import mozilla.components.support.test.robolectric.testContext -import org.mozilla.fenix.TestApplication import org.junit.Test import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Assert.assertEquals import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import android.widget.ImageButton -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class ImageButtonTest { private val imageButton = ImageButton(testContext) diff --git a/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt b/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt index a2d7430e0..17caacffa 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt @@ -15,15 +15,12 @@ import org.junit.Assert.assertEquals import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner const val PUNYCODE = "xn--kpry57d" const val IDN = "台灣" -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class StringTest { private val publicSuffixList = testContext.components.publicSuffixList diff --git a/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt b/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt index 37e6d78dd..58c95f5bf 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt @@ -14,12 +14,9 @@ import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.`when` import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class TabCollectionTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/CrashReporterIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/CrashReporterIntentProcessorTest.kt index a83ff1317..af2f34b91 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/CrashReporterIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/CrashReporterIntentProcessorTest.kt @@ -13,12 +13,9 @@ import io.mockk.verify import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.NavGraphDirections -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class CrashReporterIntentProcessorTest { @Test diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessorTest.kt index 1169d7a0b..1a626f1ea 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/DeepLinkIntentProcessorTest.kt @@ -18,13 +18,10 @@ import org.junit.runner.RunWith import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.NavGraphDirections -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.browser.browsingmode.BrowsingMode -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class DeepLinkIntentProcessorTest { private lateinit var activity: HomeActivity diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt index 566895e1b..f712517b7 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt @@ -25,14 +25,11 @@ import mozilla.components.feature.intent.ext.getSessionId import mozilla.components.feature.session.SessionUseCases import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.home.intent.FennecBookmarkShortcutsIntentProcessor.Companion.ACTION_FENNEC_HOMESCREEN_SHORTCUT -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import java.util.UUID -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class FennecBookmarkShortcutsIntentProcessorTest { private val sessionManager = mockk(relaxed = true) private val loadUrlUseCase = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/OpenBrowserIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/OpenBrowserIntentProcessorTest.kt index 0fce8c3dc..c96c7ef1d 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/OpenBrowserIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/OpenBrowserIntentProcessorTest.kt @@ -13,12 +13,9 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class OpenBrowserIntentProcessorTest { private val activity: HomeActivity = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt index edea00972..c98eb68e3 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt @@ -14,15 +14,12 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class SpeechProcessingIntentProcessorTest { private val activity: HomeActivity = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt index fe4af3c25..2f7908383 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt @@ -13,14 +13,11 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.NavGraphDirections -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class StartSearchIntentProcessorTest { private val metrics: MetricController = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt index 0606691c6..12ae932ed 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt @@ -12,12 +12,9 @@ import mozilla.components.concept.storage.BookmarkNodeType import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) internal class BookmarkAdapterTest { private lateinit var bookmarkAdapter: BookmarkAdapter diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt index e80a92fe0..c21488450 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListenerTest.kt @@ -15,12 +15,9 @@ import mozilla.components.concept.storage.BookmarkNodeType import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class BookmarkDeselectNavigationListenerTest { private val basicNode = BookmarkNode( diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarksSharedViewModelTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarksSharedViewModelTest.kt index 987402ba1..4406f8071 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarksSharedViewModelTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarksSharedViewModelTest.kt @@ -16,12 +16,9 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) internal class BookmarksSharedViewModelTest { private lateinit var viewModel: BookmarksSharedViewModel diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt index b3bc12801..ce5111dd1 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt @@ -21,13 +21,10 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.ext.components -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class DesktopFoldersTest { private lateinit var context: Context diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt index 62cbff6df..e025cb7e5 100644 --- a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt @@ -24,15 +24,12 @@ import org.junit.Assert.assertFalse import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.FenixSnackbar -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner // Robolectric needed for `onShareItem()` -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class HistoryControllerTest { private val historyItem = HistoryItem(0, "title", "url", 0.toLong()) private val store: HistoryFragmentStore = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt index 425099d73..cef1a0d39 100644 --- a/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt @@ -7,7 +7,7 @@ package org.mozilla.fenix.search import androidx.lifecycle.LifecycleCoroutineScope import androidx.navigation.NavController import androidx.navigation.NavDirections -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -25,7 +25,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components @@ -36,11 +35,9 @@ import org.mozilla.fenix.ext.settings import org.mozilla.fenix.search.DefaultSearchController.Companion.KEYBOARD_ANIMATION_DELAY import org.mozilla.fenix.utils.Settings import org.mozilla.fenix.whatsnew.clear -import org.robolectric.annotation.Config @ExperimentalCoroutinesApi -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class DefaultSearchControllerTest { private val context: HomeActivity = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/session/NotificationSessionObserverTest.kt b/app/src/test/java/org/mozilla/fenix/session/NotificationSessionObserverTest.kt index ba0424bdd..1fa988b72 100644 --- a/app/src/test/java/org/mozilla/fenix/session/NotificationSessionObserverTest.kt +++ b/app/src/test/java/org/mozilla/fenix/session/NotificationSessionObserverTest.kt @@ -9,13 +9,10 @@ import mozilla.components.support.test.robolectric.testContext import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import mozilla.components.browser.session.Session -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class NotificationSessionObserverTest { private lateinit var observer: NotificationSessionObserver diff --git a/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt index a15c2a494..1d0b62af0 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt @@ -18,13 +18,10 @@ import kotlinx.android.synthetic.main.about_list_item.view.* import mozilla.components.support.test.robolectric.testContext import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.settings.about.viewholders.AboutItemViewHolder -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class AboutPageAdapterTest { private var aboutList: List = mutableListOf( diff --git a/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtensionTest.kt b/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtensionTest.kt index 88710a5bf..780795bef 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtensionTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtensionTest.kt @@ -17,13 +17,11 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.BuildConfig -import org.mozilla.fenix.TestApplication -import org.robolectric.RobolectricTestRunner +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.robolectric.annotation.Config import java.util.Locale -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class LocaleManagerExtensionTest { @Before diff --git a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt index 15beca4bf..eb975b3a3 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt @@ -6,7 +6,7 @@ package org.mozilla.fenix.settings.deletebrowsingdata -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import io.mockk.every import io.mockk.mockk import io.mockk.verify @@ -27,17 +27,14 @@ import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.PermissionStorage import org.mozilla.fenix.ext.clearAndCommit import org.mozilla.fenix.ext.components import org.mozilla.fenix.utils.Settings -import org.robolectric.annotation.Config @ExperimentalCoroutinesApi -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class DeleteAndQuitTest { private val mainThreadSurrogate = newSingleThreadContext("UI thread") diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt index 7efb8dc0c..161021750 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt @@ -32,18 +32,15 @@ import mozilla.components.support.test.robolectric.testContext import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.components.PermissionStorage import org.mozilla.fenix.settings.PhoneFeature import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled import org.mozilla.fenix.settings.toggle import org.mozilla.fenix.utils.Settings -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @ExperimentalCoroutinesApi -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class DefaultQuickSettingsControllerTest { private val context = testContext private val store = mockk() diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt index 715e1351a..a51af4793 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentStoreTest.kt @@ -25,7 +25,6 @@ import mozilla.components.support.test.robolectric.testContext import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.ext.settings import org.mozilla.fenix.settings.PhoneFeature import org.mozilla.fenix.settings.quicksettings.QuickSettingsFragmentStore.Companion.getInsecureWebsiteUiValues @@ -36,11 +35,9 @@ import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled import org.mozilla.fenix.settings.quicksettings.ext.shouldBeVisible import org.mozilla.fenix.settings.sitepermissions.AUTOPLAY_BLOCK_ALL import org.mozilla.fenix.utils.Settings -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class QuickSettingsFragmentStoreTest { private val context = spyk(testContext) private val permissions = mockk() diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt index 06df500a7..0a0fd5503 100644 --- a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt @@ -36,18 +36,15 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.metrics import org.mozilla.fenix.ext.nav import org.mozilla.fenix.share.listadapters.AppShareOption -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) @ExperimentalCoroutinesApi class ShareControllerTest { // Need a valid context to retrieve Strings for example, but we also need it to return our "metrics" diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt index c77250296..79875562a 100644 --- a/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt @@ -30,18 +30,15 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.ext.application import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.isOnline import org.mozilla.fenix.share.ShareViewModel.Companion.RECENT_APPS_LIMIT import org.mozilla.fenix.share.listadapters.AppShareOption import org.mozilla.fenix.share.listadapters.SyncShareOption -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) @ExperimentalCoroutinesApi class ShareViewModelTest { diff --git a/app/src/test/java/org/mozilla/fenix/share/listadapters/AccountDevicesShareAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/share/listadapters/AccountDevicesShareAdapterTest.kt index 6fc132ecd..a49f8cc9c 100644 --- a/app/src/test/java/org/mozilla/fenix/share/listadapters/AccountDevicesShareAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/listadapters/AccountDevicesShareAdapterTest.kt @@ -16,14 +16,11 @@ import io.mockk.verify import mozilla.components.support.test.robolectric.testContext import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.share.ShareInteractor import org.mozilla.fenix.share.viewholders.AccountDeviceViewHolder -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class AccountDevicesShareAdapterTest { private val interactor: ShareInteractor = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/share/listadapters/AppShareAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/share/listadapters/AppShareAdapterTest.kt index a2816dd31..1c18881f8 100644 --- a/app/src/test/java/org/mozilla/fenix/share/listadapters/AppShareAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/listadapters/AppShareAdapterTest.kt @@ -17,14 +17,11 @@ import io.mockk.verifyOrder import mozilla.components.support.test.robolectric.testContext import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.share.ShareInteractor import org.mozilla.fenix.share.viewholders.AppViewHolder -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class AppShareAdapterTest { private val appOptions = mutableListOf( diff --git a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt index 4b230bf29..3ac2413ce 100644 --- a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt +++ b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt @@ -16,13 +16,10 @@ import org.junit.Before import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.R -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.utils.Settings -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class TrackingProtectionOverlayTest { private lateinit var context: Context diff --git a/app/src/test/java/org/mozilla/fenix/utils/BrowsersCacheTest.kt b/app/src/test/java/org/mozilla/fenix/utils/BrowsersCacheTest.kt index a1f9e6bf0..ac3b319b2 100644 --- a/app/src/test/java/org/mozilla/fenix/utils/BrowsersCacheTest.kt +++ b/app/src/test/java/org/mozilla/fenix/utils/BrowsersCacheTest.kt @@ -10,7 +10,7 @@ import android.content.pm.ActivityInfo import android.content.pm.PackageInfo import android.content.pm.ResolveInfo import android.net.Uri -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import mozilla.components.support.test.robolectric.testContext import mozilla.components.support.utils.Browsers import org.junit.Assert.assertEquals @@ -18,12 +18,9 @@ import org.junit.Assert.assertNotNull import org.junit.Assert.assertNull import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.robolectric.Shadows.shadowOf -import org.robolectric.annotation.Config -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class BrowsersCacheTest { // NB: There is always one more browser than pretendBrowsersAreInstalled installs because diff --git a/app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt b/app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt index 267212063..c422e73be 100644 --- a/app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt @@ -7,17 +7,14 @@ package org.mozilla.fenix.utils import android.content.ClipData import android.content.ClipboardManager import android.content.Context -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication -import org.robolectric.annotation.Config -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class ClipboardHandlerTest { private val clipboardUrl = "https://www.mozilla.org" diff --git a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt index 63eb0ceb7..ed62b4c2e 100644 --- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt +++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt @@ -4,7 +4,7 @@ package org.mozilla.fenix.utils -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import mozilla.components.feature.sitepermissions.SitePermissionsRules import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.ALLOWED import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.ASK_TO_ALLOW @@ -17,15 +17,12 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.ext.clearAndCommit import org.mozilla.fenix.ext.settings import org.mozilla.fenix.settings.PhoneFeature import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType -import org.robolectric.annotation.Config -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class SettingsTest { lateinit var settings: Settings diff --git a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt index 0b51f36a2..b8ae92778 100644 --- a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt +++ b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt @@ -4,19 +4,16 @@ package org.mozilla.fenix.whatsnew -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import mozilla.components.support.test.robolectric.testContext import org.junit.Assert import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.ext.clearAndCommit import org.mozilla.fenix.utils.Settings -import org.robolectric.annotation.Config -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class WhatsNewStorageTest { private lateinit var storage: SharedPreferenceWhatsNewStorage private lateinit var settings: Settings diff --git a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt index a03f50450..15b652833 100644 --- a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt @@ -4,19 +4,16 @@ package org.mozilla.fenix.whatsnew * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import androidx.test.ext.junit.runners.AndroidJUnit4 +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.ext.settings import org.mozilla.fenix.utils.Settings -import org.robolectric.annotation.Config -@RunWith(AndroidJUnit4::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class WhatsNewTest { private lateinit var storage: SharedPreferenceWhatsNewStorage private lateinit var settings: Settings diff --git a/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt b/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt index 5cbf63310..11292bbfe 100644 --- a/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt @@ -23,20 +23,17 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.HomeActivity.Companion.OPEN_TO_BROWSER_AND_LOAD import org.mozilla.fenix.IntentReceiverActivity -import org.mozilla.fenix.TestApplication import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.PREVIOUS_INTENT import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_REQUEST_CODE import org.robolectric.Robolectric -import org.robolectric.RobolectricTestRunner +import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.robolectric.Shadows import org.robolectric.android.controller.ActivityController -import org.robolectric.annotation.Config import org.robolectric.shadows.ShadowActivity @ExperimentalCoroutinesApi -@RunWith(RobolectricTestRunner::class) -@Config(application = TestApplication::class) +@RunWith(FenixRobolectricTestRunner::class) class VoiceSearchActivityTest { private lateinit var controller: ActivityController