From f907ec52f0bcdf321c7da07025decacff7cc83f6 Mon Sep 17 00:00:00 2001
From: shldhll <iam.shldhll@gmail.com>
Date: Thu, 10 Oct 2019 04:04:51 +0530
Subject: [PATCH] Removed ObsoleteCoroutinesApi in tests. Closes #5876

---
 app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt  | 1 -
 .../fenix/components/toolbar/BrowserToolbarController.kt        | 1 -
 .../org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt  | 1 -
 .../java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt     | 1 -
 .../org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt     | 1 -
 .../java/org/mozilla/fenix/library/history/HistoryFragment.kt   | 1 -
 app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt    | 1 -
 .../mozilla/fenix/settings/account/AccountSettingsFragment.kt   | 1 -
 .../settings/quicksettings/QuickSettingsSheetDialogFragment.kt  | 2 --
 app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt         | 1 -
 .../test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt   | 1 -
 .../mozilla/fenix/collections/CreateCollectionFragmentTest.kt   | 1 -
 .../test/java/org/mozilla/fenix/components/StoreProviderTest.kt | 1 -
 .../mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt  | 1 -
 .../mozilla/fenix/components/metrics/GleanMetricsServiceTest.kt | 1 -
 .../org/mozilla/fenix/components/metrics/PerformedSearchTest.kt | 1 -
 .../components/toolbar/DefaultBrowserToolbarControllerTest.kt   | 1 -
 .../mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt  | 1 -
 app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt         | 1 -
 app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt     | 1 -
 app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt         | 1 -
 app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt         | 1 -
 app/src/test/java/org/mozilla/fenix/ext/LogTest.kt              | 1 -
 app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt    | 1 -
 app/src/test/java/org/mozilla/fenix/ext/StringTest.kt           | 1 -
 app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt    | 1 -
 .../fenix/home/intent/CrashReporterIntentProcessorTest.kt       | 1 -
 .../mozilla/fenix/home/intent/DeepLinkIntentProcessorTest.kt    | 1 -
 .../mozilla/fenix/home/intent/OpenBrowserIntentProcessorTest.kt | 1 -
 .../fenix/home/intent/SpeechProcessingIntentProcessorTest.kt    | 1 -
 .../mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt | 1 -
 .../org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt  | 1 -
 .../library/bookmarks/BookmarkDeselectNavigationListenerTest.kt | 1 -
 .../fenix/library/bookmarks/BookmarksSharedViewModelTest.kt     | 1 -
 .../org/mozilla/fenix/library/bookmarks/DesktopFoldersTest.kt   | 1 -
 .../quickactionsheet/QuickActionSheetSessionObserverTest.kt     | 1 -
 .../org/mozilla/fenix/search/DefaultSearchControllerTest.kt     | 1 -
 .../test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt    | 1 -
 .../DefaultDeleteBrowsingDataControllerTest.kt                  | 1 -
 .../fenix/settings/deletebrowsingdata/DeleteAndQuitTest.kt      | 1 -
 .../test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt   | 1 -
 app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt       | 1 -
 .../test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt | 1 -
 app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt    | 1 -
 .../test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt | 1 -
 .../java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt    | 1 -
 46 files changed, 47 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index f3b176a87..a58d9807d 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -65,7 +65,6 @@ import org.mozilla.fenix.quickactionsheet.QuickActionSheetView
 /**
  * Fragment used for browsing the web within the main app.
  */
-@ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 @Suppress("TooManyFunctions", "LargeClass")
 class BrowserFragment : BaseBrowserFragment(), BackHandler {
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 7fb85f29b..3855b4eaa 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -106,7 +106,6 @@ class DefaultBrowserToolbarController(
     }
 
     @ExperimentalCoroutinesApi
-    @ObsoleteCoroutinesApi
     @SuppressWarnings("ComplexMethod", "LongMethod")
     override fun handleToolbarItemInteraction(item: ToolbarMenu.Item) {
         val sessionUseCases = activity.components.useCases.sessionUseCases
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
index 959a12678..b8e7d91a7 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
@@ -35,7 +35,6 @@ import org.mozilla.fenix.ext.requireComponents
 /**
  * Fragment used for browsing the web within external apps.
  */
-@ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 class ExternalAppBrowserFragment : BaseBrowserFragment(), BackHandler {
 
diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
index a9ea7c1f0..d0cfbfa2c 100644
--- a/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/exceptions/ExceptionsFragment.kt
@@ -55,7 +55,6 @@ class ExceptionsFragment : Fragment() {
         return view
     }
 
-    @ObsoleteCoroutinesApi
     @ExperimentalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
index 5112906f2..e96213d34 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
@@ -110,7 +110,6 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), BackHandler {
         return view
     }
 
-    @ObsoleteCoroutinesApi
     @ExperimentalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
index 728c9ce39..512212673 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
@@ -108,7 +108,6 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), BackHandler {
         }
     }
 
