Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-15 18:12:54 +00:00
Code Issues Releases Wiki Activity

Issue #20531: Fix intermittent test failures in DefaultQuickSettingsControllerTest

Browse Source
This commit is contained in:
Christian Sadilek 2021-07-28 20:42:41 -04:00 committed by mergify[bot]
parent e81c20bc26
commit 30c890c457
1 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt
View File

@ -29,8 +29,10 @@ import mozilla.components.feature.tabs.TabsUseCases
import mozilla.components.support.test.mock import mozilla.components.support.test.mock
import mozilla.components.support.test.robolectric.testContext import mozilla.components.support.test.robolectric.testContext
import org.junit.After import org.junit.After
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertSame import org.junit.Assert.assertSame
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
@ -72,15 +74,6 @@ class DefaultQuickSettingsControllerTest {
@MockK(relaxed = true) @MockK(relaxed = true)
private lateinit var addNewTab: TabsUseCases.AddNewTabUseCase private lateinit var addNewTab: TabsUseCases.AddNewTabUseCase
@MockK(relaxed = true)
private lateinit var requestPermissions: (Array<String>) -> Unit
@MockK(relaxed = true)
private lateinit var displayPermissions: () -> Unit
@MockK(relaxed = true)
private lateinit var dismiss: () -> Unit
private lateinit var controller: DefaultQuickSettingsController private lateinit var controller: DefaultQuickSettingsController
@Before @Before
@ -90,25 +83,7 @@ class DefaultQuickSettingsControllerTest {
tab = createTab("https://mozilla.org") tab = createTab("https://mozilla.org")
browserStore = BrowserStore(BrowserState(tabs = listOf(tab))) browserStore = BrowserStore(BrowserState(tabs = listOf(tab)))
sitePermissions = SitePermissions(origin = "", savedAt = 123) sitePermissions = SitePermissions(origin = "", savedAt = 123)
controller = spyk(createController())
controller = spyk(
DefaultQuickSettingsController(
context = context,
quickSettingsStore = store,
browserStore = browserStore,
sessionId = tab.id,
ioScope = coroutinesScope,
navController = navController,
sitePermissions = sitePermissions,
settings = appSettings,
permissionStorage = permissionStorage,
reload = reload,
addNewTab = addNewTab,
requestRuntimePermissions = requestPermissions,
displayPermissions = displayPermissions,
dismiss = dismiss
)
)
} }
@After @After
@ -118,11 +93,12 @@ class DefaultQuickSettingsControllerTest {
@Test @Test
fun `handlePermissionsShown should delegate to an injected parameter`() { fun `handlePermissionsShown should delegate to an injected parameter`() {
controller.handlePermissionsShown() var displayPermissionsInvoked = false
createController(displayPermissions = {
displayPermissionsInvoked = true
}).handlePermissionsShown()
verify { assertTrue(displayPermissionsInvoked)
displayPermissions()
}
} }
@Test @Test
@ -176,9 +152,8 @@ class DefaultQuickSettingsControllerTest {
permissionStorage = permissionStorage, permissionStorage = permissionStorage,
reload = reload, reload = reload,
addNewTab = addNewTab, addNewTab = addNewTab,
requestRuntimePermissions = requestPermissions, displayPermissions = {},
displayPermissions = displayPermissions, dismiss = {}
dismiss = dismiss
) )
every { websitePermission.phoneFeature } returns PhoneFeature.CAMERA every { websitePermission.phoneFeature } returns PhoneFeature.CAMERA
@ -250,9 +225,14 @@ class DefaultQuickSettingsControllerTest {
fun `handleAndroidPermissionRequest should request from the injected callback`() { fun `handleAndroidPermissionRequest should request from the injected callback`() {
val testPermissions = arrayOf("TestPermission") val testPermissions = arrayOf("TestPermission")
controller.handleAndroidPermissionRequest(testPermissions) var requestRuntimePermissionsInvoked = false
createController(requestPermissions = {
assertArrayEquals(testPermissions, it)
requestRuntimePermissionsInvoked = true
}
).handleAndroidPermissionRequest(testPermissions)
verify { requestPermissions(testPermissions) } assertTrue(requestRuntimePermissionsInvoked)
} }
@Test @Test
@ -280,4 +260,27 @@ class DefaultQuickSettingsControllerTest {
reload(tab.id) reload(tab.id)
} }
} }
private fun createController(
requestPermissions: (Array<String>) -> Unit = { _ -> },
displayPermissions: () -> Unit = { },
dismiss: () -> Unit = { }
): DefaultQuickSettingsController {
return DefaultQuickSettingsController(
context = context,
quickSettingsStore = store,
browserStore = browserStore,
sessionId = tab.id,
ioScope = coroutinesScope,
navController = navController,
sitePermissions = sitePermissions,
settings = appSettings,
permissionStorage = permissionStorage,
reload = reload,
addNewTab = addNewTab,
requestRuntimePermissions = requestPermissions,
displayPermissions = displayPermissions,
dismiss = dismiss
)
}
} }