From 7dff584b82a1ebdcb2e8dff2e8badf1459492f47 Mon Sep 17 00:00:00 2001 From: Arturo Mejia Date: Wed, 18 Mar 2020 10:47:14 -0400 Subject: [PATCH] Remove @ObsoleteCoroutinesApi from tests --- .../test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt | 2 -- .../components/toolbar/DefaultBrowserToolbarControllerTest.kt | 2 -- .../mozilla/fenix/home/DefaultSessionControlControllerTest.kt | 2 -- .../DefaultDeleteBrowsingDataControllerTest.kt | 2 -- .../fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt | 2 -- .../quicksettings/DefaultQuickSettingsControllerTest.kt | 2 -- .../settings/quicksettings/QuickSettingsFragmentStoreTest.kt | 1 - 7 files changed, 13 deletions(-) diff --git a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt index 294fc1a69..e3263e917 100644 --- a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt @@ -11,7 +11,6 @@ import assertk.assertions.isEqualTo import io.mockk.every import io.mockk.mockk import io.mockk.mockkStatic -import kotlinx.coroutines.ObsoleteCoroutinesApi import mozilla.components.browser.errorpages.ErrorPages import mozilla.components.browser.errorpages.ErrorType import mozilla.components.concept.engine.request.RequestInterceptor @@ -25,7 +24,6 @@ import org.mozilla.fenix.ext.isOnline import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -@UseExperimental(ObsoleteCoroutinesApi::class) @RunWith(RobolectricTestRunner::class) @Config(application = TestApplication::class) class AppRequestInterceptorTest { 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 f00fc2bc3..20aff69d1 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 @@ -20,7 +20,6 @@ import io.mockk.verify import io.mockk.verifyOrder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.newSingleThreadContext import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.resetMain @@ -62,7 +61,6 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @ExperimentalCoroutinesApi -@UseExperimental(ObsoleteCoroutinesApi::class) @RunWith(RobolectricTestRunner::class) @Config(application = TestApplication::class) class DefaultBrowserToolbarControllerTest { diff --git a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt index 0ad389af9..063e13ee9 100644 --- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt @@ -13,7 +13,6 @@ import io.mockk.verify import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.MainScope -import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.newSingleThreadContext import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.setMain @@ -36,7 +35,6 @@ import org.mozilla.fenix.settings.SupportUtils import mozilla.components.feature.tab.collections.Tab as ComponentTab @ExperimentalCoroutinesApi -@UseExperimental(ObsoleteCoroutinesApi::class) class DefaultSessionControlControllerTest { private val mainThreadSurrogate = newSingleThreadContext("UI thread") diff --git a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt index 985b1a079..b15ce2a4f 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/deletebrowsingdata/DefaultDeleteBrowsingDataControllerTest.kt @@ -13,7 +13,6 @@ import io.mockk.mockk import io.mockk.verify import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.newSingleThreadContext import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.runBlockingTest @@ -28,7 +27,6 @@ import org.mozilla.fenix.ext.components import org.robolectric.annotation.Config @ExperimentalCoroutinesApi -@UseExperimental(ObsoleteCoroutinesApi::class) @RunWith(AndroidJUnit4::class) @Config(application = TestApplication::class) class DefaultDeleteBrowsingDataControllerTest { 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 8fc0f842c..15beca4bf 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 @@ -13,7 +13,6 @@ import io.mockk.verify import io.mockk.verifyOrder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.newSingleThreadContext import kotlinx.coroutines.test.resetMain import kotlinx.coroutines.test.runBlockingTest @@ -37,7 +36,6 @@ import org.mozilla.fenix.utils.Settings import org.robolectric.annotation.Config @ExperimentalCoroutinesApi -@UseExperimental(ObsoleteCoroutinesApi::class) @RunWith(AndroidJUnit4::class) @Config(application = TestApplication::class) class DeleteAndQuitTest { 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 6e32517ac..7efb8dc0c 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 @@ -21,7 +21,6 @@ import io.mockk.slot import io.mockk.verify import io.mockk.verifyOrder import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.TestCoroutineScope import mozilla.components.browser.session.Session @@ -43,7 +42,6 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @ExperimentalCoroutinesApi -@UseExperimental(ObsoleteCoroutinesApi::class) @RunWith(RobolectricTestRunner::class) @Config(application = TestApplication::class) class DefaultQuickSettingsControllerTest { 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 2308bd5c3..d720de428 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 @@ -38,7 +38,6 @@ import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config @RunWith(RobolectricTestRunner::class) -@UseExperimental(kotlinx.coroutines.ObsoleteCoroutinesApi::class) @Config(application = TestApplication::class) class QuickSettingsFragmentStoreTest { private val context = spyk(testContext)