For mozilla-mobile#191 - Test SearchSuggestionClient can get search suggestions for multiple search engines

Author: boek

components/browser/search/src/main/java/mozilla/components/browser/search/SearchSuggestionClient.kt

@@ -1,12 +1,14 @@
 package mozilla.components.browser.search
 
 import mozilla.components.browser.search.parser.defaultParser
+import mozilla.components.browser.search.parser.selectParser
 
 typealias SearchSuggestionFetcher = suspend (url: String) -> String?
 class SearchSuggestionClient(private val searchEngine: SearchEngine, private val fetcher: SearchSuggestionFetcher ) {
     suspend fun getSuggestions(query: String): List<String>? {
         val suggestionsURL = searchEngine.buildSuggestionsURL(query) ?: return null
+        val parser = selectParser(searchEngine)
 
-        return fetcher(suggestionsURL)?.let { defaultParser(it) }
+        return fetcher(suggestionsURL)?.let { parser(it) }
     }
 }

components/browser/search/src/main/java/mozilla/components/browser/search/parser/SuggestionParser.kt

@@ -20,7 +20,8 @@ private fun JSONArray.asSequence(): Sequence<Any> {
     }
 }
 
-typealias Parser = (String) -> List<String>
+typealias JSONResponse = String
+typealias Parser = (JSONResponse) -> List<String>
 
 private fun fromArrayResult(resultsIndex: Int): Parser {
     return { input ->

components/browser/search/src/test/java/mozilla/components/browser/search/SearchSuggestionClientTest.kt

@@ -15,16 +15,17 @@ import org.robolectric.RuntimeEnvironment
 @RunWith(RobolectricTestRunner::class)
 class SearchSuggestionClientTest {
     companion object {
-        val GOOGLE_MOCK: SearchSuggestionFetcher = { "[\"firefox\",[\"firefox\",\"firefox for mac\",\"firefox quantum\",\"firefox update\",\"firefox esr\",\"firefox focus\",\"firefox addons\",\"firefox extensions\",\"firefox nightly\",\"firefox clear cache\"]]" }
+        val GOOGLE_MOCK_RESPONSE: SearchSuggestionFetcher = { "[\"firefox\",[\"firefox\",\"firefox for mac\",\"firefox quantum\",\"firefox update\",\"firefox esr\",\"firefox focus\",\"firefox addons\",\"firefox extensions\",\"firefox nightly\",\"firefox clear cache\"]]" }
+        val QWANT_MOCK_RESPONSE: SearchSuggestionFetcher = { "{\"status\":\"success\",\"data\":{\"items\":[{\"value\":\"firefox (video game)\",\"suggestType\":3},{\"value\":\"firefox addons\",\"suggestType\":12},{\"value\":\"firefox\",\"suggestType\":2},{\"value\":\"firefox quantum\",\"suggestType\":12},{\"value\":\"firefox focus\",\"suggestType\":12}],\"special\":[],\"availableQwick\":[]}}" }
     }
 
     @Test
-    fun `Get a list of results based on a search engine`() {
+    fun `Get a list of results based on the Google search engine`() {
         val searchEngine = SearchEngineParser().load(
                 RuntimeEnvironment.application.assets,
                 "google", "searchplugins/google-nocodes.xml")
 
-        val client = SearchSuggestionClient(searchEngine, GOOGLE_MOCK)
+        val client = SearchSuggestionClient(searchEngine, GOOGLE_MOCK_RESPONSE)
 
         runBlocking {
             val results = client.getSuggestions("firefox")
@@ -33,4 +34,20 @@ class SearchSuggestionClientTest {
             assertEquals(expectedResults, results)
         }
     }
+
+    @Test
+    fun `Get a list of results based on a non google search engine`() {
+        val searchEngine = SearchEngineParser().load(
+                RuntimeEnvironment.application.assets,
+                "google", "searchplugins/qwant.xml")
+
+        val client = SearchSuggestionClient(searchEngine, QWANT_MOCK_RESPONSE)
+
+        runBlocking {
+            val results = client.getSuggestions("firefox")
+            val expectedResults = listOf("firefox (video game)", "firefox addons", "firefox", "firefox quantum", "firefox focus")
+
+            assertEquals(expectedResults, results)
+        }
+    }
 }