-    @ObsoleteCoroutinesApi
     @ExperimentalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index 4ec096925..d77f44d84 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -124,7 +124,6 @@ class SearchFragment : Fragment(), BackHandler {
         return view
     }
 
-    @ObsoleteCoroutinesApi
     @ExperimentalCoroutinesApi
     @SuppressWarnings("LongMethod")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
index 419fefed6..1470b9963 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/account/AccountSettingsFragment.kt
@@ -80,7 +80,6 @@ class AccountSettingsFragment : PreferenceFragmentCompat() {
         requireComponents.analytics.metrics.track(Event.SyncAccountClosed)
     }
 
-    @ObsoleteCoroutinesApi
     @ExperimentalCoroutinesApi
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
index d8dffa0e1..aa926259c 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt
@@ -48,7 +48,6 @@ import com.google.android.material.R as MaterialR
 
 private const val REQUEST_CODE_QUICK_SETTINGS_PERMISSIONS = 4
 
-@ObsoleteCoroutinesApi
 @SuppressWarnings("TooManyFunctions")
 class QuickSettingsSheetDialogFragment : AppCompatDialogFragment() {
     private val safeArguments get() = requireNotNull(arguments)
@@ -161,7 +160,6 @@ class QuickSettingsSheetDialogFragment : AppCompatDialogFragment() {
     }
 
     @ExperimentalCoroutinesApi
-    @ObsoleteCoroutinesApi
     override fun onResume() {
         super.onResume()
         getAutoDisposeObservable<QuickSettingsAction>()
diff --git a/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt b/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt
index 1a57b8dbc..2d813e958 100644
--- a/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/HomeActivityTest.kt
@@ -15,7 +15,6 @@ import org.mozilla.fenix.components.metrics.Event
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class HomeActivityTest {
diff --git a/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt b/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt
index 5a67d369e..e5763690f 100644
--- a/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt
@@ -20,7 +20,6 @@ import org.robolectric.Robolectric
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
diff --git a/app/src/test/java/org/mozilla/fenix/collections/CreateCollectionFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CreateCollectionFragmentTest.kt
index 09535f3ea..35827557a 100644
--- a/app/src/test/java/org/mozilla/fenix/collections/CreateCollectionFragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/collections/CreateCollectionFragmentTest.kt
@@ -16,7 +16,6 @@ import org.junit.runner.RunWith
 import org.mozilla.fenix.TestApplication
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 class CreateCollectionFragmentTest {
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 5ea25d0a8..ae453d9d1 100644
--- a/app/src/test/java/org/mozilla/fenix/components/StoreProviderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/StoreProviderTest.kt
@@ -19,7 +19,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class StoreProviderTest {
diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
index 33124a9cc..65fb3ebef 100644
--- a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt
@@ -20,7 +20,6 @@ import org.mockito.Mockito.verify
 import org.mozilla.fenix.TestApplication
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 internal class BreadcrumbRecorderTest {
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 cda566684..a547e9ab2 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
@@ -21,7 +21,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class GleanMetricsServiceTest {
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 6c75f3460..95f5f713e 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
@@ -21,7 +21,6 @@ import org.mozilla.fenix.components.metrics.Event.PerformedSearch.EventSource
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class PerformedSearchTest {
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 d8e0d1b3f..28bdb85a0 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
@@ -53,7 +53,6 @@ import org.mozilla.fenix.quickactionsheet.QuickActionSheetBehavior
 import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit
 
 @ExperimentalCoroutinesApi
-@ObsoleteCoroutinesApi
 class DefaultBrowserToolbarControllerTest {
 
     private val mainThreadSurrogate = newSingleThreadContext("UI thread")
diff --git a/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt b/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt
index 6eeea7e4f..1a9b363be 100644
--- a/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt
@@ -15,7 +15,6 @@ import org.mozilla.fenix.components.metrics.Event
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class ExternalAppBrowserActivityTest {
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 7b9e9f289..285040de7 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/ActivityTest.kt
@@ -14,7 +14,6 @@ import android.view.View
 import android.view.WindowManager
 import org.robolectric.Shadows.shadowOf
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 
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 4e3f0f1a0..428054fe7 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/BrowserIconsTest.kt
@@ -14,7 +14,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 
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 55e7101ed..6ab94438f 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/DrawableTest.kt
@@ -13,7 +13,6 @@ import android.graphics.Rect
 import android.graphics.Canvas
 import android.graphics.ColorFilter
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 
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 178fbf49f..02b27c793 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/FragmentTest.kt
@@ -24,7 +24,6 @@ import androidx.navigation.NavDestination
 import androidx.navigation.NavController
 import androidx.navigation.Navigator.Extras
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 
diff --git a/app/src/test/java/org/mozilla/fenix/ext/LogTest.kt b/app/src/test/java/org/mozilla/fenix/ext/LogTest.kt
index 61af89720..c5edb12de 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/LogTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/LogTest.kt
@@ -12,7 +12,6 @@ import io.mockk.verify
 import android.util.Log
 import org.mozilla.fenix.BuildConfig
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 
diff --git a/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt b/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt
index c2b7c9644..0c2f47c04 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/NavControllerTest.kt
@@ -16,7 +16,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 
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 fe2a3552b..309e88d91 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/StringTest.kt
@@ -9,7 +9,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 
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 1c075a409..2100ebaf3 100644
--- a/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt
@@ -19,7 +19,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class TabCollectionTest {
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 711901d07..121584d2c 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
@@ -18,7 +18,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class CrashReporterIntentProcessorTest {
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 8427e838c..66001e119 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
@@ -24,7 +24,6 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class DeepLinkIntentProcessorTest {
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 04b43a3d8..cc183cf61 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
@@ -18,7 +18,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class OpenBrowserIntentProcessorTest {
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 460c55ef2..ac1331334 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
@@ -19,7 +19,6 @@ import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class SpeechProcessingIntentProcessorTest {
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 31d7faadc..212286073 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
@@ -20,7 +20,6 @@ import org.mozilla.fenix.components.metrics.MetricController
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class StartSearchIntentProcessorTest {
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 fe4eaca67..03793da2c 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
@@ -17,7 +17,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 internal class BookmarkAdapterTest {
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 632589960..495aad018 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
@@ -20,7 +20,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class BookmarkDeselectNavigationListenerTest {
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 f68061325..4cb9ba9a6 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
@@ -21,7 +21,6 @@ import org.mozilla.fenix.TestApplication
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 internal class BookmarksSharedViewModelTest {
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 1f53b7b71..913ba834d 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
@@ -27,7 +27,6 @@ import org.mozilla.fenix.ext.components
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class DesktopFoldersTest {
diff --git a/app/src/test/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetSessionObserverTest.kt b/app/src/test/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetSessionObserverTest.kt
index 8a1fdcd73..b0b8fb457 100644
--- a/app/src/test/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetSessionObserverTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/quickactionsheet/QuickActionSheetSessionObserverTest.kt
@@ -22,7 +22,6 @@ import org.mozilla.fenix.components.toolbar.BrowserFragmentStore
 import org.mozilla.fenix.components.toolbar.QuickActionSheetAction
 
 @ExperimentalCoroutinesApi
-@ObsoleteCoroutinesApi
 class QuickActionSheetSessionObserverTest {
 
     private lateinit var components: Components
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 4ed35a7d2..7f0b4fd2a 100644
--- a/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/DefaultSearchControllerTest.kt
@@ -34,7 +34,6 @@ import org.mozilla.fenix.utils.Settings
 import org.mozilla.fenix.whatsnew.clear
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 class DefaultSearchControllerTest {
diff --git a/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt b/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt
index 2bf143eef..072281e92 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/SupportUtilsTest.kt
@@ -18,7 +18,6 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 import java.util.Locale
 
-@ObsoleteCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)
 class SupportUtilsTest {
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 b13a4d558..5ef7a5583 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
@@ -28,7 +28,6 @@ import org.mozilla.fenix.TestApplication
 import org.mozilla.fenix.ext.components
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
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 39c35d302..7328bbdaa 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
@@ -34,7 +34,6 @@ import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.utils.Settings
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
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 01ce1fe4b..a1a10204a 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/ClipboardHandlerTest.kt
@@ -17,7 +17,6 @@ import org.junit.runner.RunWith
 import org.mozilla.fenix.TestApplication
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 class ClipboardHandlerTest {
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 56edcbd44..1ab7c830d 100644
--- a/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt
@@ -23,7 +23,6 @@ import org.mozilla.fenix.settings.PhoneFeature
 import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 class SettingsTest {
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 1643d4ad1..dd0dc047d 100644
--- a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewStorageTest.kt
@@ -16,7 +16,6 @@ import org.mozilla.fenix.ext.clearAndCommit
 import org.mozilla.fenix.utils.Settings
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 class WhatsNewStorageTest {
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 74da9d526..0a4a89486 100644
--- a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewTest.kt
@@ -16,7 +16,6 @@ import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.Settings
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 class WhatsNewTest {
diff --git a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt
index 9fc5151fe..50d9f0cd1 100644
--- a/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/whatsnew/WhatsNewVersionTest.kt
@@ -12,7 +12,6 @@ import org.junit.runner.RunWith
 import org.mozilla.fenix.TestApplication
 import org.robolectric.annotation.Config
 
-@ObsoleteCoroutinesApi
 @RunWith(AndroidJUnit4::class)
 @Config(application = TestApplication::class)
 class WhatsNewVersionTest {
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 3191ac208..895c07144 100644
--- a/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt
@@ -35,7 +35,6 @@ import org.robolectric.android.controller.ActivityController
 import org.robolectric.annotation.Config
 import org.robolectric.shadows.ShadowActivity
 
-@ObsoleteCoroutinesApi
 @ExperimentalCoroutinesApi
 @RunWith(RobolectricTestRunner::class)
 @Config(application = TestApplication::class)