Merge branch 'release/5.36.1'

Author: CDRussell

app/build.gradle

@@ -39,6 +39,7 @@ android {
     }
     buildTypes {
         debug {
+            applicationIdSuffix ".debug"
             pseudoLocalesEnabled false
         }
         release {

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

@@ -36,23 +36,25 @@ class BrowserWebViewClientTest {
     private lateinit var testee: BrowserWebViewClient
     private lateinit var webView: WebView
 
-    private val requestRewriter: RequestRewriter = mock()
     private val specialUrlDetector: SpecialUrlDetector = mock()
     private val requestInterceptor: RequestInterceptor = mock()
     private val listener: WebViewClientListener = mock()
     private val offlinePixelCountDataStore: OfflinePixelCountDataStore = mock()
     private val uncaughtExceptionRepository: UncaughtExceptionRepository = mock()
+    private val mainFrameUrlHandler: SpecialUrlHandler = mock()
+    private val subFrameUrlHandler: SpecialUrlHandler = mock()
 
     @UiThreadTest
     @Before
     fun setup() {
         webView = TestWebView(InstrumentationRegistry.getInstrumentation().targetContext)
         testee = BrowserWebViewClient(
-            requestRewriter,
             specialUrlDetector,
             requestInterceptor,
             offlinePixelCountDataStore,
-            uncaughtExceptionRepository
+            uncaughtExceptionRepository,
+            mainFrameUrlHandler,
+            subFrameUrlHandler
         )
         testee.webViewClientListener = listener
     }

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

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2019 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.browser
+
+import android.content.Intent
+import android.webkit.WebView
+import androidx.test.annotation.UiThreadTest
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import com.duckduckgo.app.browser.SpecialUrlDetector.UrlType.*
+import com.nhaarman.mockitokotlin2.mock
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+
+class SubFrameUrlHandlerTest {
+
+    private val testee = SubFrameUrlHandler()
+    private lateinit var webView: WebView
+    private val mockWebViewClientListener: WebViewClientListener = mock()
+
+    @UiThreadTest
+    @Before
+    fun setUp() {
+        webView = WebView(getInstrumentation().targetContext)
+    }
+
+    @Test
+    fun whenWebTypeUrlThenRequestShouldNotBeOverridden() {
+        assertFalse(testee.handleUrl(webView, Web(""), mockWebViewClientListener))
+    }
+
+    @Test
+    fun whenTelephoneTypeUrlThenRequestShouldBeOverridden() {
+        assertTrue(testee.handleUrl(webView, Telephone(""), mockWebViewClientListener))
+    }
+
+    @Test
+    fun whenEmailUrlTypeThenRequestShouldBeOverridden() {
+        assertTrue(testee.handleUrl(webView, Email(""), mockWebViewClientListener))
+    }
+
+    @Test
+    fun whenSmsUrlTypeThenRequestShouldBeOverridden() {
+        assertTrue(testee.handleUrl(webView, Sms(""), mockWebViewClientListener))
+    }
+
+    @Test
+    fun whenSearchQueryUrlTypeThenRequestShouldBeOverridden() {
+        assertTrue(testee.handleUrl(webView, SearchQuery(""), mockWebViewClientListener))
+    }
+
+    @Test
+    fun whenIntentUrlTypeThenRequestShouldBeOverridden() {
+        assertTrue(testee.handleUrl(webView, IntentType("", Intent(), null), mockWebViewClientListener))
+    }
+
+    @Test
+    fun whenUnknownUrlTypeThenRequestShouldBeOverridden() {
+        assertTrue(testee.handleUrl(webView, Unknown(""), mockWebViewClientListener))
+    }
+}

app/src/androidTest/java/com/duckduckgo/app/global/api/ApiRequestInterceptorTest.kt

@@ -53,7 +53,7 @@ class ApiRequestInterceptorTest {
         testee.intercept(mockChain)
         verify(mockChain).proceed(captor.capture())
 
-        val regex = "ddg_android/.*\\(com.duckduckgo.mobile.android.test; Android API .*\\)".toRegex()
+        val regex = "ddg_android/.*\\(com.duckduckgo.mobile.android.debug.test; Android API .*\\)".toRegex()
         val result = captor.value.header(Header.USER_AGENT)!!
         assertTrue(result.matches(regex))
     }

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

@@ -49,55 +49,55 @@ class ApiBasedPixelTest {
 
     @Test
     fun whenPixelFiredThenPixelServiceCalledWithCorrectAtbAndVariant() {
-        whenever(mockPixelService.fire(any(), any(), any(), anyOrNull())).thenReturn(Completable.complete())
+        configurePixelFireIsSuccessful()
         whenever(mockStatisticsDataStore.atb).thenReturn(Atb("atb"))
         whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant", filterBy = { true }))
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
 
         val pixel = ApiBasedPixel(mockPixelService, mockStatisticsDataStore, mockVariantManager, mockDeviceInfo)
         pixel.fire(PRIVACY_DASHBOARD_OPENED)
 
-        verify(mockPixelService).fire(eq("mp"), eq("phone"), eq("atbvariant"), any())
+        verify(mockPixelService).fire(eq("mp"), eq("phone"), eq("atbvariant"), any(), any())
     }
 
     @Test
     fun whenPixelFiredThenPixelServiceCalledWithCorrectAtb() {
-        whenever(mockPixelService.fire(any(), any(), any(), any())).thenReturn(Completable.complete())
+        whenever(mockPixelService.fire(any(), any(), any(), any(), any())).thenReturn(Completable.complete())
         whenever(mockStatisticsDataStore.atb).thenReturn(Atb("atb"))
         whenever(mockVariantManager.getVariant()).thenReturn(VariantManager.DEFAULT_VARIANT)
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
 
         val pixel = ApiBasedPixel(mockPixelService, mockStatisticsDataStore, mockVariantManager, mockDeviceInfo)
         pixel.fire(FORGET_ALL_EXECUTED)
 
-        verify(mockPixelService).fire(eq("mf"), eq("phone"), eq("atb"), any())
+        verify(mockPixelService).fire(eq("mf"), eq("phone"), eq("atb"), any(), any())
     }
 
     @Test
     fun whenPixelFiredTabletFormFactorThenPixelServiceCalledWithTabletParameter() {
-        whenever(mockPixelService.fire(any(), any(), any(), any())).thenReturn(Completable.complete())
+        whenever(mockPixelService.fire(any(), any(), any(), any(), any())).thenReturn(Completable.complete())
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.TABLET)
 
         val pixel = ApiBasedPixel(mockPixelService, mockStatisticsDataStore, mockVariantManager, mockDeviceInfo)
         pixel.fire(APP_LAUNCH)
 
-        verify(mockPixelService).fire(eq("ml"), eq("tablet"), eq(""), any())
+        verify(mockPixelService).fire(eq("ml"), eq("tablet"), eq(""), any(), any())
     }
 
     @Test
     fun whenPixelFiredWithNoAtbThenPixelServiceCalledWithCorrectPixelNameAndNoAtb() {
-        whenever(mockPixelService.fire(any(), any(), any(), any())).thenReturn(Completable.complete())
+        whenever(mockPixelService.fire(any(), any(), any(), any(), any())).thenReturn(Completable.complete())
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
 
         val pixel = ApiBasedPixel(mockPixelService, mockStatisticsDataStore, mockVariantManager, mockDeviceInfo)
         pixel.fire(APP_LAUNCH)
 
-        verify(mockPixelService).fire(eq("ml"), eq("phone"), eq(""), any())
+        verify(mockPixelService).fire(eq("ml"), eq("phone"), eq(""), any(), any())
     }
 
     @Test
     fun whenPixelFiredWithAdditionalParametersThenPixelServiceCalledWithDefaultAndAdditionalParameters() {
-        whenever(mockPixelService.fire(any(), any(), any(), any())).thenReturn(Completable.complete())
+        configurePixelFireIsSuccessful()
         whenever(mockStatisticsDataStore.atb).thenReturn(Atb("atb"))
         whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant", filterBy = { true }))
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
@@ -113,7 +113,7 @@ class ApiBasedPixelTest {
 
     @Test
     fun whenPixelFiredWithoutAdditionalParametersThenPixelServiceCalledWithOnlyDefaultParameters() {
-        whenever(mockPixelService.fire(any(), any(), any(), any())).thenReturn(Completable.complete())
+        configurePixelFireIsSuccessful()
         whenever(mockStatisticsDataStore.atb).thenReturn(Atb("atb"))
         whenever(mockVariantManager.getVariant()).thenReturn(Variant("variant", filterBy = { true }))
         whenever(mockDeviceInfo.formFactor()).thenReturn(DeviceInfo.FormFactor.PHONE)
@@ -125,4 +125,8 @@ class ApiBasedPixelTest {
         val expectedParams = mapOf("appVersion" to "1.0.0")
         verify(mockPixelService).fire("mp", "phone", "atbvariant", expectedParams)
     }
+
+    private fun configurePixelFireIsSuccessful() {
+        whenever(mockPixelService.fire(any(), any(), any(), anyOrNull(), any())).thenReturn(Completable.complete())
+    }
 }

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

@@ -37,6 +37,31 @@ class VariantManagerTest {
         assertEquals(0, variant.features.size)
     }
 
+    @Test
+    fun defaultLightThemeExperimentVariantActive() {
+        val variant = variants.firstOrNull { it.key == "mo" }
+        assertEqualsDouble(1.0, variant!!.weight)
+    }
+
+    @Test
+    fun defaultLightThemeExperimentVariantHasExperimentalFeatureForLightTheme() {
+        val variant = variants.firstOrNull { it.key == "mo" }
+        assertEquals(1, variant!!.features.size)
+        assertTrue(variant.hasFeature(VariantManager.VariantFeature.LightThemeExperiment))
+    }
+
+    @Test
+    fun defaultLightThemeControlGroupVariantActive() {
+        val variant = variants.firstOrNull { it.key == "mp" }
+        assertEqualsDouble(1.0, variant!!.weight)
+    }
+
+    @Test
+    fun defaultLightThemeControlGroupVariantHasNoExperimentFeatures() {
+        val variant = variants.firstOrNull { it.key == "mp" }
+        assertEquals(0, variant!!.features.size)
+    }
+
     @Suppress("SameParameterValue")
     private fun assertEqualsDouble(expected: Double, actual: Double) {
         val comparison = expected.compareTo(actual)