Bug 1839358 - Allow open tabs containing mobile subdomains to be displayed as suggestions in the awesome bar

app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt

@@ -493,8 +493,8 @@ class AwesomeBarView(
         searchEngineSource: SearchEngineSource,
         filterByCurrentEngine: Boolean = false,
     ): SessionSuggestionProvider {
-        val searchEngineHostFilter = when (filterByCurrentEngine) {
-            true -> searchEngineSource.searchEngine?.resultsUrl?.host
+        val searchEngineUriFilter = when (filterByCurrentEngine) {
+            true -> searchEngineSource.searchEngine?.resultsUrl
             false -> null
         }
 
@@ -506,7 +506,7 @@ class AwesomeBarView(
             getDrawable(activity, R.drawable.ic_search_results_tab),
             excludeSelectedSession = !fromHomeFragment,
             suggestionsHeader = activity.getString(R.string.firefox_suggest_header),
-            resultsHostFilter = searchEngineHostFilter,
+            resultsUriFilter = searchEngineUriFilter,
         )
     }
 

app/src/test/java/org/mozilla/fenix/search/awesomebar/AwesomeBarViewTest.kt

@@ -640,19 +640,20 @@ class AwesomeBarViewTest {
 
         val localSessionsProviders = result.filterIsInstance<SessionSuggestionProvider>()
         assertEquals(1, localSessionsProviders.size)
-        assertNull(localSessionsProviders[0].resultsHostFilter)
+        assertNull(localSessionsProviders[0].resultsUriFilter)
     }
 
     @Test
     fun `GIVEN normal browsing mode and needing to show filtered local tabs suggestions WHEN configuring providers THEN add the tabs provider with an engine filter`() {
         val settings: Settings = mockk(relaxed = true)
+        val url = Uri.parse("https://www.test.com")
         every { activity.settings() } returns settings
         every { activity.browsingModeManager.mode } returns BrowsingMode.Normal
         val state = getSearchProviderState(
             showAllSessionSuggestions = false,
             searchEngineSource = SearchEngineSource.Shortcut(
                 mockk(relaxed = true) {
-                    every { resultsUrl.host } returns "test"
+                    every { resultsUrl } returns url
                 },
             ),
         )
@@ -661,7 +662,7 @@ class AwesomeBarViewTest {
 
         val localSessionsProviders = result.filterIsInstance<SessionSuggestionProvider>()
         assertEquals(1, localSessionsProviders.size)
-        assertEquals("test", localSessionsProviders[0].resultsHostFilter)
+        assertEquals(url, localSessionsProviders[0].resultsUriFilter)
     }
 
     @Test
@@ -827,8 +828,8 @@ class AwesomeBarViewTest {
         assertEquals("www.test.com", syncedTabsProviders[1].resultsHostFilter) // the filtered synced tabs provider
         val localTabsProviders: List<SessionSuggestionProvider> = result.filterIsInstance<SessionSuggestionProvider>()
         assertEquals(2, localTabsProviders.size)
-        assertNull(localTabsProviders[0].resultsHostFilter) // the general tabs provider
-        assertEquals("www.test.com", localTabsProviders[1].resultsHostFilter) // the filtered tabs provider
+        assertNull(localTabsProviders[0].resultsUriFilter) // the general tabs provider
+        assertEquals(url, localTabsProviders[1].resultsUriFilter) // the filtered tabs provider
         assertEquals(1, result.filterIsInstance<SearchEngineSuggestionProvider>().size)
     }