Add interstitial search

app/src/androidTest/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt

@@ -16,6 +16,7 @@
 
 package com.duckduckgo.app.autocomplete.api
 
+import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
 import com.duckduckgo.app.bookmarks.db.BookmarkEntity
 import com.duckduckgo.app.bookmarks.db.BookmarksDao
 import com.nhaarman.mockitokotlin2.verify
@@ -59,7 +60,7 @@ class AutoCompleteApiTest {
     @Test
     fun whenQueryIsBlankThenReturnAnEmptyList() {
         val result = testee.autoComplete("").test()
-        val value = result.values()[0] as AutoCompleteApi.AutoCompleteResult
+        val value = result.values()[0] as AutoCompleteResult
 
         assertTrue(value.suggestions.isEmpty())
     }
@@ -70,7 +71,7 @@ class AutoCompleteApiTest {
         whenever(mockBookmarksDao.bookmarksByQuery(anyString())).thenReturn(Single.just(listOf(BookmarkEntity(0, "title", "https://example.com"))))
 
         val result = testee.autoComplete("foo").test()
-        val value = result.values()[0] as AutoCompleteApi.AutoCompleteResult
+        val value = result.values()[0] as AutoCompleteResult
 
         assertSame("https://example.com", value.suggestions[0].phrase)
     }

app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt

@@ -30,9 +30,10 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 import com.duckduckgo.app.CoroutineTestRule
 import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.ValueCaptorObserver
+import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteResult
+import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteBookmarkSuggestion
+import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
 import com.duckduckgo.app.autocomplete.api.AutoCompleteApi
-import com.duckduckgo.app.autocomplete.api.AutoCompleteApi.AutoCompleteSuggestion.AutoCompleteBookmarkSuggestion
-import com.duckduckgo.app.autocomplete.api.AutoCompleteApi.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
 import com.duckduckgo.app.autocomplete.api.AutoCompleteService
 import com.duckduckgo.app.bookmarks.db.BookmarkEntity
 import com.duckduckgo.app.bookmarks.db.BookmarksDao
@@ -227,7 +228,7 @@ class BrowserTabViewModelTest {
             siteFactory = siteFactory,
             tabRepository = mockTabsRepository,
             networkLeaderboardDao = mockNetworkLeaderboardDao,
-            autoCompleteApi = mockAutoCompleteApi,
+            autoComplete = mockAutoCompleteApi,
             appSettingsPreferencesStore = mockSettingsStore,
             bookmarksDao = mockBookmarksDao,
             longPressHandler = mockLongPressHandler,
@@ -1263,16 +1264,17 @@ class BrowserTabViewModelTest {
     @Test
     fun whenBookmarkSuggestionSubmittedThenAutoCompleteBookmarkSelectionPixelSent() = runBlocking {
         whenever(mockBookmarksDao.hasBookmarks()).thenReturn(true)
-        testee.autoCompleteViewState.value = autoCompleteViewState().copy(searchResults = AutoCompleteApi.AutoCompleteResult("", emptyList(), true))
-        testee.fireAutocompletePixel(AutoCompleteBookmarkSuggestion("example", "Example", "https://example.com"))
-
+        val suggestion = AutoCompleteBookmarkSuggestion("example", "Example", "https://example.com")
+        testee.autoCompleteViewState.value = autoCompleteViewState().copy(searchResults = AutoCompleteResult("", listOf(suggestion)))
+        testee.fireAutocompletePixel(suggestion)
         verify(mockPixel).fire(Pixel.PixelName.AUTOCOMPLETE_BOOKMARK_SELECTION, pixelParams(showedBookmarks = true, bookmarkCapable = true))
     }
 
     @Test
     fun whenSearchSuggestionSubmittedWithBookmarksThenAutoCompleteSearchSelectionPixelSent() = runBlocking {
         whenever(mockBookmarksDao.hasBookmarks()).thenReturn(true)
-        testee.autoCompleteViewState.value = autoCompleteViewState().copy(searchResults = AutoCompleteApi.AutoCompleteResult("", emptyList(), true))
+        val suggestions = listOf(AutoCompleteSearchSuggestion("", false), AutoCompleteBookmarkSuggestion("", "", ""))
+        testee.autoCompleteViewState.value = autoCompleteViewState().copy(searchResults = AutoCompleteResult("", suggestions))
         testee.fireAutocompletePixel(AutoCompleteSearchSuggestion("example", false))
 
         verify(mockPixel).fire(Pixel.PixelName.AUTOCOMPLETE_SEARCH_SELECTION, pixelParams(showedBookmarks = true, bookmarkCapable = true))
@@ -1281,7 +1283,7 @@ class BrowserTabViewModelTest {
     @Test
     fun whenSearchSuggestionSubmittedWithoutBookmarksThenAutoCompleteSearchSelectionPixelSent() = runBlocking {
         whenever(mockBookmarksDao.hasBookmarks()).thenReturn(false)
-        testee.autoCompleteViewState.value = autoCompleteViewState().copy(searchResults = AutoCompleteApi.AutoCompleteResult("", emptyList(), false))
+        testee.autoCompleteViewState.value = autoCompleteViewState().copy(searchResults = AutoCompleteResult("", emptyList()))
         testee.fireAutocompletePixel(AutoCompleteSearchSuggestion("example", false))
 
         verify(mockPixel).fire(Pixel.PixelName.AUTOCOMPLETE_SEARCH_SELECTION, pixelParams(showedBookmarks = false, bookmarkCapable = false))

app/src/androidTest/java/com/duckduckgo/app/di/TestAppComponent.kt

@@ -53,6 +53,7 @@ import javax.inject.Singleton
         NetworkModule::class,
         StoreModule::class,
         JsonModule::class,
+        SystemComponentsModule::class,
         BrowserModule::class,
         BrowserAutoCompleteModule::class,
         HttpsUpgraderModule::class,

app/src/androidTest/java/com/duckduckgo/app/privacy/ui/TrackerNetworksViewModelTest.kt

@@ -108,7 +108,7 @@ class TrackerNetworksViewModelTest {
         assertEquals(1, result[Entity.MINOR_ENTITY_B]?.count())
     }
 
-    private fun site(url: String = "", networkCount: Int = 0, trackingEvents: List<TrackingEvent> = emptyList()): Site {
+    private fun site(url: String = "", trackingEvents: List<TrackingEvent> = emptyList()): Site {
         val site: Site = mock()
         whenever(site.url).thenReturn(url)
         whenever(site.uri).thenReturn(Uri.parse(url))

app/src/androidTest/java/com/duckduckgo/app/statistics/VariantManagerTest.kt

@@ -53,7 +53,7 @@ class VariantManagerTest {
     fun conceptTestNoCtaVariantIsInactiveAndHasSuppressCtaFeatures() {
         val variant = variants.firstOrNull { it.key == "md" }
         assertEqualsDouble(0.0, variant!!.weight)
-        assertEquals(2, variant!!.features.size)
+        assertEquals(2, variant.features.size)
         assertTrue(variant.hasFeature(SuppressWidgetCta))
         assertTrue(variant.hasFeature(SuppressDefaultBrowserCta))
     }
@@ -62,12 +62,13 @@ class VariantManagerTest {
     fun conceptTestExperimentalVariantIsInactiveAndHasConceptTestAndSuppressCtaFeatures() {
         val variant = variants.firstOrNull { it.key == "me" }
         assertEqualsDouble(0.0, variant!!.weight)
-        assertEquals(3, variant!!.features.size)
+        assertEquals(3, variant.features.size)
         assertTrue(variant.hasFeature(ConceptTest))
         assertTrue(variant.hasFeature(SuppressWidgetCta))
         assertTrue(variant.hasFeature(SuppressDefaultBrowserCta))
     }
 
+
     // CTA on Concept Test experiments
 
     @Test
@@ -81,7 +82,7 @@ class VariantManagerTest {
     fun insertCtaConceptTestVariantIsActiveAndHasConceptTestAndSuppressCtaFeatures() {
         val variant = variants.firstOrNull { it.key == "mv" }
         assertEqualsDouble(1.0, variant!!.weight)
-        assertEquals(3, variant!!.features.size)
+        assertEquals(3, variant.features.size)
         assertTrue(variant.hasFeature(ConceptTest))
         assertTrue(variant.hasFeature(SuppressWidgetCta))
         assertTrue(variant.hasFeature(SuppressDefaultBrowserCta))
@@ -91,7 +92,7 @@ class VariantManagerTest {
     fun insertCtaConceptTestWithAllCtaExperimentalVariantIsActiveAndHasConceptTestAndSuppressCtaFeatures() {
         val variant = variants.firstOrNull { it.key == "mz" }
         assertEqualsDouble(1.0, variant!!.weight)
-        assertEquals(2, variant!!.features.size)
+        assertEquals(2, variant.features.size)
         assertTrue(variant.hasFeature(ConceptTest))
     }
 

app/src/androidTest/java/com/duckduckgo/app/systemsearch/DeviceAppLookupTest.kt

@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2020 DuckDuckGo
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.duckduckgo.app.systemsearch
+
+import android.content.Intent
+import com.duckduckgo.app.systemsearch.DeviceAppLookupTest.AppName.DDG_MOVIES
+import com.duckduckgo.app.systemsearch.DeviceAppLookupTest.AppName.DDG_MUSIC
+import com.duckduckgo.app.systemsearch.DeviceAppLookupTest.AppName.FILES
+import com.duckduckgo.app.systemsearch.DeviceAppLookupTest.AppName.LIVE_DDG
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DeviceAppLookupTest {
+
+    private val mockAppProvider: DeviceAppListProvider = mock()
+
+    private val testee = InstalledDeviceAppLookup(mockAppProvider)
+
+    @Test
+    fun whenQueryMatchesWordInShortNameThenMatchesAreReturned() {
+        whenever(mockAppProvider.get()).thenReturn(apps)
+        val result = testee.query("DDG")
+        assertEquals(3, result.size)
+        assertEquals(DDG_MOVIES, result[0].shortName)
+        assertEquals(DDG_MUSIC, result[1].shortName)
+        assertEquals(LIVE_DDG, result[2].shortName)
+    }
+
+    @Test
+    fun whenQueryMatchesWordPrefixInShortNameThenMatchesAreReturned() {
+        whenever(mockAppProvider.get()).thenReturn(apps)
+        val result = testee.query("DDG")
+        assertEquals(3, result.size)
+        assertEquals(DDG_MOVIES, result[0].shortName)
+        assertEquals(DDG_MUSIC, result[1].shortName)
+        assertEquals(LIVE_DDG, result[2].shortName)
+    }
+
+    @Test
+    fun whenQueryMatchesPastShortNameWordBoundaryToNextPrefixThenMatchesAreReturned() {
+        whenever(mockAppProvider.get()).thenReturn(apps)
+        val result = testee.query("DDG M")
+        assertEquals(2, result.size)
+        assertEquals(DDG_MOVIES, result[0].shortName)
+        assertEquals(DDG_MUSIC, result[1].shortName)
+    }
+
+    @Test
+    fun whenQueryMatchesWordPrefixInShortNameWithDifferentCaseThenMatchesAreReturned() {
+        whenever(mockAppProvider.get()).thenReturn(apps)
+        val result = testee.query("ddg")
+        assertEquals(3, result.size)
+        assertEquals(DDG_MOVIES, result[0].shortName)
+        assertEquals(DDG_MUSIC, result[1].shortName)
+        assertEquals(LIVE_DDG, result[2].shortName)
+    }
+
+    @Test
+    fun whenQueryMatchesMiddleOrSuffixOfAppNameWordThenNoAppsReturned() {
+        whenever(mockAppProvider.get()).thenReturn(apps)
+        val result = testee.query("DG")
+        assertTrue(result.isEmpty())
+    }
+
+    @Test
+    fun whenQueryDoesNotMatchAnyPartOfAppNameThenNoAppsReturned() {
+        whenever(mockAppProvider.get()).thenReturn(apps)
+        val result = testee.query("nonmatching")
+        assertTrue(result.isEmpty())
+    }
+
+    @Test
+    fun whenQueryIsEmptyThenNoAppsReturned() {
+        whenever(mockAppProvider.get()).thenReturn(apps)
+        val result = testee.query("")
+        assertTrue(result.isEmpty())
+    }
+
+    @Test
+    fun whenAppsListIsEmptyThenNoAppsReturned() {
+        whenever(mockAppProvider.get()).thenReturn(noApps)
+        val result = testee.query("DDG")
+        assertTrue(result.isEmpty())
+    }
+
+    object AppName {
+        const val DDG_MOVIES = "DDG Movies"
+        const val DDG_MUSIC = "DDG Music"
+        const val LIVE_DDG = "Live DDG"
+        const val FILES = "Files"
+    }
+
+    companion object {
+        val noApps = emptyList<DeviceApp>()
+
+        val apps = listOf(
+            DeviceApp(DDG_MOVIES, "", Intent()),
+            DeviceApp(DDG_MUSIC, "", Intent()),
+            DeviceApp(FILES, "", Intent()),
+            DeviceApp(LIVE_DDG, "", Intent())
+        )
+    }
+}