Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For #21292: Remove unused MetricController parameters.

Browse Source
pull/543/head
mcarare 2 years ago committed by mergify[bot]
parent 01a09c83fe
commit ffa1ecd300
45 changed files with 18 additions and 169 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
Unescape Escape View File

@ -172,8 +172,8 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
private val externalSourceIntentProcessors by lazy { private val externalSourceIntentProcessors by lazy {
listOf( listOf(
HomeDeepLinkIntentProcessor(this), HomeDeepLinkIntentProcessor(this),
SpeechProcessingIntentProcessor(this, components.core.store, components.analytics.metrics), SpeechProcessingIntentProcessor(this, components.core.store),
StartSearchIntentProcessor(components.analytics.metrics), StartSearchIntentProcessor(),
OpenBrowserIntentProcessor(this, ::getIntentSessionId), OpenBrowserIntentProcessor(this, ::getIntentSessionId),
OpenSpecificTabIntentProcessor(this), OpenSpecificTabIntentProcessor(this),
DefaultBrowserIntentProcessor(this) DefaultBrowserIntentProcessor(this)

2
app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
Unescape Escape View File

@ -322,7 +322,6 @@ abstract class BaseBrowserFragment :
tabsUseCases = requireComponents.useCases.tabsUseCases, tabsUseCases = requireComponents.useCases.tabsUseCases,
activity = activity, activity = activity,
navController = findNavController(), navController = findNavController(),
metrics = requireComponents.analytics.metrics,
readerModeController = readerMenuController, readerModeController = readerMenuController,
engineView = binding.engineView, engineView = binding.engineView,
homeViewModel = homeViewModel, homeViewModel = homeViewModel,
@ -360,7 +359,6 @@ abstract class BaseBrowserFragment :
store = store, store = store,
activity = activity, activity = activity,
navController = findNavController(), navController = findNavController(),
metrics = requireComponents.analytics.metrics,
settings = context.settings(), settings = context.settings(),
readerModeController = readerMenuController, readerModeController = readerMenuController,
sessionFeature = sessionFeature, sessionFeature = sessionFeature,

5
app/src/main/java/org/mozilla/fenix/components/Core.kt
Unescape Escape View File

@ -199,10 +199,7 @@ class Core(
RecentlyClosedMiddleware(recentlyClosedTabsStorage, RECENTLY_CLOSED_MAX), RecentlyClosedMiddleware(recentlyClosedTabsStorage, RECENTLY_CLOSED_MAX),
DownloadMiddleware(context, DownloadService::class.java), DownloadMiddleware(context, DownloadService::class.java),
ReaderViewMiddleware(), ReaderViewMiddleware(),
TelemetryMiddleware( TelemetryMiddleware(context.settings()),
context.settings(),
metrics
),
ThumbnailsMiddleware(thumbnailStorage), ThumbnailsMiddleware(thumbnailStorage),
UndoMiddleware(context.getUndoDelay()), UndoMiddleware(context.getUndoDelay()),
RegionMiddleware(context, locationService), RegionMiddleware(context, locationService),

2
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
Unescape Escape View File

@ -25,7 +25,6 @@ import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions
import org.mozilla.fenix.browser.BrowserFragmentDirections import org.mozilla.fenix.browser.BrowserFragmentDirections
import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.browser.readermode.ReaderModeController 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.components.toolbar.interactor.BrowserToolbarInteractor
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.nav
@ -55,7 +54,6 @@ class DefaultBrowserToolbarController(
private val tabsUseCases: TabsUseCases, private val tabsUseCases: TabsUseCases,
private val activity: HomeActivity, private val activity: HomeActivity,
private val navController: NavController, private val navController: NavController,
private val metrics: MetricController,
private val readerModeController: ReaderModeController, private val readerModeController: ReaderModeController,
private val engineView: EngineView, private val engineView: EngineView,
private val homeViewModel: HomeScreenViewModel, private val homeViewModel: HomeScreenViewModel,

2
app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt
Unescape Escape View File

@ -42,7 +42,6 @@ import org.mozilla.fenix.collections.SaveCollectionStep
import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.FenixSnackbar
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.accounts.AccountState 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.components
import org.mozilla.fenix.ext.getRootView import org.mozilla.fenix.ext.getRootView
import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.nav
@ -64,7 +63,6 @@ class DefaultBrowserToolbarMenuController(
private val store: BrowserStore, private val store: BrowserStore,
private val activity: HomeActivity, private val activity: HomeActivity,
private val navController: NavController, private val navController: NavController,
private val metrics: MetricController,
private val settings: Settings, private val settings: Settings,
private val readerModeController: ReaderModeController, private val readerModeController: ReaderModeController,
private val sessionFeature: ViewBoundFeatureWrapper<SessionFeature>, private val sessionFeature: ViewBoundFeatureWrapper<SessionFeature>,

2
app/src/main/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessor.kt
Unescape Escape View File

@ -13,7 +13,6 @@ import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.feature.search.ext.waitForSelectedOrDefaultSearchEngine import mozilla.components.feature.search.ext.waitForSelectedOrDefaultSearchEngine
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.components.metrics.MetricsUtils
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING
@ -25,7 +24,6 @@ import org.mozilla.fenix.widget.VoiceSearchActivity.Companion.SPEECH_PROCESSING
class SpeechProcessingIntentProcessor( class SpeechProcessingIntentProcessor(
private val activity: HomeActivity, private val activity: HomeActivity,
private val store: BrowserStore, private val store: BrowserStore,
private val metrics: MetricController
) : HomeIntentProcessor { ) : HomeIntentProcessor {
override fun process(intent: Intent, navController: NavController, out: Intent): Boolean { override fun process(intent: Intent, navController: NavController, out: Intent): Boolean {

5
app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt
Unescape Escape View File

@ -12,7 +12,6 @@ import org.mozilla.fenix.GleanMetrics.SearchWidget
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.NavGraphDirections
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.components.metrics.MetricsUtils
import org.mozilla.fenix.ext.nav 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. * 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. * Tapping the private browsing mode launcher icon should also open to the search fragment.
*/ */
class StartSearchIntentProcessor( class StartSearchIntentProcessor : HomeIntentProcessor {
private val metrics: MetricController
) : HomeIntentProcessor {
override fun process(intent: Intent, navController: NavController, out: Intent): Boolean { override fun process(intent: Intent, navController: NavController, out: Intent): Boolean {
val event = intent.extras?.getString(HomeActivity.OPEN_TO_SEARCH) val event = intent.extras?.getString(HomeActivity.OPEN_TO_SEARCH)

6
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
Unescape Escape View File

@ -77,9 +77,6 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
private var _binding: FragmentBookmarkBinding? = null private var _binding: FragmentBookmarkBinding? = null
private val binding get() = _binding!! private val binding get() = _binding!!
private val metrics
get() = context?.components?.analytics?.metrics
override val selectedItems get() = bookmarkStore.state.mode.selectedItems override val selectedItems get() = bookmarkStore.state.mode.selectedItems
override fun onCreateView( override fun onCreateView(
@ -107,8 +104,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
deleteBookmarkNodes = ::deleteMulti, deleteBookmarkNodes = ::deleteMulti,
deleteBookmarkFolder = ::showRemoveFolderDialog, deleteBookmarkFolder = ::showRemoveFolderDialog,
showTabTray = ::showTabTray showTabTray = ::showTabTray
), )
metrics = metrics!!
) )
bookmarkView = BookmarkView(binding.bookmarkLayout, bookmarkInteractor, findNavController()) bookmarkView = BookmarkView(binding.bookmarkLayout, bookmarkInteractor, findNavController())

3
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractor.kt
Unescape Escape View File

@ -9,7 +9,6 @@ import mozilla.components.concept.storage.BookmarkNodeType
import mozilla.telemetry.glean.private.NoExtras import mozilla.telemetry.glean.private.NoExtras
import org.mozilla.fenix.GleanMetrics.BookmarksManagement import org.mozilla.fenix.GleanMetrics.BookmarksManagement
import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.utils.Do import org.mozilla.fenix.utils.Do
/** /**
@ -19,12 +18,10 @@ import org.mozilla.fenix.utils.Do
* @property bookmarkStore bookmarks state * @property bookmarkStore bookmarks state
* @property viewModel view state * @property viewModel view state
* @property bookmarksController view controller * @property bookmarksController view controller
* @property metrics telemetry controller
*/ */
@SuppressWarnings("TooManyFunctions") @SuppressWarnings("TooManyFunctions")
class BookmarkFragmentInteractor( class BookmarkFragmentInteractor(
private val bookmarksController: BookmarkController, private val bookmarksController: BookmarkController,
private val metrics: MetricController
) : BookmarkViewInteractor { ) : BookmarkViewInteractor {
override fun onBookmarksChanged(node: BookmarkNode) { override fun onBookmarksChanged(node: BookmarkNode) {

2
app/src/main/java/org/mozilla/fenix/library/history/HistoryController.kt
Unescape Escape View File

@ -17,7 +17,6 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.AppStore
import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.appstate.AppAction
import org.mozilla.fenix.components.history.DefaultPagedHistoryProvider 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.components
import org.mozilla.fenix.ext.navigateSafe import org.mozilla.fenix.ext.navigateSafe
import org.mozilla.fenix.GleanMetrics.History as GleanHistory import org.mozilla.fenix.GleanMetrics.History as GleanHistory
@ -56,7 +55,6 @@ class DefaultHistoryController(
delete: (Set<History>) -> suspend (context: Context) -> Unit delete: (Set<History>) -> suspend (context: Context) -> Unit
) -> Unit, ) -> Unit,
private val syncHistory: suspend () -> Unit, private val syncHistory: suspend () -> Unit,
private val metrics: MetricController
) : HistoryController { ) : HistoryController {
override fun handleOpen(item: History) { override fun handleOpen(item: History) {

1
app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
Unescape Escape View File

@ -108,7 +108,6 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler {
invalidateOptionsMenu = ::invalidateOptionsMenu, invalidateOptionsMenu = ::invalidateOptionsMenu,
deleteSnackbar = :: deleteSnackbar, deleteSnackbar = :: deleteSnackbar,
syncHistory = ::syncHistory, syncHistory = ::syncHistory,
metrics = requireComponents.analytics.metrics
) )
historyInteractor = DefaultHistoryInteractor( historyInteractor = DefaultHistoryInteractor(
historyController historyController

1
app/src/main/java/org/mozilla/fenix/onboarding/FenixOnboarding.kt
Unescape Escape View File

@ -14,7 +14,6 @@ import org.mozilla.fenix.ext.components
class FenixOnboarding(context: Context) : PreferencesHolder { class FenixOnboarding(context: Context) : PreferencesHolder {
private val metrics = context.components.analytics.metrics
private val strictMode = context.components.strictMode private val strictMode = context.components.strictMode
override val preferences: SharedPreferences = strictMode.resetAfter(StrictMode.allowThreadDiskReads()) { override val preferences: SharedPreferences = strictMode.resetAfter(StrictMode.allowThreadDiskReads()) {
context.getSharedPreferences( context.getSharedPreferences(

2
app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt
Unescape Escape View File

@ -23,7 +23,6 @@ import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.GleanMetrics.SearchShortcuts import org.mozilla.fenix.GleanMetrics.SearchShortcuts
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.components.metrics.MetricsUtils
import org.mozilla.fenix.crashes.CrashListActivity import org.mozilla.fenix.crashes.CrashListActivity
import org.mozilla.fenix.ext.navigateSafe import org.mozilla.fenix.ext.navigateSafe
@ -63,7 +62,6 @@ class SearchDialogController(
private val fragmentStore: SearchFragmentStore, private val fragmentStore: SearchFragmentStore,
private val navController: NavController, private val navController: NavController,
private val settings: Settings, private val settings: Settings,
private val metrics: MetricController,
private val dismissDialog: () -> Unit, private val dismissDialog: () -> Unit,
private val clearToolbarFocus: () -> Unit, private val clearToolbarFocus: () -> Unit,
private val focusToolbar: () -> Unit, private val focusToolbar: () -> Unit,

1
app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt
Unescape Escape View File

@ -180,7 +180,6 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
fragmentStore = store, fragmentStore = store,
navController = findNavController(), navController = findNavController(),
settings = requireContext().settings(), settings = requireContext().settings(),
metrics = requireComponents.analytics.metrics,
dismissDialog = { dismissDialog = {
dialogHandledAction = true dialogHandledAction = true
dismissAllowingStateLoss() dismissAllowingStateLoss()

2
app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt
Unescape Escape View File

@ -25,7 +25,6 @@ import org.mozilla.fenix.collections.CollectionsDialog
import org.mozilla.fenix.collections.show import org.mozilla.fenix.collections.show
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.bookmarks.BookmarksUseCase import org.mozilla.fenix.components.bookmarks.BookmarksUseCase
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.home.HomeFragment
import org.mozilla.fenix.tabstray.ext.getTabSessionState import org.mozilla.fenix.tabstray.ext.getTabSessionState
import org.mozilla.fenix.tabstray.ext.isActiveDownload import org.mozilla.fenix.tabstray.ext.isActiveDownload
@ -102,7 +101,6 @@ class DefaultNavigationInteractor(
private val activity: HomeActivity, private val activity: HomeActivity,
private val browserStore: BrowserStore, private val browserStore: BrowserStore,
private val navController: NavController, private val navController: NavController,
private val metrics: MetricController,
private val dismissTabTray: () -> Unit, private val dismissTabTray: () -> Unit,
private val dismissTabTrayAndNavigateHome: (sessionId: String) -> Unit, private val dismissTabTrayAndNavigateHome: (sessionId: String) -> Unit,
private val bookmarksUseCase: BookmarksUseCase, private val bookmarksUseCase: BookmarksUseCase,

2
app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt
Unescape Escape View File

@ -21,7 +21,6 @@ import org.mozilla.fenix.R
import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
import org.mozilla.fenix.components.metrics.Event import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.home.HomeFragment
import org.mozilla.fenix.ext.DEFAULT_ACTIVE_DAYS import org.mozilla.fenix.ext.DEFAULT_ACTIVE_DAYS
import org.mozilla.fenix.ext.potentialInactiveTabs import org.mozilla.fenix.ext.potentialInactiveTabs
@ -115,7 +114,6 @@ class DefaultTabsTrayController(
private val navigateToHomeAndDeleteSession: (String) -> Unit, private val navigateToHomeAndDeleteSession: (String) -> Unit,
private val profiler: Profiler?, private val profiler: Profiler?,
private val navigationInteractor: NavigationInteractor, private val navigationInteractor: NavigationInteractor,
private val metrics: MetricController,
private val tabsUseCases: TabsUseCases, private val tabsUseCases: TabsUseCases,
private val selectTabPosition: (Int, Boolean) -> Unit, private val selectTabPosition: (Int, Boolean) -> Unit,
private val dismissTray: () -> Unit, private val dismissTray: () -> Unit,

7
app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt
Unescape Escape View File

@ -43,7 +43,6 @@ import org.mozilla.fenix.databinding.FragmentTabTrayDialogBinding
import org.mozilla.fenix.databinding.TabsTrayTabCounter2Binding import org.mozilla.fenix.databinding.TabsTrayTabCounter2Binding
import org.mozilla.fenix.databinding.TabstrayMultiselectItemsBinding import org.mozilla.fenix.databinding.TabstrayMultiselectItemsBinding
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.metrics
import org.mozilla.fenix.ext.requireComponents import org.mozilla.fenix.ext.requireComponents
import org.mozilla.fenix.ext.runIfFragmentIsAttached import org.mozilla.fenix.ext.runIfFragmentIsAttached
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings
@ -152,9 +151,7 @@ class TabsTrayFragment : AppCompatDialogFragment() {
focusGroupTabId = args.focusGroupTabId focusGroupTabId = args.focusGroupTabId
), ),
middlewares = listOf( middlewares = listOf(
TabsTrayMiddleware( TabsTrayMiddleware()
metrics = requireContext().metrics
)
) )
) )
} }
@ -194,7 +191,6 @@ class TabsTrayFragment : AppCompatDialogFragment() {
tabsTrayStore = tabsTrayStore, tabsTrayStore = tabsTrayStore,
browserStore = requireComponents.core.store, browserStore = requireComponents.core.store,
navController = findNavController(), navController = findNavController(),
metrics = requireComponents.analytics.metrics,
dismissTabTray = ::dismissTabsTray, dismissTabTray = ::dismissTabsTray,
dismissTabTrayAndNavigateHome = ::dismissTabsTrayAndNavigateHome, dismissTabTrayAndNavigateHome = ::dismissTabsTrayAndNavigateHome,
bookmarksUseCase = requireComponents.useCases.bookmarksUseCases, bookmarksUseCase = requireComponents.useCases.bookmarksUseCases,
@ -214,7 +210,6 @@ class TabsTrayFragment : AppCompatDialogFragment() {
navigateToHomeAndDeleteSession = ::navigateToHomeAndDeleteSession, navigateToHomeAndDeleteSession = ::navigateToHomeAndDeleteSession,
navigationInteractor = navigationInteractor, navigationInteractor = navigationInteractor,
profiler = requireComponents.core.engine.profiler, profiler = requireComponents.core.engine.profiler,
metrics = requireComponents.analytics.metrics,
tabsUseCases = requireComponents.useCases.tabsUseCases, tabsUseCases = requireComponents.useCases.tabsUseCases,
selectTabPosition = ::selectTabPosition, selectTabPosition = ::selectTabPosition,
dismissTray = ::dismissTabsTray, dismissTray = ::dismissTabsTray,

7
app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMiddleware.kt
Unescape Escape View File

@ -10,16 +10,11 @@ import mozilla.components.lib.state.MiddlewareContext
import org.mozilla.fenix.GleanMetrics.Metrics import org.mozilla.fenix.GleanMetrics.Metrics
import org.mozilla.fenix.GleanMetrics.SearchTerms import org.mozilla.fenix.GleanMetrics.SearchTerms
import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.GleanMetrics.TabsTray
import org.mozilla.fenix.components.metrics.MetricController
/** /**
* [Middleware] that reacts to various [TabsTrayAction]s. * [Middleware] that reacts to various [TabsTrayAction]s.
*
* @property metrics reference to the configured [MetricController] to record general page load events.
*/ */
class TabsTrayMiddleware( class TabsTrayMiddleware : Middleware<TabsTrayState, TabsTrayAction> {
private val metrics: MetricController
) : Middleware<TabsTrayState, TabsTrayAction> {
private var shouldReportInactiveTabMetrics: Boolean = true private var shouldReportInactiveTabMetrics: Boolean = true
private var shouldReportSearchGroupMetrics: Boolean = true private var shouldReportSearchGroupMetrics: Boolean = true

3
app/src/main/java/org/mozilla/fenix/telemetry/TelemetryMiddleware.kt
Unescape Escape View File

@ -22,7 +22,6 @@ import mozilla.components.support.base.android.Clock
import mozilla.components.support.base.log.logger.Logger import mozilla.components.support.base.log.logger.Logger
import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.GleanMetrics.Metrics import org.mozilla.fenix.GleanMetrics.Metrics
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.utils.Settings import org.mozilla.fenix.utils.Settings
import org.mozilla.fenix.GleanMetrics.EngineTab as EngineMetrics 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 settings reference to the application [Settings].
* @property adsTelemetry reference to [AdsTelemetry] use to record search telemetry. * @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( class TelemetryMiddleware(
private val settings: Settings, private val settings: Settings,
private val metrics: MetricController
) : Middleware<BrowserState, BrowserAction> { ) : Middleware<BrowserState, BrowserAction> {
private val logger = Logger("TelemetryMiddleware") private val logger = Logger("TelemetryMiddleware")

5
app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt
Unescape Escape View File

@ -49,7 +49,6 @@ import org.mozilla.fenix.browser.BrowserFragmentDirections
import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.browser.browsingmode.SimpleBrowsingModeManager import org.mozilla.fenix.browser.browsingmode.SimpleBrowsingModeManager
import org.mozilla.fenix.browser.readermode.ReaderModeController 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.components
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ -69,9 +68,6 @@ class DefaultBrowserToolbarControllerTest {
@MockK(relaxUnitFun = true) @MockK(relaxUnitFun = true)
private lateinit var engineView: EngineView private lateinit var engineView: EngineView
@RelaxedMockK
private lateinit var metrics: MetricController
@RelaxedMockK @RelaxedMockK
private lateinit var searchUseCases: SearchUseCases private lateinit var searchUseCases: SearchUseCases
@ -377,7 +373,6 @@ class DefaultBrowserToolbarControllerTest {
tabsUseCases = tabsUseCases, tabsUseCases = tabsUseCases,
activity = activity, activity = activity,
navController = navController, navController = navController,
metrics = metrics,
engineView = engineView, engineView = engineView,
homeViewModel = homeViewModel, homeViewModel = homeViewModel,
customTabSessionId = customTabSessionId, customTabSessionId = customTabSessionId,

3
app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt
Unescape Escape View File

@ -72,7 +72,6 @@ import org.mozilla.fenix.collections.SaveCollectionStep
import org.mozilla.fenix.components.FenixSnackbar import org.mozilla.fenix.components.FenixSnackbar
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.accounts.AccountState 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.components
import org.mozilla.fenix.ext.directionsEq import org.mozilla.fenix.ext.directionsEq
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ -92,7 +91,6 @@ class DefaultBrowserToolbarMenuControllerTest {
@RelaxedMockK private lateinit var activity: HomeActivity @RelaxedMockK private lateinit var activity: HomeActivity
@RelaxedMockK private lateinit var navController: NavController @RelaxedMockK private lateinit var navController: NavController
@RelaxedMockK private lateinit var openInFenixIntent: Intent @RelaxedMockK private lateinit var openInFenixIntent: Intent
@RelaxedMockK private lateinit var metrics: MetricController
@RelaxedMockK private lateinit var settings: Settings @RelaxedMockK private lateinit var settings: Settings
@RelaxedMockK private lateinit var searchUseCases: SearchUseCases @RelaxedMockK private lateinit var searchUseCases: SearchUseCases
@RelaxedMockK private lateinit var sessionUseCases: SessionUseCases @RelaxedMockK private lateinit var sessionUseCases: SessionUseCases
@ -814,7 +812,6 @@ class DefaultBrowserToolbarMenuControllerTest {
store = store, store = store,
activity = activity, activity = activity,
navController = navController, navController = navController,
metrics = metrics,
settings = settings, settings = settings,
findInPageLauncher = findInPageLauncher, findInPageLauncher = findInPageLauncher,
browserAnimator = browserAnimator, browserAnimator = browserAnimator,

3
app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
Unescape Escape View File

@ -64,7 +64,6 @@ import org.mozilla.fenix.components.AppStore
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.appstate.AppAction
import org.mozilla.fenix.components.appstate.AppState 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.components
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.gleanplumb.Message import org.mozilla.fenix.gleanplumb.Message
@ -89,7 +88,6 @@ class DefaultSessionControlControllerTest {
private val activity: HomeActivity = mockk(relaxed = true) private val activity: HomeActivity = mockk(relaxed = true)
private val appStore: AppStore = mockk(relaxed = true) private val appStore: AppStore = mockk(relaxed = true)
private val navController: NavController = 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 messageController: MessageController = mockk(relaxed = true)
private val engine: Engine = mockk(relaxed = true) private val engine: Engine = mockk(relaxed = true)
private val tabCollectionStorage: TabCollectionStorage = mockk(relaxed = true) private val tabCollectionStorage: TabCollectionStorage = mockk(relaxed = true)
@ -154,7 +152,6 @@ class DefaultSessionControlControllerTest {
every { activity.components.settings } returns settings every { activity.components.settings } returns settings
every { activity.settings() } returns settings every { activity.settings() } returns settings
every { activity.components.analytics } returns analytics every { activity.components.analytics } returns analytics
every { analytics.metrics } returns metrics
} }
@After @After

3
app/src/test/java/org/mozilla/fenix/home/intent/DefaultBrowserIntentProcessorTest.kt
Unescape Escape View File

@ -19,7 +19,6 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(FenixRobolectricTestRunner::class) @RunWith(FenixRobolectricTestRunner::class)
@ -45,14 +44,12 @@ class DefaultBrowserIntentProcessorTest {
val navController: NavController = mockk(relaxed = true) val navController: NavController = mockk(relaxed = true)
val out: Intent = mockk() val out: Intent = mockk()
val activity: HomeActivity = mockk() val activity: HomeActivity = mockk()
val metrics: MetricController = mockk()
val intent = Intent().apply { val intent = Intent().apply {
putExtra("org.mozilla.fenix.default.browser.intent", true) putExtra("org.mozilla.fenix.default.browser.intent", true)
} }
every { activity.startActivity(any()) } returns Unit every { activity.startActivity(any()) } returns Unit
every { activity.applicationContext } returns testContext every { activity.applicationContext } returns testContext
every { metrics.track(any()) } returns Unit
assertFalse(Events.defaultBrowserNotifTapped.testHasValue()) assertFalse(Events.defaultBrowserNotifTapped.testHasValue())

10
app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt
Unescape Escape View File

@ -21,7 +21,6 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.helpers.perf.TestStrictModeManager import org.mozilla.fenix.helpers.perf.TestStrictModeManager
@ -33,7 +32,6 @@ class SpeechProcessingIntentProcessorTest {
private val activity: HomeActivity = mockk(relaxed = true) private val activity: HomeActivity = mockk(relaxed = true)
private val navController: NavController = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true)
private val out: Intent = mockk(relaxed = true) private val out: Intent = mockk(relaxed = true)
private val metrics: MetricController = mockk(relaxed = true)
private val searchEngine = createSearchEngine( private val searchEngine = createSearchEngine(
name = "Test", name = "Test",
@ -62,13 +60,12 @@ class SpeechProcessingIntentProcessorTest {
@Test @Test
fun `do not process blank intents`() { fun `do not process blank intents`() {
val processor = SpeechProcessingIntentProcessor(activity, store, metrics) val processor = SpeechProcessingIntentProcessor(activity, store)
processor.process(Intent(), navController, out) processor.process(Intent(), navController, out)
verify { activity wasNot Called } verify { activity wasNot Called }
verify { navController wasNot Called } verify { navController wasNot Called }
verify { out wasNot Called } verify { out wasNot Called }
verify { metrics wasNot Called }
} }
@Test @Test
@ -76,13 +73,12 @@ class SpeechProcessingIntentProcessorTest {
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, false) putExtra(HomeActivity.OPEN_TO_BROWSER_AND_LOAD, false)
} }
val processor = SpeechProcessingIntentProcessor(activity, store, metrics) val processor = SpeechProcessingIntentProcessor(activity, store)
processor.process(intent, navController, out) processor.process(intent, navController, out)
verify { activity wasNot Called } verify { activity wasNot Called }
verify { navController wasNot Called } verify { navController wasNot Called }
verify { out wasNot Called } verify { out wasNot Called }
verify { metrics wasNot Called }
} }
@Test @Test
@ -93,7 +89,7 @@ class SpeechProcessingIntentProcessorTest {
putExtra(SPEECH_PROCESSING, "hello world") putExtra(SPEECH_PROCESSING, "hello world")
} }
val processor = SpeechProcessingIntentProcessor(activity, store, metrics) val processor = SpeechProcessingIntentProcessor(activity, store)
processor.process(intent, mockk(), mockk(relaxed = true)) processor.process(intent, mockk(), mockk(relaxed = true))
verify { verify {

10
app/src/test/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessorTest.kt
Unescape Escape View File

@ -21,7 +21,6 @@ import org.mozilla.fenix.GleanMetrics.SearchWidget
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.NavGraphDirections
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.components.metrics.MetricsUtils
import org.mozilla.fenix.ext.nav import org.mozilla.fenix.ext.nav
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ -32,15 +31,11 @@ class StartSearchIntentProcessorTest {
@get:Rule @get:Rule
val gleanTestRule = GleanTestRule(testContext) val gleanTestRule = GleanTestRule(testContext)
private val metrics: MetricController = mockk(relaxed = true)
private val navController: NavController = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true)
private val out: Intent = mockk(relaxed = true) private val out: Intent = mockk(relaxed = true)
@Test @Test
fun `do not process blank intents`() { fun `do not process blank intents`() {
StartSearchIntentProcessor(metrics).process(Intent(), navController, out)
verify { metrics wasNot Called }
verify { navController wasNot Called } verify { navController wasNot Called }
verify { out wasNot Called } verify { out wasNot Called }
} }
@ -50,9 +45,8 @@ class StartSearchIntentProcessorTest {
val intent = Intent().apply { val intent = Intent().apply {
removeExtra(HomeActivity.OPEN_TO_SEARCH) 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 { navController wasNot Called }
verify { out wasNot Called } verify { out wasNot Called }
} }
@ -62,7 +56,7 @@ class StartSearchIntentProcessorTest {
val intent = Intent().apply { val intent = Intent().apply {
putExtra(HomeActivity.OPEN_TO_SEARCH, StartSearchIntentProcessor.SEARCH_WIDGET) putExtra(HomeActivity.OPEN_TO_SEARCH, StartSearchIntentProcessor.SEARCH_WIDGET)
} }
StartSearchIntentProcessor(metrics).process(intent, navController, out) StartSearchIntentProcessor().process(intent, navController, out)
val options = navOptions { val options = navOptions {
popUpTo = R.id.homeFragment popUpTo = R.id.homeFragment
} }

4
app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt
Unescape Escape View File

@ -29,8 +29,6 @@ import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.GleanMetrics.RecentBookmarks import org.mozilla.fenix.GleanMetrics.RecentBookmarks
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R 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.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.home.HomeFragmentDirections import org.mozilla.fenix.home.HomeFragmentDirections
import org.mozilla.fenix.home.recentbookmarks.controller.DefaultRecentBookmarksController import org.mozilla.fenix.home.recentbookmarks.controller.DefaultRecentBookmarksController
@ -46,14 +44,12 @@ class DefaultRecentBookmarksControllerTest {
private val activity: HomeActivity = mockk(relaxed = true) private val activity: HomeActivity = mockk(relaxed = true)
private val navController: NavController = mockk(relaxUnitFun = true) private val navController: NavController = mockk(relaxUnitFun = true)
private val metrics: MetricController = mockk(relaxed = true)
private lateinit var controller: DefaultRecentBookmarksController private lateinit var controller: DefaultRecentBookmarksController
@Before @Before
fun setup() { fun setup() {
every { activity.openToBrowserAndLoad(any(), any(), any()) } just Runs every { activity.openToBrowserAndLoad(any(), any(), any()) } just Runs
every { activity.components.core.metrics } returns metrics
every { navController.currentDestination } returns mockk { every { navController.currentDestination } returns mockk {
every { id } returns R.id.homeFragment every { id } returns R.id.homeFragment

4
app/src/test/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolderTest.kt
Unescape Escape View File

@ -24,7 +24,6 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.Pings import org.mozilla.fenix.GleanMetrics.Pings
import org.mozilla.fenix.GleanMetrics.TopSites import org.mozilla.fenix.GleanMetrics.TopSites
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.databinding.TopSiteItemBinding import org.mozilla.fenix.databinding.TopSiteItemBinding
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ -39,7 +38,6 @@ class TopSiteItemViewHolderTest {
private lateinit var binding: TopSiteItemBinding private lateinit var binding: TopSiteItemBinding
private lateinit var interactor: TopSiteInteractor private lateinit var interactor: TopSiteInteractor
private lateinit var lifecycleOwner: LifecycleOwner private lateinit var lifecycleOwner: LifecycleOwner
private lateinit var metrics: MetricController
private val pocket = TopSite.Default( private val pocket = TopSite.Default(
id = 1L, id = 1L,
@ -53,10 +51,8 @@ class TopSiteItemViewHolderTest {
binding = TopSiteItemBinding.inflate(LayoutInflater.from(testContext)) binding = TopSiteItemBinding.inflate(LayoutInflater.from(testContext))
interactor = mockk(relaxed = true) interactor = mockk(relaxed = true)
lifecycleOwner = 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.core.icons } returns BrowserIcons(testContext, mockk(relaxed = true))
every { testContext.components.analytics.metrics } returns metrics
} }
@Test @Test

7
app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentInteractorTest.kt
Unescape Escape View File

@ -19,7 +19,6 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.BookmarksManagement import org.mozilla.fenix.GleanMetrics.BookmarksManagement
import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.browser.browsingmode.BrowsingMode
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@SuppressWarnings("TooManyFunctions", "LargeClass") @SuppressWarnings("TooManyFunctions", "LargeClass")
@ -32,7 +31,6 @@ class BookmarkFragmentInteractorTest {
private lateinit var interactor: BookmarkFragmentInteractor private lateinit var interactor: BookmarkFragmentInteractor
private val bookmarkController: DefaultBookmarkController = mockk(relaxed = true) 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 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) private val separator = BookmarkNode(BookmarkNodeType.SEPARATOR, "789", "123", 1u, null, null, 0, null)
@ -44,10 +42,7 @@ class BookmarkFragmentInteractorTest {
@Before @Before
fun setup() { fun setup() {
interactor = interactor =
BookmarkFragmentInteractor( BookmarkFragmentInteractor(bookmarksController = bookmarkController)
bookmarksController = bookmarkController,
metrics = metrics
)
} }
@Test @Test

3
app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt
Unescape Escape View File

@ -20,7 +20,6 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.AppStore
import org.mozilla.fenix.components.history.DefaultPagedHistoryProvider import org.mozilla.fenix.components.history.DefaultPagedHistoryProvider
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.navigateSafe import org.mozilla.fenix.ext.navigateSafe
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ -38,7 +37,6 @@ class HistoryControllerTest {
private val appStore: AppStore = mockk(relaxed = true) private val appStore: AppStore = mockk(relaxed = true)
private val state: HistoryFragmentState = mockk(relaxed = true) private val state: HistoryFragmentState = mockk(relaxed = true)
private val navController: NavController = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true)
private val metrics: MetricController = mockk(relaxed = true)
private val historyProvider: DefaultPagedHistoryProvider = mockk(relaxed = true) private val historyProvider: DefaultPagedHistoryProvider = mockk(relaxed = true)
@Before @Before
@ -202,7 +200,6 @@ class HistoryControllerTest {
invalidateOptionsMenu, invalidateOptionsMenu,
{ items, _, _ -> deleteHistoryItems.invoke(items) }, { items, _, _ -> deleteHistoryItems.invoke(items) },
syncHistory, syncHistory,
metrics
) )
} }
} }

2
app/src/test/java/org/mozilla/fenix/library/history/HistorySearchControllerTest.kt
Unescape Escape View File

@ -21,7 +21,6 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BrowserDirection
import org.mozilla.fenix.GleanMetrics.History import org.mozilla.fenix.GleanMetrics.History
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(FenixRobolectricTestRunner::class) @RunWith(FenixRobolectricTestRunner::class)
@ -32,7 +31,6 @@ class HistorySearchControllerTest {
@MockK(relaxed = true) private lateinit var activity: HomeActivity @MockK(relaxed = true) private lateinit var activity: HomeActivity
@MockK(relaxed = true) private lateinit var store: HistorySearchFragmentStore @MockK(relaxed = true) private lateinit var store: HistorySearchFragmentStore
@MockK(relaxed = true) private lateinit var metrics: MetricController
@Before @Before
fun setUp() { fun setUp() {

4
app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt
Unescape Escape View File

@ -8,7 +8,6 @@ import androidx.navigation.NavController
import androidx.navigation.NavOptions import androidx.navigation.NavOptions
import io.mockk.mockk import io.mockk.mockk
import io.mockk.coEvery import io.mockk.coEvery
import io.mockk.clearMocks
import io.mockk.every import io.mockk.every
import io.mockk.verify import io.mockk.verify
import io.mockk.coVerify import io.mockk.coVerify
@ -37,7 +36,6 @@ import org.mozilla.fenix.GleanMetrics.RecentlyClosedTabs
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.browser.browsingmode.BrowsingMode 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.directionsEq
import org.mozilla.fenix.ext.optionsEq import org.mozilla.fenix.ext.optionsEq
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ -49,7 +47,6 @@ class DefaultRecentlyClosedControllerTest {
private val browserStore: BrowserStore = mockk(relaxed = true) private val browserStore: BrowserStore = mockk(relaxed = true)
private val recentlyClosedStore: RecentlyClosedFragmentStore = mockk(relaxed = true) private val recentlyClosedStore: RecentlyClosedFragmentStore = mockk(relaxed = true)
private val tabsUseCases: TabsUseCases = mockk(relaxed = true) private val tabsUseCases: TabsUseCases = mockk(relaxed = true)
private val metrics: MetricController = mockk(relaxed = true)
@get:Rule @get:Rule
val gleanTestRule = GleanTestRule(testContext) val gleanTestRule = GleanTestRule(testContext)
@ -111,7 +108,6 @@ class DefaultRecentlyClosedControllerTest {
assertEquals(BrowsingMode.Normal, actualBrowsingModes[1]) assertEquals(BrowsingMode.Normal, actualBrowsingModes[1])
assertTrue(RecentlyClosedTabs.menuOpenInNormalTab.testHasValue()) assertTrue(RecentlyClosedTabs.menuOpenInNormalTab.testHasValue())
assertNull(RecentlyClosedTabs.menuOpenInNormalTab.testGetValue().last().extra) assertNull(RecentlyClosedTabs.menuOpenInNormalTab.testGetValue().last().extra)
clearMocks(metrics)
tabUrls.clear() tabUrls.clear()
actualBrowsingModes.clear() actualBrowsingModes.clear()

5
app/src/test/java/org/mozilla/fenix/nimbus/NimbusBranchesControllerTest.kt
Unescape Escape View File

@ -24,8 +24,6 @@ import org.junit.runner.RunWith
import org.mozilla.experiments.nimbus.Branch import org.mozilla.experiments.nimbus.Branch
import org.mozilla.fenix.components.Components import org.mozilla.fenix.components.Components
import org.mozilla.fenix.components.FenixSnackbar 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.getRootView
import org.mozilla.fenix.ext.settings import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@ -44,7 +42,6 @@ class NimbusBranchesControllerTest {
private lateinit var settings: Settings private lateinit var settings: Settings
private lateinit var activity: Context private lateinit var activity: Context
private lateinit var components: Components private lateinit var components: Components
private lateinit var metrics: MetricController
private lateinit var snackbar: FenixSnackbar private lateinit var snackbar: FenixSnackbar
private lateinit var rootView: View private lateinit var rootView: View
@ -52,7 +49,6 @@ class NimbusBranchesControllerTest {
fun setup() { fun setup() {
components = mockk(relaxed = true) components = mockk(relaxed = true)
settings = mockk(relaxed = true) settings = mockk(relaxed = true)
metrics = mockk(relaxed = true)
snackbar = mockk(relaxed = true) snackbar = mockk(relaxed = true)
navController = mockk(relaxed = true) navController = mockk(relaxed = true)
@ -66,7 +62,6 @@ class NimbusBranchesControllerTest {
every { FenixSnackbar.make(any(), any(), any(), any()) } returns snackbar every { FenixSnackbar.make(any(), any(), any(), any()) } returns snackbar
every { activity.settings() } returns settings every { activity.settings() } returns settings
every { activity.components.analytics.metrics } returns metrics
every { navController.currentDestination } returns mockk { every { navController.currentDestination } returns mockk {
every { id } returns org.mozilla.fenix.R.id.nimbusBranchesFragment every { id } returns org.mozilla.fenix.R.id.nimbusBranchesFragment

5
app/src/test/java/org/mozilla/fenix/onboarding/FenixOnboardingTest.kt
Unescape Escape View File

@ -15,7 +15,6 @@ import org.junit.Assert.assertTrue
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.helpers.perf.TestStrictModeManager import org.mozilla.fenix.helpers.perf.TestStrictModeManager
@ -29,17 +28,13 @@ class FenixOnboardingTest {
private lateinit var onboarding: FenixOnboarding private lateinit var onboarding: FenixOnboarding
private lateinit var preferences: SharedPreferences private lateinit var preferences: SharedPreferences
private lateinit var preferencesEditor: SharedPreferences.Editor private lateinit var preferencesEditor: SharedPreferences.Editor
private lateinit var metrics: MetricController
@Before @Before
fun setup() { fun setup() {
preferences = mockk() preferences = mockk()
preferencesEditor = mockk(relaxed = true) preferencesEditor = mockk(relaxed = true)
metrics = mockk()
val context = mockk<Context>() val context = mockk<Context>()
every { preferences.edit() } returns preferencesEditor 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.components.strictMode } returns TestStrictModeManager() as StrictModeManager
every { context.getSharedPreferences(any(), MODE_PRIVATE) } returns preferences every { context.getSharedPreferences(any(), MODE_PRIVATE) } returns preferences

3
app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt
Unescape Escape View File

@ -43,7 +43,6 @@ import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.GleanMetrics.SearchShortcuts import org.mozilla.fenix.GleanMetrics.SearchShortcuts
import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.HomeActivity
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.components.metrics.MetricsUtils import org.mozilla.fenix.components.metrics.MetricsUtils
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.search.SearchDialogFragmentDirections.Companion.actionGlobalAddonsManagementFragment 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 store: SearchDialogFragmentStore
@MockK(relaxed = true) private lateinit var navController: NavController @MockK(relaxed = true) private lateinit var navController: NavController
@MockK private lateinit var searchEngine: SearchEngine @MockK private lateinit var searchEngine: SearchEngine
@MockK(relaxed = true) private lateinit var metrics: MetricController
@MockK(relaxed = true) private lateinit var settings: Settings @MockK(relaxed = true) private lateinit var settings: Settings
private lateinit var middleware: CaptureActionsMiddleware<BrowserState, BrowserAction> private lateinit var middleware: CaptureActionsMiddleware<BrowserState, BrowserAction>
@ -418,7 +416,6 @@ class SearchDialogControllerTest {
fragmentStore = store, fragmentStore = store,
navController = navController, navController = navController,
settings = settings, settings = settings,
metrics = metrics,
dismissDialog = dismissDialog, dismissDialog = dismissDialog,
clearToolbarFocus = clearToolbarFocus, clearToolbarFocus = clearToolbarFocus,
focusToolbar = focusToolbar, focusToolbar = focusToolbar,

4
app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt
Unescape Escape View File

@ -40,10 +40,8 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.TrackingProtection import org.mozilla.fenix.GleanMetrics.TrackingProtection
import org.mozilla.fenix.components.PermissionStorage import org.mozilla.fenix.components.PermissionStorage
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.ext.components import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.directionsEq import org.mozilla.fenix.ext.directionsEq
import org.mozilla.fenix.ext.metrics
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.settings.PhoneFeature import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled import org.mozilla.fenix.settings.quicksettings.ext.shouldBeEnabled
@ -310,12 +308,10 @@ class DefaultQuickSettingsControllerTest {
fun `handleTrackingProtectionToggled should call the right use cases`() { fun `handleTrackingProtectionToggled should call the right use cases`() {
val trackingProtectionUseCases: TrackingProtectionUseCases = mockk(relaxed = true) val trackingProtectionUseCases: TrackingProtectionUseCases = mockk(relaxed = true)
val sessionUseCases: SessionUseCases = 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.core.store } returns browserStore
every { context.components.useCases.trackingProtectionUseCases } returns trackingProtectionUseCases every { context.components.useCases.trackingProtectionUseCases } returns trackingProtectionUseCases
every { context.components.useCases.sessionUseCases } returns sessionUseCases every { context.components.useCases.sessionUseCases } returns sessionUseCases
every { context.metrics } returns metrics
every { store.dispatch(any()) } returns mockk() every { store.dispatch(any()) } returns mockk()
var isEnabled = true var isEnabled = true

9
app/src/test/java/org/mozilla/fenix/share/ShareControllerTest.kt
Unescape Escape View File

@ -34,15 +34,12 @@ import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals import org.junit.Assert.assertNotEquals
import org.junit.Assert.assertNull import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.SyncAccount import org.mozilla.fenix.GleanMetrics.SyncAccount
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.FenixSnackbar 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.ext.nav
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.share.listadapters.AppShareOption import org.mozilla.fenix.share.listadapters.AppShareOption
@ -51,7 +48,6 @@ import org.mozilla.fenix.share.listadapters.AppShareOption
class ShareControllerTest { class ShareControllerTest {
// Need a valid context to retrieve Strings for example, but we also need it to return our "metrics" // 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 context: Context = spyk(testContext)
private val metrics: MetricController = mockk(relaxed = true)
private val shareSubject = "shareSubject" private val shareSubject = "shareSubject"
private val shareData = listOf( private val shareData = listOf(
ShareData(url = "url0", title = "title0"), ShareData(url = "url0", title = "title0"),
@ -82,11 +78,6 @@ class ShareControllerTest {
recentAppStorage, testCoroutineScope, testDispatcher, dismiss recentAppStorage, testCoroutineScope, testDispatcher, dismiss
) )
@Before
fun setUp() {
every { context.metrics } returns metrics
}
@After @After
fun cleanUp() { fun cleanUp() {
testCoroutineScope.cleanupTestCoroutines() testCoroutineScope.cleanupTestCoroutines()

5
app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt
Unescape Escape View File

@ -36,7 +36,6 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.GleanMetrics.TabsTray
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.home.HomeFragment import org.mozilla.fenix.home.HomeFragment
import org.mozilla.fenix.ext.maxActiveTime import org.mozilla.fenix.ext.maxActiveTime
import org.mozilla.fenix.ext.potentialInactiveTabs import org.mozilla.fenix.ext.potentialInactiveTabs
@ -62,9 +61,6 @@ class DefaultTabsTrayControllerTest {
@MockK(relaxed = true) @MockK(relaxed = true)
private lateinit var navigationInteractor: NavigationInteractor private lateinit var navigationInteractor: NavigationInteractor
@MockK(relaxed = true)
private lateinit var metrics: MetricController
@MockK(relaxed = true) @MockK(relaxed = true)
private lateinit var tabsUseCases: TabsUseCases private lateinit var tabsUseCases: TabsUseCases
@ -551,7 +547,6 @@ class DefaultTabsTrayControllerTest {
navigateToHomeAndDeleteSession, navigateToHomeAndDeleteSession,
profiler, profiler,
navigationInteractor, navigationInteractor,
metrics,
tabsUseCases, tabsUseCases,
selectTabPosition, selectTabPosition,
dismissTray, dismissTray,

3
app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt
Unescape Escape View File

@ -42,7 +42,6 @@ import org.mozilla.fenix.collections.CollectionsDialog
import org.mozilla.fenix.collections.show import org.mozilla.fenix.collections.show
import org.mozilla.fenix.components.TabCollectionStorage import org.mozilla.fenix.components.TabCollectionStorage
import org.mozilla.fenix.components.bookmarks.BookmarksUseCase import org.mozilla.fenix.components.bookmarks.BookmarksUseCase
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import mozilla.components.browser.state.state.createTab as createStateTab import mozilla.components.browser.state.state.createTab as createStateTab
import mozilla.components.browser.storage.sync.Tab as SyncTab import mozilla.components.browser.storage.sync.Tab as SyncTab
@ -53,7 +52,6 @@ class NavigationInteractorTest {
private lateinit var tabsTrayStore: TabsTrayStore private lateinit var tabsTrayStore: TabsTrayStore
private val testTab: TabSessionState = createStateTab(url = "https://mozilla.org") private val testTab: TabSessionState = createStateTab(url = "https://mozilla.org")
private val navController: NavController = mockk(relaxed = true) private val navController: NavController = mockk(relaxed = true)
private val metrics: MetricController = mockk(relaxed = true)
private val bookmarksUseCase: BookmarksUseCase = mockk(relaxed = true) private val bookmarksUseCase: BookmarksUseCase = mockk(relaxed = true)
private val context: Context = mockk(relaxed = true) private val context: Context = mockk(relaxed = true)
private val collectionStorage: TabCollectionStorage = mockk(relaxed = true) private val collectionStorage: TabCollectionStorage = mockk(relaxed = true)
@ -264,7 +262,6 @@ class NavigationInteractorTest {
activity, activity,
browserStore, browserStore,
navController, navController,
metrics,
dismissTabTray, dismissTabTray,
dismissTabTrayAndNavigateHome, dismissTabTrayAndNavigateHome,
bookmarksUseCase, bookmarksUseCase,

5
app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt
Unescape Escape View File

@ -44,7 +44,6 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.GleanMetrics.TabsTray
import org.mozilla.fenix.NavGraphDirections import org.mozilla.fenix.NavGraphDirections
import org.mozilla.fenix.R import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.databinding.ComponentTabstray2Binding import org.mozilla.fenix.databinding.ComponentTabstray2Binding
import org.mozilla.fenix.databinding.ComponentTabstrayFabBinding import org.mozilla.fenix.databinding.ComponentTabstrayFabBinding
import org.mozilla.fenix.databinding.FragmentTabTrayDialogBinding import org.mozilla.fenix.databinding.FragmentTabTrayDialogBinding
@ -239,8 +238,6 @@ class TabsTrayFragmentTest {
try { try {
mockkStatic("org.mozilla.fenix.tabstray.ext.BrowserMenuKt") mockkStatic("org.mozilla.fenix.tabstray.ext.BrowserMenuKt")
val navigationInteractor: NavigationInteractor = mockk() 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 { context.components.core.store } returns mockk()
every { fragment.tabsTrayStore } returns mockk() every { fragment.tabsTrayStore } returns mockk()
val menu: BrowserMenu = mockk { val menu: BrowserMenu = mockk {
@ -351,8 +348,6 @@ class TabsTrayFragmentTest {
@Test @Test
fun `WHEN dismissTabsTray is called THEN it dismisses the tray`() { fun `WHEN dismissTabsTray is called THEN it dismisses the tray`() {
every { fragment.dismissAllowingStateLoss() } just Runs every { fragment.dismissAllowingStateLoss() } just Runs
val metrics: MetricController = mockk(relaxed = true)
every { context.components.analytics.metrics } returns metrics
fragment.dismissTabsTray() fragment.dismissTabsTray()

7
app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayMiddlewareTest.kt
Unescape Escape View File

@ -21,7 +21,6 @@ import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.Metrics import org.mozilla.fenix.GleanMetrics.Metrics
import org.mozilla.fenix.GleanMetrics.SearchTerms import org.mozilla.fenix.GleanMetrics.SearchTerms
import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.GleanMetrics.TabsTray
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule @RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule
@ -29,17 +28,13 @@ class TabsTrayMiddlewareTest {
private lateinit var store: TabsTrayStore private lateinit var store: TabsTrayStore
private lateinit var tabsTrayMiddleware: TabsTrayMiddleware private lateinit var tabsTrayMiddleware: TabsTrayMiddleware
private lateinit var metrics: MetricController
@get:Rule @get:Rule
val gleanTestRule = GleanTestRule(testContext) val gleanTestRule = GleanTestRule(testContext)
@Before @Before
fun setUp() { fun setUp() {
metrics = mockk(relaxed = true) tabsTrayMiddleware = TabsTrayMiddleware()
tabsTrayMiddleware = TabsTrayMiddleware(
metrics
)
store = TabsTrayStore( store = TabsTrayStore(
middlewares = listOf(tabsTrayMiddleware), middlewares = listOf(tabsTrayMiddleware),
initialState = TabsTrayState() initialState = TabsTrayState()

4
app/src/test/java/org/mozilla/fenix/tabstray/browser/RemoveTabUseCaseWrapperTest.kt
Unescape Escape View File

@ -4,7 +4,6 @@
package org.mozilla.fenix.tabstray.browser package org.mozilla.fenix.tabstray.browser
import io.mockk.mockk
import mozilla.components.service.glean.testing.GleanTestRule import mozilla.components.service.glean.testing.GleanTestRule
import mozilla.components.support.test.robolectric.testContext import mozilla.components.support.test.robolectric.testContext
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
@ -14,14 +13,11 @@ import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.GleanMetrics.TabsTray
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule @RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule
class RemoveTabUseCaseWrapperTest { class RemoveTabUseCaseWrapperTest {
val metricController = mockk<MetricController>(relaxed = true)
@get:Rule @get:Rule
val gleanTestRule = GleanTestRule(testContext) val gleanTestRule = GleanTestRule(testContext)

2
app/src/test/java/org/mozilla/fenix/tabstray/browser/SelectTabUseCaseWrapperTest.kt
Unescape Escape View File

@ -16,13 +16,11 @@ import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.TabsTray import org.mozilla.fenix.GleanMetrics.TabsTray
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
@RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule @RunWith(FenixRobolectricTestRunner::class) // for gleanTestRule
class SelectTabUseCaseWrapperTest { class SelectTabUseCaseWrapperTest {
val metricController = mockk<MetricController>(relaxed = true)
val selectUseCase: TabsUseCases.SelectTabUseCase = mockk(relaxed = true) val selectUseCase: TabsUseCases.SelectTabUseCase = mockk(relaxed = true)
@get:Rule @get:Rule

8
app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt
Unescape Escape View File

@ -30,7 +30,6 @@ import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.GleanMetrics.Metrics import org.mozilla.fenix.GleanMetrics.Metrics
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
import org.mozilla.fenix.utils.Settings import org.mozilla.fenix.utils.Settings
import org.mozilla.fenix.GleanMetrics.EngineTab as EngineMetrics import org.mozilla.fenix.GleanMetrics.EngineTab as EngineMetrics
@ -41,7 +40,6 @@ class TelemetryMiddlewareTest {
private lateinit var store: BrowserStore private lateinit var store: BrowserStore
private lateinit var settings: Settings private lateinit var settings: Settings
private lateinit var telemetryMiddleware: TelemetryMiddleware private lateinit var telemetryMiddleware: TelemetryMiddleware
private lateinit var metrics: MetricController
@get:Rule @get:Rule
val coroutinesTestRule = MainCoroutineRule() val coroutinesTestRule = MainCoroutineRule()
@ -56,11 +54,7 @@ class TelemetryMiddlewareTest {
Clock.delegate = clock Clock.delegate = clock
settings = Settings(testContext) settings = Settings(testContext)
metrics = mockk(relaxed = true) telemetryMiddleware = TelemetryMiddleware(settings,)
telemetryMiddleware = TelemetryMiddleware(
settings,
metrics
)
store = BrowserStore( store = BrowserStore(
middleware = listOf(telemetryMiddleware) + EngineMiddleware.create(engine = mockk()), middleware = listOf(telemetryMiddleware) + EngineMiddleware.create(engine = mockk()),
initialState = BrowserState() initialState = BrowserState()

4
app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt
Unescape Escape View File

@ -12,7 +12,6 @@ import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
import org.junit.Test import org.junit.Test
import org.mozilla.fenix.components.metrics.MetricController
import org.mozilla.fenix.utils.Settings import org.mozilla.fenix.utils.Settings
import java.util.Calendar import java.util.Calendar
import java.util.Date import java.util.Date
@ -24,7 +23,6 @@ class WallpaperManagerTest {
private val fakeCalendar = Calendar.getInstance() private val fakeCalendar = Calendar.getInstance()
private val mockSettings: Settings = mockk() private val mockSettings: Settings = mockk()
private val mockMetrics: MetricController = mockk()
private val mockDownloader: WallpaperDownloader = mockk { private val mockDownloader: WallpaperDownloader = mockk {
coEvery { downloadWallpaper(any()) } just runs coEvery { downloadWallpaper(any()) } just runs
} }
@ -34,8 +32,6 @@ class WallpaperManagerTest {
@Test @Test
fun `WHEN wallpaper set THEN current wallpaper updated in settings`() { fun `WHEN wallpaper set THEN current wallpaper updated in settings`() {
every { mockMetrics.track(any()) } just runs
val currentCaptureSlot = slot<String>() val currentCaptureSlot = slot<String>()
every { mockSettings.currentWallpaper } returns "" every { mockSettings.currentWallpaper } returns ""
every { mockSettings.currentWallpaper = capture(currentCaptureSlot) } just runs every { mockSettings.currentWallpaper = capture(currentCaptureSlot) } just runs

6
detekt-baseline.xml
Unescape Escape View File

@ -6,15 +6,15 @@
<ID>FunctionOnlyReturningConstant:MetricsUtils.kt$MetricsUtils$ @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) internal fun getHashingSalt(): String</ID> <ID>FunctionOnlyReturningConstant:MetricsUtils.kt$MetricsUtils$ @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) internal fun getHashingSalt(): String</ID>
<ID>FunctionOnlyReturningConstant:SupportUtils.kt$SupportUtils$fun getFirefoxAccountSumoUrl(): String</ID> <ID>FunctionOnlyReturningConstant:SupportUtils.kt$SupportUtils$fun getFirefoxAccountSumoUrl(): String</ID>
<ID>FunctionParameterNaming:FenixSnackbar.kt$FenixSnackbar.Companion$_view: View?</ID> <ID>FunctionParameterNaming:FenixSnackbar.kt$FenixSnackbar.Companion$_view: View?</ID>
<ID>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: () -&gt; Unit, private val onCloseTab: (SessionState) -&gt; Unit )</ID> <ID>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: () -&gt; Unit, private val onCloseTab: (SessionState) -&gt; Unit )</ID>
<ID>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&lt;SessionFeature&gt;, private val findInPageLauncher: () -&gt; Unit, private val browserAnimator: BrowserAnimator, private val swipeRefresh: SwipeRefreshLayout, private val customTabSessionId: String?, private val openInFenixIntent: Intent, private val bookmarkTapped: (String, String) -&gt; Unit, private val scope: CoroutineScope, private val tabCollectionStorage: TabCollectionStorage, private val topSitesStorage: DefaultTopSitesStorage, private val pinnedSiteStorage: PinnedSiteStorage, private val browserStore: BrowserStore )</ID> <ID>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&lt;SessionFeature&gt;, private val findInPageLauncher: () -&gt; Unit, private val browserAnimator: BrowserAnimator, private val swipeRefresh: SwipeRefreshLayout, private val customTabSessionId: String?, private val openInFenixIntent: Intent, private val bookmarkTapped: (String, String) -&gt; Unit, private val scope: CoroutineScope, private val tabCollectionStorage: TabCollectionStorage, private val topSitesStorage: DefaultTopSitesStorage, private val pinnedSiteStorage: PinnedSiteStorage, private val browserStore: BrowserStore )</ID>
<ID>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? )</ID> <ID>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? )</ID>
<ID>LongParameterList:CustomTabsIntegration.kt$CustomTabsIntegration$( store: BrowserStore, useCases: CustomTabsUseCases, toolbar: BrowserToolbar, sessionId: String, activity: Activity, onItemTapped: (ToolbarMenu.Item) -&gt; Unit = {}, shouldReverseItems: Boolean, isPrivate: Boolean )</ID> <ID>LongParameterList:CustomTabsIntegration.kt$CustomTabsIntegration$( store: BrowserStore, useCases: CustomTabsUseCases, toolbar: BrowserToolbar, sessionId: String, activity: Activity, onItemTapped: (ToolbarMenu.Item) -&gt; Unit = {}, shouldReverseItems: Boolean, isPrivate: Boolean )</ID>
<ID>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 )</ID> <ID>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 )</ID>
<ID>LongParameterList:HistoryController.kt$DefaultHistoryController$( private val store: HistoryFragmentStore, private val navController: NavController, private val scope: CoroutineScope, private val openToBrowser: (item: History.Regular) -&gt; Unit, private val displayDeleteAll: () -&gt; Unit, private val invalidateOptionsMenu: () -&gt; Unit, private val deleteHistoryItems: (Set&lt;History&gt;) -&gt; Unit, private val syncHistory: suspend () -&gt; Unit, private val metrics: MetricController )</ID> <ID>LongParameterList:HistoryController.kt$DefaultHistoryController$( private val store: HistoryFragmentStore, private val navController: NavController, private val scope: CoroutineScope, private val openToBrowser: (item: History.Regular) -&gt; Unit, private val displayDeleteAll: () -&gt; Unit, private val invalidateOptionsMenu: () -&gt; Unit, private val deleteHistoryItems: (Set&lt;History&gt;) -&gt; Unit, private val syncHistory: suspend () -&gt; Unit, private val metrics: MetricController )</ID>
<ID>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: () -&gt; Unit, private val engine: Engine = context.components.core.engine, )</ID> <ID>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: () -&gt; Unit, private val engine: Engine = context.components.core.engine, )</ID>
<ID>LongParameterList:ShareController.kt$DefaultShareController$( private val context: Context, private val shareSubject: String?, private val shareData: List&lt;ShareData&gt;, 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) -&gt; Unit )</ID> <ID>LongParameterList:ShareController.kt$DefaultShareController$( private val context: Context, private val shareSubject: String?, private val shareData: List&lt;ShareData&gt;, 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) -&gt; Unit )</ID>
<ID>LongParameterList:TabsTrayController.kt$DefaultTabsTrayController$( private val trayStore: TabsTrayStore, private val browserStore: BrowserStore, private val browsingModeManager: BrowsingModeManager, private val navController: NavController, private val navigateToHomeAndDeleteSession: (String) -&gt; Unit, private val profiler: Profiler?, private val navigationInteractor: NavigationInteractor, private val metrics: MetricController, private val tabsUseCases: TabsUseCases, private val selectTabPosition: (Int, Boolean) -&gt; Unit, private val dismissTray: () -&gt; Unit, private val showUndoSnackbarForTab: (Boolean) -&gt; Unit, @VisibleForTesting internal val showCancelledDownloadWarning: (downloadCount: Int, tabId: String?, source: String?) -&gt; Unit, )</ID> <ID>LongParameterList:TabsTrayController.kt$DefaultTabsTrayController$( private val trayStore: TabsTrayStore, private val browserStore: BrowserStore, private val browsingModeManager: BrowsingModeManager, private val navController: NavController, private val navigateToHomeAndDeleteSession: (String) -&gt; Unit, private val profiler: Profiler?, private val navigationInteractor: NavigationInteractor, private val tabsUseCases: TabsUseCases, private val selectTabPosition: (Int, Boolean) -&gt; Unit, private val dismissTray: () -&gt; Unit, private val showUndoSnackbarForTab: (Boolean) -&gt; Unit, @VisibleForTesting internal val showCancelledDownloadWarning: (downloadCount: Int, tabId: String?, source: String?) -&gt; Unit, )</ID>
<ID>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 )</ID> <ID>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 )</ID>
<ID>UndocumentedPublicClass:AboutItem.kt$AboutItem</ID> <ID>UndocumentedPublicClass:AboutItem.kt$AboutItem</ID>
<ID>UndocumentedPublicClass:AboutItem.kt$AboutItem$Crashes : AboutItem</ID> <ID>UndocumentedPublicClass:AboutItem.kt$AboutItem$Crashes : AboutItem</ID>

Write Preview
Loading…
Cancel
Save