diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 84d9d7079..318b0b346 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -172,8 +172,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { private val externalSourceIntentProcessors by lazy { listOf( HomeDeepLinkIntentProcessor(this), - SpeechProcessingIntentProcessor(this, components.core.store, components.analytics.metrics), - StartSearchIntentProcessor(components.analytics.metrics), + SpeechProcessingIntentProcessor(this, components.core.store), + StartSearchIntentProcessor(), OpenBrowserIntentProcessor(this, ::getIntentSessionId), OpenSpecificTabIntentProcessor(this), DefaultBrowserIntentProcessor(this) diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index ed841f6dc..8480c026b 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -322,7 +322,6 @@ abstract class BaseBrowserFragment : tabsUseCases = requireComponents.useCases.tabsUseCases, activity = activity, navController = findNavController(), - metrics = requireComponents.analytics.metrics, readerModeController = readerMenuController, engineView = binding.engineView, homeViewModel = homeViewModel, @@ -360,7 +359,6 @@ abstract class BaseBrowserFragment : store = store, activity = activity, navController = findNavController(), - metrics = requireComponents.analytics.metrics, settings = context.settings(), readerModeController = readerMenuController, sessionFeature = sessionFeature, diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt index 03b01558c..f5126b859 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -199,10 +199,7 @@ class Core( RecentlyClosedMiddleware(recentlyClosedTabsStorage, RECENTLY_CLOSED_MAX), DownloadMiddleware(context, DownloadService::class.java), ReaderViewMiddleware(), - TelemetryMiddleware( - context.settings(), - metrics - ), + TelemetryMiddleware(context.settings()), ThumbnailsMiddleware(thumbnailStorage), UndoMiddleware(context.getUndoDelay()), RegionMiddleware(context, locationService), 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 8390104ae..f8275661f 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 @@ -25,7 +25,6 @@ import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions import org.mozilla.fenix.browser.BrowserFragmentDirections import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.readermode.ReaderModeController -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.nav @@ -55,7 +54,6 @@ class DefaultBrowserToolbarController( private val tabsUseCases: TabsUseCases, private val activity: HomeActivity, private val navController: NavController, - private val metrics: MetricController, private val readerModeController: ReaderModeController, private val engineView: EngineView, private val homeViewModel: HomeScreenViewModel, diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt index 4b12e7675..31e15fc0c 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt @@ -42,7 +42,6 @@ import org.mozilla.fenix.collections.SaveCollectionStep import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.accounts.AccountState -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getRootView import org.mozilla.fenix.ext.nav @@ -64,7 +63,6 @@ class DefaultBrowserToolbarMenuController( private val store: BrowserStore, private val activity: HomeActivity, private val navController: NavController, - private val metrics: MetricController, private val settings: Settings, private val readerModeController: ReaderModeController, private val sessionFeature: ViewBoundFeatureWrapper, diff --git a/app/src/main/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessor.kt index 6aff6ffb4..bf97b4f28 100644 --- a/app/src/main/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessor.kt +++ b/app/src/main/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessor.kt @@ -13,7 +13,6 @@ import mozilla.components.browser.state.store.BrowserStore import mozilla.components.feature.search.ext.waitForSelectedOrDefaultSearchEngine import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.ext.components import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING @@ -25,7 +24,6 @@ import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING class SpeechProcessingIntentProcessor( private val activity: HomeActivity, private val store: BrowserStore, - private val metrics: MetricController ) : HomeIntentProcessor { override fun process(intent: Intent, navController: NavController, out: Intent): Boolean { diff --git a/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt b/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt index 580f6dd58..14d07b34c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt +++ b/app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt @@ -12,7 +12,6 @@ import org.mozilla.fenix.GleanMetrics.SearchWidget import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.R -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.ext.nav @@ -20,9 +19,7 @@ import org.mozilla.fenix.ext.nav * When the search widget is tapped, Fenix should open to the search fragment. * Tapping the private browsing mode launcher icon should also open to the search fragment. */ -class StartSearchIntentProcessor( - private val metrics: MetricController -) : HomeIntentProcessor { +class StartSearchIntentProcessor : HomeIntentProcessor { override fun process(intent: Intent, navController: NavController, out: Intent): Boolean { val event = intent.extras?.getString(HomeActivity.OPEN_TO_SEARCH) 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 c6a48a3e4..d81c60390 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 @@ -77,9 +77,6 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan private var _binding: FragmentBookmarkBinding? = null private val binding get() = _binding!! - private val metrics - get() = context?.components?.analytics?.metrics - override val selectedItems get() = bookmarkStore.state.mode.selectedItems override fun onCreateView( @@ -107,8 +104,7 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan deleteBookmarkNodes = ::deleteMulti, deleteBookmarkFolder = ::showRemoveFolderDialog, showTabTray = ::showTabTray - ), - metrics = metrics!! + ) ) bookmarkView = BookmarkView(binding.bookmarkLayout, bookmarkInteractor, findNavController()) diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt index 2c6ccd2f9..6318614f2 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt @@ -9,7 +9,6 @@ import mozilla.components.concept.storage.BookmarkNodeType import mozilla.telemetry.glean.private.NoExtras import org.mozilla.fenix.GleanMetrics.BookmarksManagement import org.mozilla.fenix.browser.browsingmode.BrowsingMode -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.utils.Do /** @@ -19,12 +18,10 @@ import org.mozilla.fenix.utils.Do * @property bookmarkStore bookmarks state * @property viewModel view state * @property bookmarksController view controller - * @property metrics telemetry controller */ @SuppressWarnings("TooManyFunctions") class BookmarkFragmentInteractor( private val bookmarksController: BookmarkController, - private val metrics: MetricController ) : BookmarkViewInteractor { override fun onBookmarksChanged(node: BookmarkNode) { diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt index ac413a6ed..65c325f96 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt @@ -17,7 +17,6 @@ import org.mozilla.fenix.R import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.history.DefaultPagedHistoryProvider -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.navigateSafe import org.mozilla.fenix.GleanMetrics.History as GleanHistory @@ -56,7 +55,6 @@ class DefaultHistoryController( delete: (Set) -> suspend (context: Context) -> Unit ) -> Unit, private val syncHistory: suspend () -> Unit, - private val metrics: MetricController ) : HistoryController { override fun handleOpen(item: History) { 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 e0b6fac75..832c6c20f 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(), UserInteractionHandler { invalidateOptionsMenu = ::invalidateOptionsMenu, deleteSnackbar = :: deleteSnackbar, syncHistory = ::syncHistory, - metrics = requireComponents.analytics.metrics ) historyInteractor = DefaultHistoryInteractor( historyController diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt b/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt index 91033bab5..a240fa2b0 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt @@ -14,7 +14,6 @@ import org.mozilla.fenix.ext.components class FenixOnboarding(context: Context) : PreferencesHolder { - private val metrics = context.components.analytics.metrics private val strictMode = context.components.strictMode override val preferences: SharedPreferences = strictMode.resetAfter(StrictMode.allowThreadDiskReads()) { context.getSharedPreferences( diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt index 8a579b2e3..8c2f945e9 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt @@ -23,7 +23,6 @@ import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.SearchShortcuts import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.crashes.CrashListActivity import org.mozilla.fenix.ext.navigateSafe @@ -63,7 +62,6 @@ class SearchDialogController( private val fragmentStore: SearchFragmentStore, private val navController: NavController, private val settings: Settings, - private val metrics: MetricController, private val dismissDialog: () -> Unit, private val clearToolbarFocus: () -> Unit, private val focusToolbar: () -> Unit, diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index 3e583565d..a52502dbe 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -180,7 +180,6 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { fragmentStore = store, navController = findNavController(), settings = requireContext().settings(), - metrics = requireComponents.analytics.metrics, dismissDialog = { dialogHandledAction = true dismissAllowingStateLoss() diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt b/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt index 73cd85e96..c20bba400 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt @@ -25,7 +25,6 @@ import org.mozilla.fenix.collections.CollectionsDialog import org.mozilla.fenix.collections.show import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.bookmarks.BookmarksUseCase -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.tabstray.ext.getTabSessionState import org.mozilla.fenix.tabstray.ext.isActiveDownload @@ -102,7 +101,6 @@ class DefaultNavigationInteractor( private val activity: HomeActivity, private val browserStore: BrowserStore, private val navController: NavController, - private val metrics: MetricController, private val dismissTabTray: () -> Unit, private val dismissTabTrayAndNavigateHome: (sessionId: String) -> Unit, private val bookmarksUseCase: BookmarksUseCase, diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt index 95e3d0c5e..3a21bcfa1 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt @@ -21,7 +21,6 @@ import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager import org.mozilla.fenix.components.metrics.Event -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.ext.DEFAULT_ACTIVE_DAYS import org.mozilla.fenix.ext.potentialInactiveTabs @@ -115,7 +114,6 @@ class DefaultTabsTrayController( private val navigateToHomeAndDeleteSession: (String) -> Unit, private val profiler: Profiler?, private val navigationInteractor: NavigationInteractor, - private val metrics: MetricController, private val tabsUseCases: TabsUseCases, private val selectTabPosition: (Int, Boolean) -> Unit, private val dismissTray: () -> Unit, diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt index 9954a0b01..49b6010e2 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt @@ -43,7 +43,6 @@ import org.mozilla.fenix.databinding.FragmentTabTrayDialogBinding import org.mozilla.fenix.databinding.TabsTrayTabCounter2Binding import org.mozilla.fenix.databinding.TabstrayMultiselectItemsBinding import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.metrics import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.runIfFragmentIsAttached import org.mozilla.fenix.ext.settings @@ -152,9 +151,7 @@ class TabsTrayFragment : AppCompatDialogFragment() { focusGroupTabId = args.focusGroupTabId ), middlewares = listOf( - TabsTrayMiddleware( - metrics = requireContext().metrics - ) + TabsTrayMiddleware() ) ) } @@ -194,7 +191,6 @@ class TabsTrayFragment : AppCompatDialogFragment() { tabsTrayStore = tabsTrayStore, browserStore = requireComponents.core.store, navController = findNavController(), - metrics = requireComponents.analytics.metrics, dismissTabTray = ::dismissTabsTray, dismissTabTrayAndNavigateHome = ::dismissTabsTrayAndNavigateHome, bookmarksUseCase = requireComponents.useCases.bookmarksUseCases, @@ -214,7 +210,6 @@ class TabsTrayFragment : AppCompatDialogFragment() { navigateToHomeAndDeleteSession = ::navigateToHomeAndDeleteSession, navigationInteractor = navigationInteractor, profiler = requireComponents.core.engine.profiler, - metrics = requireComponents.analytics.metrics, tabsUseCases = requireComponents.useCases.tabsUseCases, selectTabPosition = ::selectTabPosition, dismissTray = ::dismissTabsTray, diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt index ceb0946a4..8adcd29eb 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt @@ -10,16 +10,11 @@ import mozilla.components.lib.state.MiddlewareContext import org.mozilla.fenix.GleanMetrics.Metrics import org.mozilla.fenix.GleanMetrics.SearchTerms import org.mozilla.fenix.GleanMetrics.TabsTray -import org.mozilla.fenix.components.metrics.MetricController /** * [Middleware] that reacts to various [TabsTrayAction]s. - * - * @property metrics reference to the configured [MetricController] to record general page load events. */ -class TabsTrayMiddleware( - private val metrics: MetricController -) : Middleware { +class TabsTrayMiddleware : Middleware { private var shouldReportInactiveTabMetrics: Boolean = true private var shouldReportSearchGroupMetrics: Boolean = true diff --git a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt index d67cc46a3..82996550d 100644 --- a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt @@ -22,7 +22,6 @@ import mozilla.components.support.base.android.Clock import mozilla.components.support.base.log.logger.Logger import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.Metrics -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.utils.Settings import org.mozilla.fenix.GleanMetrics.EngineTab as EngineMetrics @@ -31,11 +30,9 @@ import org.mozilla.fenix.GleanMetrics.EngineTab as EngineMetrics * * @property settings reference to the application [Settings]. * @property adsTelemetry reference to [AdsTelemetry] use to record search telemetry. - * @property metrics reference to the configured [MetricController] to record general page load events. */ class TelemetryMiddleware( private val settings: Settings, - private val metrics: MetricController ) : Middleware { private val logger = Logger("TelemetryMiddleware") 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 57d6dbb51..1376d0f5f 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 @@ -49,7 +49,6 @@ import org.mozilla.fenix.browser.BrowserFragmentDirections import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.SimpleBrowsingModeManager import org.mozilla.fenix.browser.readermode.ReaderModeController -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -69,9 +68,6 @@ class DefaultBrowserToolbarControllerTest { @MockK(relaxUnitFun = true) private lateinit var engineView: EngineView - @RelaxedMockK - private lateinit var metrics: MetricController - @RelaxedMockK private lateinit var searchUseCases: SearchUseCases @@ -377,7 +373,6 @@ class DefaultBrowserToolbarControllerTest { tabsUseCases = tabsUseCases, activity = activity, navController = navController, - metrics = metrics, engineView = engineView, homeViewModel = homeViewModel, customTabSessionId = customTabSessionId, diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt index b5a1d2387..da86d4d3a 100644 --- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt @@ -72,7 +72,6 @@ import org.mozilla.fenix.collections.SaveCollectionStep import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.accounts.AccountState -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.directionsEq import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -92,7 +91,6 @@ class DefaultBrowserToolbarMenuControllerTest { @RelaxedMockK private lateinit var activity: HomeActivity @RelaxedMockK private lateinit var navController: NavController @RelaxedMockK private lateinit var openInFenixIntent: Intent - @RelaxedMockK private lateinit var metrics: MetricController @RelaxedMockK private lateinit var settings: Settings @RelaxedMockK private lateinit var searchUseCases: SearchUseCases @RelaxedMockK private lateinit var sessionUseCases: SessionUseCases @@ -814,7 +812,6 @@ class DefaultBrowserToolbarMenuControllerTest { store = store, activity = activity, navController = navController, - metrics = metrics, settings = settings, findInPageLauncher = findInPageLauncher, browserAnimator = browserAnimator, 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 41b9524ec..c0cf2e5d5 100644 --- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt @@ -64,7 +64,6 @@ import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.appstate.AppState -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.settings import org.mozilla.fenix.gleanplumb.Message @@ -89,7 +88,6 @@ class DefaultSessionControlControllerTest { private val activity: HomeActivity = mockk(relaxed = true) private val appStore: AppStore = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true) - private val metrics: MetricController = mockk(relaxed = true) private val messageController: MessageController = mockk(relaxed = true) private val engine: Engine = mockk(relaxed = true) private val tabCollectionStorage: TabCollectionStorage = mockk(relaxed = true) @@ -154,7 +152,6 @@ class DefaultSessionControlControllerTest { every { activity.components.settings } returns settings every { activity.settings() } returns settings every { activity.components.analytics } returns analytics - every { analytics.metrics } returns metrics } @After diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/DefaultBrowserIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/DefaultBrowserIntentProcessorTest.kt index a8bd978f3..45073edc7 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/DefaultBrowserIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/DefaultBrowserIntentProcessorTest.kt @@ -19,7 +19,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @RunWith(FenixRobolectricTestRunner::class) @@ -45,14 +44,12 @@ class DefaultBrowserIntentProcessorTest { val navController: NavController = mockk(relaxed = true) val out: Intent = mockk() val activity: HomeActivity = mockk() - val metrics: MetricController = mockk() val intent = Intent().apply { putExtra("org.mozilla.fenix.default.browser.intent", true) } every { activity.startActivity(any()) } returns Unit every { activity.applicationContext } returns testContext - every { metrics.track(any()) } returns Unit assertFalse(Events.defaultBrowserNotifTapped.testHasValue()) 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 a74bd4235..f9e9b6ee5 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 @@ -21,7 +21,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.perf.TestStrictModeManager @@ -33,7 +32,6 @@ class SpeechProcessingIntentProcessorTest { private val activity: HomeActivity = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true) private val out: Intent = mockk(relaxed = true) - private val metrics: MetricController = mockk(relaxed = true) private val searchEngine = createSearchEngine( name = "Test", @@ -62,13 +60,12 @@ class SpeechProcessingIntentProcessorTest { @Test fun `do not process blank intents`() { - val processor = SpeechProcessingIntentProcessor(activity, store, metrics) + val processor = SpeechProcessingIntentProcessor(activity, store) processor.process(Intent(), navController, out) verify { activity wasNot Called } verify { navController wasNot Called } verify { out wasNot Called } - verify { metrics wasNot Called } } @Test @@ -76,13 +73,12 @@ class SpeechProcessingIntentProcessorTest { val intent = Intent().apply { putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, false) } - val processor = SpeechProcessingIntentProcessor(activity, store, metrics) + val processor = SpeechProcessingIntentProcessor(activity, store) processor.process(intent, navController, out) verify { activity wasNot Called } verify { navController wasNot Called } verify { out wasNot Called } - verify { metrics wasNot Called } } @Test @@ -93,7 +89,7 @@ class SpeechProcessingIntentProcessorTest { putExtra(SPEECH_PROCESSING, "hello world") } - val processor = SpeechProcessingIntentProcessor(activity, store, metrics) + val processor = SpeechProcessingIntentProcessor(activity, store) processor.process(intent, mockk(), mockk(relaxed = true)) verify { 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 2cc1b64ce..9b54e00ca 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 @@ -21,7 +21,6 @@ import org.mozilla.fenix.GleanMetrics.SearchWidget import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.R -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.ext.nav import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -32,15 +31,11 @@ class StartSearchIntentProcessorTest { @get:Rule val gleanTestRule = GleanTestRule(testContext) - private val metrics: MetricController = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true) private val out: Intent = mockk(relaxed = true) @Test fun `do not process blank intents`() { - StartSearchIntentProcessor(metrics).process(Intent(), navController, out) - - verify { metrics wasNot Called } verify { navController wasNot Called } verify { out wasNot Called } } @@ -50,9 +45,8 @@ class StartSearchIntentProcessorTest { val intent = Intent().apply { removeExtra(HomeActivity.OPEN_TO_SEARCH) } - StartSearchIntentProcessor(metrics).process(intent, navController, out) + StartSearchIntentProcessor().process(intent, navController, out) - verify { metrics wasNot Called } verify { navController wasNot Called } verify { out wasNot Called } } @@ -62,7 +56,7 @@ class StartSearchIntentProcessorTest { val intent = Intent().apply { putExtra(HomeActivity.OPEN_TO_SEARCH, StartSearchIntentProcessor.SEARCH_WIDGET) } - StartSearchIntentProcessor(metrics).process(intent, navController, out) + StartSearchIntentProcessor().process(intent, navController, out) val options = navOptions { popUpTo = R.id.homeFragment } diff --git a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt index 8695f7251..394823787 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt @@ -29,8 +29,6 @@ import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.GleanMetrics.RecentBookmarks import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R -import org.mozilla.fenix.components.metrics.MetricController -import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.home.HomeFragmentDirections import org.mozilla.fenix.home.recentbookmarks.controller.DefaultRecentBookmarksController @@ -46,14 +44,12 @@ class DefaultRecentBookmarksControllerTest { private val activity: HomeActivity = mockk(relaxed = true) private val navController: NavController = mockk(relaxUnitFun = true) - private val metrics: MetricController = mockk(relaxed = true) private lateinit var controller: DefaultRecentBookmarksController @Before fun setup() { every { activity.openToBrowserAndLoad(any(), any(), any()) } just Runs - every { activity.components.core.metrics } returns metrics every { navController.currentDestination } returns mockk { every { id } returns R.id.homeFragment diff --git a/app/src/test/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolderTest.kt index 02d37453d..1ba42bf09 100644 --- a/app/src/test/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolderTest.kt @@ -24,7 +24,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.Pings import org.mozilla.fenix.GleanMetrics.TopSites -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.databinding.TopSiteItemBinding import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -39,7 +38,6 @@ class TopSiteItemViewHolderTest { private lateinit var binding: TopSiteItemBinding private lateinit var interactor: TopSiteInteractor private lateinit var lifecycleOwner: LifecycleOwner - private lateinit var metrics: MetricController private val pocket = TopSite.Default( id = 1L, @@ -53,10 +51,8 @@ class TopSiteItemViewHolderTest { binding = TopSiteItemBinding.inflate(LayoutInflater.from(testContext)) interactor = mockk(relaxed = true) lifecycleOwner = mockk(relaxed = true) - metrics = mockk(relaxed = true) every { testContext.components.core.icons } returns BrowserIcons(testContext, mockk(relaxed = true)) - every { testContext.components.analytics.metrics } returns metrics } @Test diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt index b6164c55c..aebc1578b 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt @@ -19,7 +19,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.BookmarksManagement import org.mozilla.fenix.browser.browsingmode.BrowsingMode -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @SuppressWarnings("TooManyFunctions", "LargeClass") @@ -32,7 +31,6 @@ class BookmarkFragmentInteractorTest { private lateinit var interactor: BookmarkFragmentInteractor private val bookmarkController: DefaultBookmarkController = mockk(relaxed = true) - private val metrics: MetricController = mockk(relaxed = true) private val item = BookmarkNode(BookmarkNodeType.ITEM, "456", "123", 0u, "Mozilla", "http://mozilla.org", 0, null) private val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "789", "123", 1u, null, null, 0, null) @@ -44,10 +42,7 @@ class BookmarkFragmentInteractorTest { @Before fun setup() { interactor = - BookmarkFragmentInteractor( - bookmarksController = bookmarkController, - metrics = metrics - ) + BookmarkFragmentInteractor(bookmarksController = bookmarkController) } @Test 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 a6ae30600..e815af7b2 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 @@ -20,7 +20,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.R import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.history.DefaultPagedHistoryProvider -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.navigateSafe import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -38,7 +37,6 @@ class HistoryControllerTest { private val appStore: AppStore = mockk(relaxed = true) private val state: HistoryFragmentState = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true) - private val metrics: MetricController = mockk(relaxed = true) private val historyProvider: DefaultPagedHistoryProvider = mockk(relaxed = true) @Before @@ -202,7 +200,6 @@ class HistoryControllerTest { invalidateOptionsMenu, { items, _, _ -> deleteHistoryItems.invoke(items) }, syncHistory, - metrics ) } } diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistorySearchControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistorySearchControllerTest.kt index 8f01a9197..23d7a43da 100644 --- a/app/src/test/java/org/mozilla/fenix/library/history/HistorySearchControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/history/HistorySearchControllerTest.kt @@ -21,7 +21,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.GleanMetrics.History import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @RunWith(FenixRobolectricTestRunner::class) @@ -32,7 +31,6 @@ class HistorySearchControllerTest { @MockK(relaxed = true) private lateinit var activity: HomeActivity @MockK(relaxed = true) private lateinit var store: HistorySearchFragmentStore - @MockK(relaxed = true) private lateinit var metrics: MetricController @Before fun setUp() { diff --git a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt index eb84dc945..46f314434 100644 --- a/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt @@ -8,7 +8,6 @@ import androidx.navigation.NavController import androidx.navigation.NavOptions import io.mockk.mockk import io.mockk.coEvery -import io.mockk.clearMocks import io.mockk.every import io.mockk.verify import io.mockk.coVerify @@ -37,7 +36,6 @@ import org.mozilla.fenix.GleanMetrics.RecentlyClosedTabs import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.directionsEq import org.mozilla.fenix.ext.optionsEq import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -49,7 +47,6 @@ class DefaultRecentlyClosedControllerTest { private val browserStore: BrowserStore = mockk(relaxed = true) private val recentlyClosedStore: RecentlyClosedFragmentStore = mockk(relaxed = true) private val tabsUseCases: TabsUseCases = mockk(relaxed = true) - private val metrics: MetricController = mockk(relaxed = true) @get:Rule val gleanTestRule = GleanTestRule(testContext) @@ -111,7 +108,6 @@ class DefaultRecentlyClosedControllerTest { assertEquals(BrowsingMode.Normal, actualBrowsingModes[1]) assertTrue(RecentlyClosedTabs.menuOpenInNormalTab.testHasValue()) assertNull(RecentlyClosedTabs.menuOpenInNormalTab.testGetValue().last().extra) - clearMocks(metrics) tabUrls.clear() actualBrowsingModes.clear() diff --git a/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt b/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt index 233c4d3d1..894467b7f 100644 --- a/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt @@ -24,8 +24,6 @@ import org.junit.runner.RunWith import org.mozilla.experiments.nimbus.Branch import org.mozilla.fenix.components.Components import org.mozilla.fenix.components.FenixSnackbar -import org.mozilla.fenix.components.metrics.MetricController -import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.getRootView import org.mozilla.fenix.ext.settings import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @@ -44,7 +42,6 @@ class NimbusBranchesControllerTest { private lateinit var settings: Settings private lateinit var activity: Context private lateinit var components: Components - private lateinit var metrics: MetricController private lateinit var snackbar: FenixSnackbar private lateinit var rootView: View @@ -52,7 +49,6 @@ class NimbusBranchesControllerTest { fun setup() { components = mockk(relaxed = true) settings = mockk(relaxed = true) - metrics = mockk(relaxed = true) snackbar = mockk(relaxed = true) navController = mockk(relaxed = true) @@ -66,7 +62,6 @@ class NimbusBranchesControllerTest { every { FenixSnackbar.make(any(), any(), any(), any()) } returns snackbar every { activity.settings() } returns settings - every { activity.components.analytics.metrics } returns metrics every { navController.currentDestination } returns mockk { every { id } returns org.mozilla.fenix.R.id.nimbusBranchesFragment diff --git a/app/src/test/java/org/mozilla/fenix/onboarding/FenixOnboardingTest.kt b/app/src/test/java/org/mozilla/fenix/onboarding/FenixOnboardingTest.kt index 55b16816e..769faba87 100644 --- a/app/src/test/java/org/mozilla/fenix/onboarding/FenixOnboardingTest.kt +++ b/app/src/test/java/org/mozilla/fenix/onboarding/FenixOnboardingTest.kt @@ -15,7 +15,6 @@ import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.perf.TestStrictModeManager @@ -29,17 +28,13 @@ class FenixOnboardingTest { private lateinit var onboarding: FenixOnboarding private lateinit var preferences: SharedPreferences private lateinit var preferencesEditor: SharedPreferences.Editor - private lateinit var metrics: MetricController @Before fun setup() { preferences = mockk() preferencesEditor = mockk(relaxed = true) - metrics = mockk() val context = mockk() every { preferences.edit() } returns preferencesEditor - every { metrics.track(any()) } returns Unit - every { context.components.analytics.metrics } returns metrics every { context.components.strictMode } returns TestStrictModeManager() as StrictModeManager every { context.getSharedPreferences(any(), MODE_PRIVATE) } returns preferences diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt index 2203f488d..e99d6ec84 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt @@ -43,7 +43,6 @@ import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.SearchShortcuts import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.search.SearchDialogFragmentDirections.Companion.actionGlobalAddonsManagementFragment @@ -59,7 +58,6 @@ class SearchDialogControllerTest { @MockK(relaxed = true) private lateinit var store: SearchDialogFragmentStore @MockK(relaxed = true) private lateinit var navController: NavController @MockK private lateinit var searchEngine: SearchEngine - @MockK(relaxed = true) private lateinit var metrics: MetricController @MockK(relaxed = true) private lateinit var settings: Settings private lateinit var middleware: CaptureActionsMiddleware @@ -418,7 +416,6 @@ class SearchDialogControllerTest { fragmentStore = store, navController = navController, settings = settings, - metrics = metrics, dismissDialog = dismissDialog, clearToolbarFocus = clearToolbarFocus, focusToolbar = focusToolbar, 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 cdc5fb03c..85b0479fc 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 @@ -40,10 +40,8 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.TrackingProtection import org.mozilla.fenix.components.PermissionStorage -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.directionsEq -import org.mozilla.fenix.ext.metrics import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.settings.PhoneFeature import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled @@ -310,12 +308,10 @@ class DefaultQuickSettingsControllerTest { fun `handleTrackingProtectionToggled should call the right use cases`() { val trackingProtectionUseCases: TrackingProtectionUseCases = mockk(relaxed = true) val sessionUseCases: SessionUseCases = mockk(relaxed = true) - val metrics: MetricController = mockk(relaxed = true) every { context.components.core.store } returns browserStore every { context.components.useCases.trackingProtectionUseCases } returns trackingProtectionUseCases every { context.components.useCases.sessionUseCases } returns sessionUseCases - every { context.metrics } returns metrics every { store.dispatch(any()) } returns mockk() var isEnabled = true 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 143d4ef63..294dd3436 100644 --- a/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt @@ -34,15 +34,12 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertNotEquals import org.junit.Assert.assertNull import org.junit.Assert.assertTrue -import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.SyncAccount import org.mozilla.fenix.R import org.mozilla.fenix.components.FenixSnackbar -import org.mozilla.fenix.components.metrics.MetricController -import org.mozilla.fenix.ext.metrics import org.mozilla.fenix.ext.nav import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.share.listadapters.AppShareOption @@ -51,7 +48,6 @@ import org.mozilla.fenix.share.listadapters.AppShareOption class ShareControllerTest { // Need a valid context to retrieve Strings for example, but we also need it to return our "metrics" private val context: Context = spyk(testContext) - private val metrics: MetricController = mockk(relaxed = true) private val shareSubject = "shareSubject" private val shareData = listOf( ShareData(url = "url0", title = "title0"), @@ -82,11 +78,6 @@ class ShareControllerTest { recentAppStorage, testCoroutineScope, testDispatcher, dismiss ) - @Before - fun setUp() { - every { context.metrics } returns metrics - } - @After fun cleanUp() { testCoroutineScope.cleanupTestCoroutines() diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt index 046fda3a7..0d11d4f48 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt @@ -36,7 +36,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.ext.maxActiveTime import org.mozilla.fenix.ext.potentialInactiveTabs @@ -62,9 +61,6 @@ class DefaultTabsTrayControllerTest { @MockK(relaxed = true) private lateinit var navigationInteractor: NavigationInteractor - @MockK(relaxed = true) - private lateinit var metrics: MetricController - @MockK(relaxed = true) private lateinit var tabsUseCases: TabsUseCases @@ -551,7 +547,6 @@ class DefaultTabsTrayControllerTest { navigateToHomeAndDeleteSession, profiler, navigationInteractor, - metrics, tabsUseCases, selectTabPosition, dismissTray, diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt index 056f1fa89..f2ad4071b 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt @@ -42,7 +42,6 @@ import org.mozilla.fenix.collections.CollectionsDialog import org.mozilla.fenix.collections.show import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.bookmarks.BookmarksUseCase -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import mozilla.components.browser.state.state.createTab as createStateTab import mozilla.components.browser.storage.sync.Tab as SyncTab @@ -53,7 +52,6 @@ class NavigationInteractorTest { private lateinit var tabsTrayStore: TabsTrayStore private val testTab: TabSessionState = createStateTab(url = "https://mozilla.org") private val navController: NavController = mockk(relaxed = true) - private val metrics: MetricController = mockk(relaxed = true) private val bookmarksUseCase: BookmarksUseCase = mockk(relaxed = true) private val context: Context = mockk(relaxed = true) private val collectionStorage: TabCollectionStorage = mockk(relaxed = true) @@ -264,7 +262,6 @@ class NavigationInteractorTest { activity, browserStore, navController, - metrics, dismissTabTray, dismissTabTrayAndNavigateHome, bookmarksUseCase, diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt index cbfbc81c9..cda5e9360 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt @@ -44,7 +44,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.R -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.databinding.ComponentTabstray2Binding import org.mozilla.fenix.databinding.ComponentTabstrayFabBinding import org.mozilla.fenix.databinding.FragmentTabTrayDialogBinding @@ -239,8 +238,6 @@ class TabsTrayFragmentTest { try { mockkStatic("org.mozilla.fenix.tabstray.ext.BrowserMenuKt") val navigationInteractor: NavigationInteractor = mockk() - val metrics: MetricController = mockk(relaxed = true) - every { context.components.analytics.metrics } returns metrics every { context.components.core.store } returns mockk() every { fragment.tabsTrayStore } returns mockk() val menu: BrowserMenu = mockk { @@ -351,8 +348,6 @@ class TabsTrayFragmentTest { @Test fun `WHEN dismissTabsTray is called THEN it dismisses the tray`() { every { fragment.dismissAllowingStateLoss() } just Runs - val metrics: MetricController = mockk(relaxed = true) - every { context.components.analytics.metrics } returns metrics fragment.dismissTabsTray() diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayMiddlewareTest.kt index e6e6dd677..8d58a03d3 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayMiddlewareTest.kt @@ -21,7 +21,6 @@ import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.Metrics import org.mozilla.fenix.GleanMetrics.SearchTerms import org.mozilla.fenix.GleanMetrics.TabsTray -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule @@ -29,17 +28,13 @@ class TabsTrayMiddlewareTest { private lateinit var store: TabsTrayStore private lateinit var tabsTrayMiddleware: TabsTrayMiddleware - private lateinit var metrics: MetricController @get:Rule val gleanTestRule = GleanTestRule(testContext) @Before fun setUp() { - metrics = mockk(relaxed = true) - tabsTrayMiddleware = TabsTrayMiddleware( - metrics - ) + tabsTrayMiddleware = TabsTrayMiddleware() store = TabsTrayStore( middlewares = listOf(tabsTrayMiddleware), initialState = TabsTrayState() diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/RemoveTabUseCaseWrapperTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/RemoveTabUseCaseWrapperTest.kt index ea2e8a46e..ec9448074 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/RemoveTabUseCaseWrapperTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/RemoveTabUseCaseWrapperTest.kt @@ -4,7 +4,6 @@ package org.mozilla.fenix.tabstray.browser -import io.mockk.mockk import mozilla.components.service.glean.testing.GleanTestRule import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertEquals @@ -14,14 +13,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.TabsTray -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule class RemoveTabUseCaseWrapperTest { - val metricController = mockk(relaxed = true) - @get:Rule val gleanTestRule = GleanTestRule(testContext) diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectTabUseCaseWrapperTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectTabUseCaseWrapperTest.kt index dee89cfb7..4932ecbe2 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectTabUseCaseWrapperTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectTabUseCaseWrapperTest.kt @@ -16,13 +16,11 @@ import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.TabsTray -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner @RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule class SelectTabUseCaseWrapperTest { - val metricController = mockk(relaxed = true) val selectUseCase: TabsUseCases.SelectTabUseCase = mockk(relaxed = true) @get:Rule diff --git a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt index 571e4963a..658a8b8b4 100644 --- a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt @@ -30,7 +30,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.Metrics -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.utils.Settings import org.mozilla.fenix.GleanMetrics.EngineTab as EngineMetrics @@ -41,7 +40,6 @@ class TelemetryMiddlewareTest { private lateinit var store: BrowserStore private lateinit var settings: Settings private lateinit var telemetryMiddleware: TelemetryMiddleware - private lateinit var metrics: MetricController @get:Rule val coroutinesTestRule = MainCoroutineRule() @@ -56,11 +54,7 @@ class TelemetryMiddlewareTest { Clock.delegate = clock settings = Settings(testContext) - metrics = mockk(relaxed = true) - telemetryMiddleware = TelemetryMiddleware( - settings, - metrics - ) + telemetryMiddleware = TelemetryMiddleware(settings,) store = BrowserStore( middleware = listOf(telemetryMiddleware) + EngineMiddleware.create(engine = mockk()), initialState = BrowserState() diff --git a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt index 5c0901753..a865e4af5 100644 --- a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt @@ -12,7 +12,6 @@ import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test -import org.mozilla.fenix.components.metrics.MetricController import org.mozilla.fenix.utils.Settings import java.util.Calendar import java.util.Date @@ -24,7 +23,6 @@ class WallpaperManagerTest { private val fakeCalendar = Calendar.getInstance() private val mockSettings: Settings = mockk() - private val mockMetrics: MetricController = mockk() private val mockDownloader: WallpaperDownloader = mockk { coEvery { downloadWallpaper(any()) } just runs } @@ -34,8 +32,6 @@ class WallpaperManagerTest { @Test fun `WHEN wallpaper set THEN current wallpaper updated in settings`() { - every { mockMetrics.track(any()) } just runs - val currentCaptureSlot = slot() every { mockSettings.currentWallpaper } returns "" every { mockSettings.currentWallpaper = capture(currentCaptureSlot) } just runs diff --git a/detekt-baseline.xml b/detekt-baseline.xml index 84b49f5bf..53a7d694c 100644 --- a/detekt-baseline.xml +++ b/detekt-baseline.xml @@ -6,15 +6,15 @@ FunctionOnlyReturningConstant:MetricsUtils.kt$MetricsUtils$ @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) internal fun getHashingSalt(): String FunctionOnlyReturningConstant:SupportUtils.kt$SupportUtils$fun getFirefoxAccountSumoUrl(): String FunctionParameterNaming:FenixSnackbar.kt$FenixSnackbar.Companion$_view: View? - LongParameterList:BrowserToolbarController.kt$DefaultBrowserToolbarController$( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val activity: HomeActivity, private val navController: NavController, private val metrics: MetricController, private val readerModeController: ReaderModeController, private val engineView: EngineView, private val homeViewModel: HomeScreenViewModel, private val customTabSessionId: String?, private val browserAnimator: BrowserAnimator, private val onTabCounterClicked: () -> Unit, private val onCloseTab: (SessionState) -> Unit ) - LongParameterList:BrowserToolbarMenuController.kt$DefaultBrowserToolbarMenuController$( private val store: BrowserStore, private val activity: HomeActivity, private val navController: NavController, private val metrics: MetricController, private val settings: Settings, private val readerModeController: ReaderModeController, private val sessionFeature: ViewBoundFeatureWrapper<SessionFeature>, private val findInPageLauncher: () -> Unit, private val browserAnimator: BrowserAnimator, private val swipeRefresh: SwipeRefreshLayout, private val customTabSessionId: String?, private val openInFenixIntent: Intent, private val bookmarkTapped: (String, String) -> Unit, private val scope: CoroutineScope, private val tabCollectionStorage: TabCollectionStorage, private val topSitesStorage: DefaultTopSitesStorage, private val pinnedSiteStorage: PinnedSiteStorage, private val browserStore: BrowserStore ) + LongParameterList:BrowserToolbarController.kt$DefaultBrowserToolbarController$( private val store: BrowserStore, private val tabsUseCases: TabsUseCases, private val activity: HomeActivity, private val navController: NavController, private val readerModeController: ReaderModeController, private val engineView: EngineView, private val homeViewModel: HomeScreenViewModel, private val customTabSessionId: String?, private val browserAnimator: BrowserAnimator, private val onTabCounterClicked: () -> Unit, private val onCloseTab: (SessionState) -> Unit ) + LongParameterList:BrowserToolbarMenuController.kt$DefaultBrowserToolbarMenuController$( private val store: BrowserStore, private val activity: HomeActivity, private val navController: NavController, private val settings: Settings, private val readerModeController: ReaderModeController, private val sessionFeature: ViewBoundFeatureWrapper<SessionFeature>, private val findInPageLauncher: () -> Unit, private val browserAnimator: BrowserAnimator, private val swipeRefresh: SwipeRefreshLayout, private val customTabSessionId: String?, private val openInFenixIntent: Intent, private val bookmarkTapped: (String, String) -> Unit, private val scope: CoroutineScope, private val tabCollectionStorage: TabCollectionStorage, private val topSitesStorage: DefaultTopSitesStorage, private val pinnedSiteStorage: PinnedSiteStorage, private val browserStore: BrowserStore ) LongParameterList:CrashContentIntegration.kt$CrashContentIntegration$( private val browserStore: BrowserStore, private val appStore: AppStore, private val toolbar: BrowserToolbar, private val isToolbarPlacedAtTop: Boolean, private val crashReporterView: CrashContentView, private val components: Components, private val settings: Settings, private val navController: NavController, private val sessionId: String? ) LongParameterList:CustomTabsIntegration.kt$CustomTabsIntegration$( store: BrowserStore, useCases: CustomTabsUseCases, toolbar: BrowserToolbar, sessionId: String, activity: Activity, onItemTapped: (ToolbarMenu.Item) -> Unit = {}, shouldReverseItems: Boolean, isPrivate: Boolean ) LongParameterList:DeleteBrowsingDataController.kt$DefaultDeleteBrowsingDataController$( private val removeAllTabs: TabsUseCases.RemoveAllTabsUseCase, private val removeAllDownloads: DownloadsUseCases.RemoveAllDownloadsUseCase, private val historyStorage: HistoryStorage, private val permissionStorage: PermissionStorage, private val store: BrowserStore, private val iconsStorage: BrowserIcons, private val engine: Engine, private val coroutineContext: CoroutineContext = Dispatchers.Main ) LongParameterList:HistoryController.kt$DefaultHistoryController$( private val store: HistoryFragmentStore, private val navController: NavController, private val scope: CoroutineScope, private val openToBrowser: (item: History.Regular) -> Unit, private val displayDeleteAll: () -> Unit, private val invalidateOptionsMenu: () -> Unit, private val deleteHistoryItems: (Set<History>) -> Unit, private val syncHistory: suspend () -> Unit, private val metrics: MetricController ) LongParameterList:QuickSettingsController.kt$DefaultQuickSettingsController$( private val context: Context, private val quickSettingsStore: QuickSettingsFragmentStore, private val browserStore: BrowserStore, private val ioScope: CoroutineScope, private val navController: NavController, @VisibleForTesting internal val sessionId: String, @VisibleForTesting internal var sitePermissions: SitePermissions?, private val settings: Settings, private val permissionStorage: PermissionStorage, private val reload: ReloadUrlUseCase, private val requestRuntimePermissions: OnNeedToRequestPermissions = { }, private val displayPermissions: () -> Unit, private val engine: Engine = context.components.core.engine, ) LongParameterList:ShareController.kt$DefaultShareController$( private val context: Context, private val shareSubject: String?, private val shareData: List<ShareData>, private val sendTabUseCases: SendTabUseCases, private val snackbar: FenixSnackbar, private val navController: NavController, private val recentAppsStorage: RecentAppsStorage, private val viewLifecycleScope: CoroutineScope, private val dispatcher: CoroutineDispatcher = Dispatchers.IO, private val dismiss: (ShareController.Result) -> Unit ) - LongParameterList:TabsTrayController.kt$DefaultTabsTrayController$( private val trayStore: TabsTrayStore, private val browserStore: BrowserStore, private val browsingModeManager: BrowsingModeManager, private val navController: NavController, private val navigateToHomeAndDeleteSession: (String) -> Unit, private val profiler: Profiler?, private val navigationInteractor: NavigationInteractor, private val metrics: MetricController, private val tabsUseCases: TabsUseCases, private val selectTabPosition: (Int, Boolean) -> Unit, private val dismissTray: () -> Unit, private val showUndoSnackbarForTab: (Boolean) -> Unit, @VisibleForTesting internal val showCancelledDownloadWarning: (downloadCount: Int, tabId: String?, source: String?) -> Unit, ) + LongParameterList:TabsTrayController.kt$DefaultTabsTrayController$( private val trayStore: TabsTrayStore, private val browserStore: BrowserStore, private val browsingModeManager: BrowsingModeManager, private val navController: NavController, private val navigateToHomeAndDeleteSession: (String) -> Unit, private val profiler: Profiler?, private val navigationInteractor: NavigationInteractor, private val tabsUseCases: TabsUseCases, private val selectTabPosition: (Int, Boolean) -> Unit, private val dismissTray: () -> Unit, private val showUndoSnackbarForTab: (Boolean) -> Unit, @VisibleForTesting internal val showCancelledDownloadWarning: (downloadCount: Int, tabId: String?, source: String?) -> Unit, ) LongParameterList:ToolbarIntegration.kt$DefaultToolbarIntegration$( context: Context, toolbar: BrowserToolbar, toolbarMenu: ToolbarMenu, domainAutocompleteProvider: DomainAutocompleteProvider, historyStorage: HistoryStorage, lifecycleOwner: LifecycleOwner, sessionId: String? = null, isPrivate: Boolean, interactor: BrowserToolbarInteractor, engine: Engine ) UndocumentedPublicClass:AboutItem.kt$AboutItem UndocumentedPublicClass:AboutItem.kt$AboutItem$Crashes : AboutItem