From b583864643d6f1a8e95f13bcda43ca6aee388cc9 Mon Sep 17 00:00:00 2001
From: Mugurell <Mugurell@users.noreply.github.com>
Date: Thu, 5 Aug 2021 10:07:15 +0300
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/20584 - Speculative fix for
 ToolbarViewTest failing in CI

There was an `java.lang.InstantiationError: kotlin.jvm.functions.Function1`
stemming from line 75. See if avoiding nullability helps.
---
 .../java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt | 5 ++---
 1 file changed, 2 insertions(+), 3 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 ab8c1e4bdd..414df3fc9a 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
@@ -70,7 +70,7 @@ class ToolbarViewTest {
 
     @Test
     fun `sets up interactor listeners`() {
-        var urlCommitListener: ((String) -> Boolean)? = null
+        lateinit var urlCommitListener: ((String) -> Boolean)
         var editListener: Toolbar.OnEditListener? = null
         every { toolbar.setOnUrlCommitListener(any()) } answers {
             urlCommitListener = firstArg()
@@ -81,8 +81,7 @@ class ToolbarViewTest {
 
         buildToolbarView(isPrivate = false)
 
-        assertNotNull(urlCommitListener)
-        assertFalse(urlCommitListener!!("test"))
+        assertFalse(urlCommitListener("test"))
         verify { interactor.onUrlCommitted("test") }
 
         assertNotNull(editListener)