|
|
|
|
@ -4,55 +4,63 @@
|
|
|
|
|
|
|
|
|
|
package org.mozilla.fenix.tabstray.browser
|
|
|
|
|
|
|
|
|
|
import io.mockk.every
|
|
|
|
|
import io.mockk.mockk
|
|
|
|
|
import io.mockk.mockkStatic
|
|
|
|
|
import io.mockk.spyk
|
|
|
|
|
import io.mockk.unmockkStatic
|
|
|
|
|
import io.mockk.verify
|
|
|
|
|
import mozilla.components.browser.state.state.ContentState
|
|
|
|
|
import mozilla.components.browser.state.state.TabSessionState
|
|
|
|
|
import mozilla.components.browser.state.store.BrowserStore
|
|
|
|
|
import mozilla.components.feature.tabs.TabsUseCases
|
|
|
|
|
import mozilla.components.service.glean.testing.GleanTestRule
|
|
|
|
|
import mozilla.components.support.test.robolectric.testContext
|
|
|
|
|
import org.junit.Assert.assertNotNull
|
|
|
|
|
import org.junit.Assert.assertNull
|
|
|
|
|
import org.junit.Assert.assertTrue
|
|
|
|
|
import org.junit.Rule
|
|
|
|
|
import org.junit.Test
|
|
|
|
|
import org.junit.runner.RunWith
|
|
|
|
|
import org.mozilla.fenix.components.AppStore
|
|
|
|
|
import org.mozilla.fenix.ext.maxActiveTime
|
|
|
|
|
import org.mozilla.fenix.ext.potentialInactiveTabs
|
|
|
|
|
import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
|
|
|
|
|
import org.mozilla.fenix.tabstray.TrayPagerAdapter
|
|
|
|
|
import org.mozilla.fenix.utils.Settings
|
|
|
|
|
import org.mozilla.fenix.GleanMetrics.TabsTray as TabsTrayMetrics
|
|
|
|
|
|
|
|
|
|
@RunWith(FenixRobolectricTestRunner::class)
|
|
|
|
|
class InactiveTabsControllerTest {
|
|
|
|
|
class DefaultInactiveTabsControllerTest {
|
|
|
|
|
|
|
|
|
|
private val appStore: AppStore = mockk(relaxed = true)
|
|
|
|
|
private val settings: Settings = mockk(relaxed = true)
|
|
|
|
|
private val browserInteractor: BrowserTrayInteractor = mockk(relaxed = true)
|
|
|
|
|
private val appStore = AppStore()
|
|
|
|
|
private val browserStore: BrowserStore = mockk(relaxed = true)
|
|
|
|
|
private val tabsUseCases: TabsUseCases = mockk(relaxed = true)
|
|
|
|
|
|
|
|
|
|
@get:Rule
|
|
|
|
|
val gleanTestRule = GleanTestRule(testContext)
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun `WHEN the inactive tabs section is expanded THEN the expanded telemetry event should be report`() {
|
|
|
|
|
val controller = InactiveTabsController(appStore, settings, browserInteractor)
|
|
|
|
|
fun `WHEN the inactive tabs section is expanded THEN the expanded telemetry event should be reported`() {
|
|
|
|
|
val controller = createController()
|
|
|
|
|
|
|
|
|
|
assertNull(TabsTrayMetrics.inactiveTabsExpanded.testGetValue())
|
|
|
|
|
assertNull(TabsTrayMetrics.inactiveTabsCollapsed.testGetValue())
|
|
|
|
|
|
|
|
|
|
controller.updateCardExpansion(true)
|
|
|
|
|
controller.updateCardExpansion(isExpanded = true)
|
|
|
|
|
|
|
|
|
|
assertNotNull(TabsTrayMetrics.inactiveTabsExpanded.testGetValue())
|
|
|
|
|
assertNull(TabsTrayMetrics.inactiveTabsCollapsed.testGetValue())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun `WHEN the inactive tabs section is collapsed THEN the collapsed telemetry event should be report`() {
|
|
|
|
|
val controller = InactiveTabsController(appStore, settings, browserInteractor)
|
|
|
|
|
fun `WHEN the inactive tabs section is collapsed THEN the collapsed telemetry event should be reported`() {
|
|
|
|
|
val controller = createController()
|
|
|
|
|
|
|
|
|
|
assertNull(TabsTrayMetrics.inactiveTabsExpanded.testGetValue())
|
|
|
|
|
assertNull(TabsTrayMetrics.inactiveTabsCollapsed.testGetValue())
|
|
|
|
|
|
|
|
|
|
controller.updateCardExpansion(false)
|
|
|
|
|
controller.updateCardExpansion(isExpanded = false)
|
|
|
|
|
|
|
|
|
|
assertNull(TabsTrayMetrics.inactiveTabsExpanded.testGetValue())
|
|
|
|
|
assertNotNull(TabsTrayMetrics.inactiveTabsCollapsed.testGetValue())
|
|
|
|
|
@ -60,11 +68,11 @@ class InactiveTabsControllerTest {
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun `WHEN the inactive tabs auto-close feature prompt is dismissed THEN update settings and report the telemetry event`() {
|
|
|
|
|
val controller = spyk(InactiveTabsController(appStore, settings, browserInteractor))
|
|
|
|
|
val controller = spyk(createController())
|
|
|
|
|
|
|
|
|
|
assertNull(TabsTrayMetrics.autoCloseDimissed.testGetValue())
|
|
|
|
|
|
|
|
|
|
controller.close()
|
|
|
|
|
controller.dismissAutoCloseDialog()
|
|
|
|
|
|
|
|
|
|
assertNotNull(TabsTrayMetrics.autoCloseDimissed.testGetValue())
|
|
|
|
|
verify { settings.hasInactiveTabsAutoCloseDialogBeenDismissed = true }
|
|
|
|
|
@ -72,11 +80,11 @@ class InactiveTabsControllerTest {
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun `WHEN the inactive tabs auto-close feature prompt is accepted THEN update settings and report the telemetry event`() {
|
|
|
|
|
val controller = spyk(InactiveTabsController(appStore, settings, browserInteractor))
|
|
|
|
|
val controller = spyk(createController())
|
|
|
|
|
|
|
|
|
|
assertNull(TabsTrayMetrics.autoCloseTurnOnClicked.testGetValue())
|
|
|
|
|
|
|
|
|
|
controller.enableAutoClosed()
|
|
|
|
|
controller.enableInactiveTabsAutoClose()
|
|
|
|
|
|
|
|
|
|
assertNotNull(TabsTrayMetrics.autoCloseTurnOnClicked.testGetValue())
|
|
|
|
|
|
|
|
|
|
@ -88,8 +96,8 @@ class InactiveTabsControllerTest {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun `WHEN an inactive tab is selected THEN the open the tab and report the telemetry event`() {
|
|
|
|
|
val controller = InactiveTabsController(appStore, settings, browserInteractor)
|
|
|
|
|
fun `WHEN an inactive tab is selected THEN report the telemetry event`() {
|
|
|
|
|
val controller = createController()
|
|
|
|
|
val tab = TabSessionState(
|
|
|
|
|
id = "tabId",
|
|
|
|
|
content = ContentState(
|
|
|
|
|
@ -101,14 +109,12 @@ class InactiveTabsControllerTest {
|
|
|
|
|
|
|
|
|
|
controller.openInactiveTab(tab)
|
|
|
|
|
|
|
|
|
|
verify { browserInteractor.onTabSelected(tab, TrayPagerAdapter.INACTIVE_TABS_FEATURE_NAME) }
|
|
|
|
|
|
|
|
|
|
assertNotNull(TabsTrayMetrics.openInactiveTab.testGetValue())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
fun `WHEN an inactive tab is closed THEN the close the tab and report the telemetry event`() {
|
|
|
|
|
val controller = InactiveTabsController(appStore, settings, browserInteractor)
|
|
|
|
|
fun `WHEN an inactive tab is closed THEN report the telemetry event`() {
|
|
|
|
|
val controller = createController()
|
|
|
|
|
val tab = TabSessionState(
|
|
|
|
|
id = "tabId",
|
|
|
|
|
content = ContentState(
|
|
|
|
|
@ -116,12 +122,55 @@ class InactiveTabsControllerTest {
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
assertNull(TabsTrayMetrics.openInactiveTab.testGetValue())
|
|
|
|
|
assertNull(TabsTrayMetrics.closeInactiveTab.testGetValue())
|
|
|
|
|
|
|
|
|
|
controller.openInactiveTab(tab)
|
|
|
|
|
controller.closeInactiveTab(tab)
|
|
|
|
|
|
|
|
|
|
verify { browserInteractor.onTabSelected(tab, TrayPagerAdapter.INACTIVE_TABS_FEATURE_NAME) }
|
|
|
|
|
assertNotNull(TabsTrayMetrics.closeInactiveTab.testGetValue())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assertNotNull(TabsTrayMetrics.openInactiveTab.testGetValue())
|
|
|
|
|
@Test
|
|
|
|
|
fun `WHEN all inactive tabs are closed THEN perform the deletion and report the telemetry event and show a Snackbar`() {
|
|
|
|
|
var showSnackbarInvoked = false
|
|
|
|
|
val controller = createController(
|
|
|
|
|
showUndoSnackbar = {
|
|
|
|
|
showSnackbarInvoked = true
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
val inactiveTab: TabSessionState = mockk {
|
|
|
|
|
every { lastAccess } returns maxActiveTime
|
|
|
|
|
every { createdAt } returns 0
|
|
|
|
|
every { id } returns "24"
|
|
|
|
|
every { content } returns mockk {
|
|
|
|
|
every { private } returns false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
mockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
|
|
|
|
|
every { browserStore.state } returns mockk()
|
|
|
|
|
every { browserStore.state.potentialInactiveTabs } returns listOf(inactiveTab)
|
|
|
|
|
assertNull(TabsTrayMetrics.closeAllInactiveTabs.testGetValue())
|
|
|
|
|
|
|
|
|
|
controller.deleteAllInactiveTabs()
|
|
|
|
|
|
|
|
|
|
verify { tabsUseCases.removeTabs(listOf("24")) }
|
|
|
|
|
assertNotNull(TabsTrayMetrics.closeAllInactiveTabs.testGetValue())
|
|
|
|
|
assertTrue(showSnackbarInvoked)
|
|
|
|
|
} finally {
|
|
|
|
|
unmockkStatic("mozilla.components.browser.state.selector.SelectorsKt")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun createController(
|
|
|
|
|
showUndoSnackbar: (Boolean) -> Unit = { _ -> },
|
|
|
|
|
): DefaultInactiveTabsController {
|
|
|
|
|
return DefaultInactiveTabsController(
|
|
|
|
|
appStore = appStore,
|
|
|
|
|
settings = settings,
|
|
|
|
|
browserStore = browserStore,
|
|
|
|
|
tabsUseCases = tabsUseCases,
|
|
|
|
|
showUndoSnackbar = showUndoSnackbar,
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
Noah Bond
2 years ago
committed by
mergify[bot]