From 09308cb7477399485c0be3857010b09e5407386c Mon Sep 17 00:00:00 2001
From: iorgamgabriel <iorgamgabriel@yahoo.com>
Date: Wed, 6 Sep 2023 17:41:40 +0300
Subject: [PATCH] Bug 1851006 - SearchEngineSuggestionProvider should always be
 added to the provider list.

(cherry picked from commit 81d002ade2db9fac3af138754c52d04ca9dc99bd)
---
 .../fenix/search/awesomebar/AwesomeBarView.kt |  4 +---
 .../search/awesomebar/AwesomeBarViewTest.kt   | 21 +++----------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index 2286fa723e..197098e9cb 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -318,9 +318,7 @@ class AwesomeBarView(
             providersToAdd.add(getLocalTabsProvider(state.searchEngineSource, true))
         }
 
-        if (!activity.settings().showUnifiedSearchFeature) {
-            providersToAdd.add(searchEngineSuggestionProvider)
-        }
+        providersToAdd.add(searchEngineSuggestionProvider)
 
         return providersToAdd
     }
diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
index 3cbc2a0aa2..3a55e35a4d 100644
--- a/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt
@@ -765,7 +765,7 @@ class AwesomeBarViewTest {
     }
 
     @Test
-    fun `GIVEN unified search feature is enabled WHEN configuring providers THEN don't add the engine suggestions provider`() {
+    fun `GIVEN a search is made by the user WHEN configuring providers THEN search engine suggestion provider should always be added`() {
         val settings: Settings = mockk(relaxed = true) {
             every { showUnifiedSearchFeature } returns true
         }
@@ -776,21 +776,6 @@ class AwesomeBarViewTest {
 
         val result = awesomeBarView.getProvidersToAdd(state)
 
-        assertEquals(0, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
-    }
-
-    @Test
-    fun `GIVEN unified search feature is disabled WHEN configuring providers THEN add the engine suggestions provider`() {
-        val settings: Settings = mockk(relaxed = true) {
-            every { showUnifiedSearchFeature } returns false
-        }
-        every { activity.settings() } returns settings
-        val state = getSearchProviderState(
-            searchEngineSource = SearchEngineSource.Default(mockk(relaxed = true)),
-        )
-
-        val result = awesomeBarView.getProvidersToAdd(state)
-
         assertEquals(1, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
     }
 
@@ -834,7 +819,7 @@ class AwesomeBarViewTest {
     }
 
     @Test
-    fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN don't add any provider`() {
+    fun `GIVEN a search from the default engine with no suggestions asked WHEN configuring providers THEN add only search engine suggestion provider`() {
         val settings: Settings = mockk(relaxed = true) {
             every { showUnifiedSearchFeature } returns true
         }
@@ -862,7 +847,7 @@ class AwesomeBarViewTest {
         assertEquals(0, result.filterIsInstance<SearchSuggestionProvider>().size)
         assertEquals(0, result.filterIsInstance<SyncedTabsStorageSuggestionProvider>().size)
         assertEquals(0, result.filterIsInstance<SessionSuggestionProvider>().size)
-        assertEquals(0, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
+        assertEquals(1, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
     }
 
     @Test