Closes #20627: replace mocked lambda in HistoryItemMenuTest.

This will prevent intermittent failures with Java 11.
upstream-sync
Michael Comella 3 years ago committed by mergify[bot]
parent 700033ee76
commit c6a4d0afed

@ -6,8 +6,6 @@ package org.mozilla.fenix.library.history
import android.content.Context import android.content.Context
import androidx.appcompat.view.ContextThemeWrapper import androidx.appcompat.view.ContextThemeWrapper
import io.mockk.mockk
import io.mockk.verify
import mozilla.components.concept.menu.candidate.TextStyle import mozilla.components.concept.menu.candidate.TextStyle
import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.android.content.getColorFromAttr
import mozilla.components.support.test.robolectric.testContext import mozilla.components.support.test.robolectric.testContext
@ -23,14 +21,16 @@ import org.mozilla.fenix.library.history.HistoryItemMenu.Item
class HistoryItemMenuTest { class HistoryItemMenuTest {
private lateinit var context: Context private lateinit var context: Context
private lateinit var onItemTapped: (Item) -> Unit
private lateinit var menu: HistoryItemMenu private lateinit var menu: HistoryItemMenu
private var onItemTappedCaptured: Item? = null
@Before @Before
fun setup() { fun setup() {
context = ContextThemeWrapper(testContext, R.style.NormalTheme) context = ContextThemeWrapper(testContext, R.style.NormalTheme)
onItemTapped = mockk(relaxed = true) onItemTappedCaptured = null
menu = HistoryItemMenu(context, onItemTapped) menu = HistoryItemMenu(context) {
onItemTappedCaptured = it
}
} }
@Test @Test
@ -43,7 +43,7 @@ class HistoryItemMenuTest {
) )
deleteItem.onClick() deleteItem.onClick()
verify { onItemTapped(Item.Delete) } assertEquals(Item.Delete, onItemTappedCaptured)
} }
@Test @Test
@ -59,18 +59,18 @@ class HistoryItemMenuTest {
assertEquals("Delete", delete.text) assertEquals("Delete", delete.text)
copy.onClick() copy.onClick()
verify { onItemTapped(Item.Copy) } assertEquals(Item.Copy, onItemTappedCaptured)
share.onClick() share.onClick()
verify { onItemTapped(Item.Share) } assertEquals(Item.Share, onItemTappedCaptured)
openInNewTab.onClick() openInNewTab.onClick()
verify { onItemTapped(Item.OpenInNewTab) } assertEquals(Item.OpenInNewTab, onItemTappedCaptured)
openInPrivateTab.onClick() openInPrivateTab.onClick()
verify { onItemTapped(Item.OpenInPrivateTab) } assertEquals(Item.OpenInPrivateTab, onItemTappedCaptured)
delete.onClick() delete.onClick()
verify { onItemTapped(Item.Delete) } assertEquals(Item.Delete, onItemTappedCaptured)
} }
} }

Loading…
Cancel
Save