From 24b4a03d32f81f7649b0e0a2588c3f762d4f8ac3 Mon Sep 17 00:00:00 2001 From: Christian Sadilek Date: Tue, 3 Aug 2021 18:31:22 -0400 Subject: [PATCH] [fenix] Fix intermittent test failures in ToolbarViewTest --- .../fenix/search/toolbar/ToolbarViewTest.kt | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt index 3058d3f81..ab8c1e4bd 100644 --- a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt @@ -8,12 +8,9 @@ import android.content.Context import androidx.appcompat.view.ContextThemeWrapper import androidx.core.graphics.drawable.toBitmap import io.mockk.MockKAnnotations -import io.mockk.Runs import io.mockk.every import io.mockk.impl.annotations.MockK -import io.mockk.just import io.mockk.mockk -import io.mockk.slot import io.mockk.spyk import io.mockk.verify import mozilla.components.browser.toolbar.BrowserToolbar @@ -23,6 +20,7 @@ import mozilla.components.concept.toolbar.Toolbar import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull import org.junit.Assert.assertTrue import org.junit.Before import org.junit.Test @@ -72,20 +70,26 @@ class ToolbarViewTest { @Test fun `sets up interactor listeners`() { - val urlCommitListener = slot<(String) -> Boolean>() - val editListener = slot() - every { toolbar.setOnUrlCommitListener(capture(urlCommitListener)) } just Runs - every { toolbar.setOnEditListener(capture(editListener)) } just Runs + var urlCommitListener: ((String) -> Boolean)? = null + var editListener: Toolbar.OnEditListener? = null + every { toolbar.setOnUrlCommitListener(any()) } answers { + urlCommitListener = firstArg() + } + every { toolbar.setOnEditListener(any()) } answers { + editListener = firstArg() + } buildToolbarView(isPrivate = false) - assertFalse(urlCommitListener.captured("test")) + assertNotNull(urlCommitListener) + assertFalse(urlCommitListener!!("test")) verify { interactor.onUrlCommitted("test") } - assertFalse(editListener.captured.onCancelEditing()) + assertNotNull(editListener) + assertFalse(editListener!!.onCancelEditing()) verify { interactor.onEditingCanceled() } - editListener.captured.onTextChanged("https://example.com") + editListener!!.onTextChanged("https://example.com") verify { interactor.onTextChanged("https://example.com") } }