Merge branch 'release/4.4.0'

Author: subsymbolic

.travis.yml

@@ -33,11 +33,16 @@ before_script:
   - android-wait-for-emulator
   - adb shell input keyevent 82
 
-script: ./gradlew build connectedCheck
+script:
+  - ./gradlew build
+  - ./gradlew connectedCheck -Porchestrator --info
+
+after_failure:
+  - cat /home/travis/build/duckduckgo/Android/app/build/outputs/androidTest-results/connected/*
 
 notifications:
   slack:
-    on_success: never
+    on_success: change
     on_failure: change
     rooms:
     - secure: wGlok1fuT5CdmQFt2C9oyym18YfLZ7Xc3DRVnYd+uMCZ6gSPZzkpNVWEw0UmNT299OZXG7QOryTnkG958OGGaYWu4LU5GSpBPyzCWdUXPngXB9sHhXdEt74mUNGVA5HcOUlK3cv50TVhnMzzZqSXGh3xrFZHTD0KI9u9Nu5by00Io/33qffzN2B0HSCJ7Rhot+x1HTZA31CvCZ1mDSo4WgngCpDlpyKISf66h8TXwgBDBQK89pMtt9+NQghKiveduHBTR0Lmw8a+yRq0gnuOX7br44awHR4ZWnRsveJJPwNJykBkMAXH1BRgJCqcjPls3qM4rgKApAwUAnii73+9qqQdzv/0PNBWUavQe1/WJIrH77S4239dbsOTHKRTIWEK57SRJ5IZOVZFXG8efLKUQbBXYq4O9OqecrOFwmRoPyBNUKK777R4iex7yO5ezk8IOG2KCdkqc0IV/GI64U4b7DgSu2c8cXtdr8HyZLwP1OEcP2kUsB9CdkLFxTBBoVOT8aDsyqyPte8mHKsE/3qm+06tKh9f31NXITRyOVF5eKmPoJGW/KPteY4+nI0nohI38Q6VRDywN4sRt24IRgrU0C0QFDtjp7GSTN8QULK0gq3oVIqW8NAK9fCIuoYBTiFzJE6PENlxG7wPsL7Ng2mFFsgTVCy5ghOkI9ju7G2rcb4=

app/build.gradle

@@ -6,19 +6,19 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "4.3.0"
+    VERSION_NAME = "4.4.0"
+    USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
 }
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "26.0.2"
     defaultConfig {
         applicationId "com.duckduckgo.mobile.android"
         minSdkVersion 21
         targetSdkVersion 27
         versionCode buildVersionCode()
         versionName VERSION_NAME
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "com.duckduckgo.app.TestRunner"
         archivesBaseName = "duckduckgo-$versionName"
 
         javaCompileOptions {
@@ -50,6 +50,10 @@ android {
     }
     testOptions {
         unitTests.returnDefaultValues = true
+
+        if(USE_ORCHESTRATOR) {
+            execution 'ANDROID_TEST_ORCHESTRATOR'
+        }
     }
 
     def staticConfigPath = "${System.getenv('HOME')}/jenkins_static/com.duckduckgo.mobile.android"
@@ -79,21 +83,21 @@ ext {
 
 
 dependencies {
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
     implementation "com.android.support:appcompat-v7:$supportLibrary"
     implementation "com.android.support:design:$supportLibrary"
     implementation "com.android.support.constraint:constraint-layout:1.0.2"
-    implementation "com.squareup.okhttp3:okhttp:3.9.1"
+    implementation "com.squareup.okhttp3:okhttp:3.10.0"
     implementation "com.squareup.retrofit2:retrofit:$retrofit"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit"
     implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofit"
-    implementation "io.reactivex.rxjava2:rxjava:2.1.8"
-    implementation "io.reactivex.rxjava2:rxandroid:2.0.1"
-    implementation "com.jakewharton.timber:timber:4.6.0"
+    implementation "io.reactivex.rxjava2:rxjava:2.1.10"
+    implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
+    implementation "com.jakewharton.timber:timber:4.6.1"
     implementation "com.google.dagger:dagger-android:$dagger"
     implementation "com.google.dagger:dagger-android-support:$dagger"
     releaseImplementation 'com.faendir:acra:4.10.0'
@@ -120,14 +124,17 @@ dependencies {
     // Dagger
     kapt "com.google.dagger:dagger-android-processor:$dagger"
     kapt "com.google.dagger:dagger-compiler:$dagger"
+    kaptAndroidTest "com.google.dagger:dagger-android-processor:$dagger"
+    kaptAndroidTest "com.google.dagger:dagger-compiler:$dagger"
 
-    testImplementation "org.mockito:mockito-core:2.13.0"
+    testImplementation "org.mockito:mockito-core:2.15.0"
     testImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
     testImplementation "junit:junit:4.12"
 
     androidTestImplementation "com.android.support.test:runner:1.0.1"
+    androidTestUtil "com.android.support.test:orchestrator:1.0.1"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.1"
-    androidTestImplementation "org.mockito:mockito-android:2.13.0"
+    androidTestImplementation "org.mockito:mockito-android:2.15.0"
     androidTestImplementation "com.nhaarman:mockito-kotlin-kt1.1:1.5.0"
 
 }

app/src/androidTest/java/com/duckduckgo/app/FileUtilities.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2018 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
+
+object FileUtilities {
+
+    fun loadText(resourceName: String): String =
+        javaClass.classLoader.getResource(resourceName).openStream().bufferedReader().use { it.readText() }
+
+}

app/src/androidTest/java/com/duckduckgo/app/ImmediateTestRule.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018 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
+
+
+import io.reactivex.android.plugins.RxAndroidPlugins
+import io.reactivex.plugins.RxJavaPlugins
+import io.reactivex.schedulers.Schedulers
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+
+class InstantSchedulersRule : TestRule {
+
+    override fun apply(base: Statement, description: Description): Statement {
+
+        return object : Statement() {
+
+            @Throws(Throwable::class)
+            override fun evaluate() {
+
+                RxJavaPlugins.reset()
+                RxAndroidPlugins.reset()
+
+                RxJavaPlugins.setIoSchedulerHandler { Schedulers.trampoline() }
+                RxJavaPlugins.setComputationSchedulerHandler { Schedulers.trampoline() }
+                RxJavaPlugins.setNewThreadSchedulerHandler { Schedulers.trampoline() }
+                RxAndroidPlugins.setMainThreadSchedulerHandler { Schedulers.trampoline() }
+
+                base.evaluate()
+
+                RxJavaPlugins.reset()
+                RxAndroidPlugins.reset()
+
+            }
+
+        }
+    }
+
+}

app/src/androidTest/java/com/duckduckgo/app/TestApplication.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018 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
+
+import com.duckduckgo.app.di.DaggerTestAppComponent
+import com.duckduckgo.app.global.DuckDuckGoApplication
+
+
+class TestApplication : DuckDuckGoApplication() {
+
+    /**
+     * Use TestAppComponents for android tests which lets us provide alternative test modules
+     *
+     * See [com.duckduckgo.app.di.TestAppComponent]
+     */
+
+    override fun configureDependencyInjection() {
+        DaggerTestAppComponent.builder()
+                .application(this)
+                .create(this)
+                .inject(this)
+    }
+
+    // We don't need to actually use leak canary for tests
+    override fun installLeakCanary(): Boolean = true
+
+}

app/src/androidTest/java/com/duckduckgo/app/TestRunner.kt

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018 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
+
+import android.app.Application
+import android.content.Context
+import android.support.test.runner.AndroidJUnitRunner
+
+
+class TestRunner : AndroidJUnitRunner() {
+    override fun newApplication(cl: ClassLoader, className: String, context: Context): Application {
+        return super.newApplication(cl, TestApplication::class.java.name, context)
+    }
+}

app/src/androidTest/java/com/duckduckgo/app/bookmarks/db/BookmarksDaoTest.kt

@@ -16,23 +16,30 @@
 
 package com.duckduckgo.app.bookmarks.db
 
+import android.arch.core.executor.testing.InstantTaskExecutorRule
 import android.arch.persistence.room.Room
 import android.support.test.InstrumentationRegistry
 import com.duckduckgo.app.blockingObserve
 import com.duckduckgo.app.global.db.AppDatabase
 import org.junit.After
 import org.junit.Assert.*
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 
 class BookmarksDaoTest {
 
+    @get:Rule
+    @Suppress("unused")
+    var instantTaskExecutorRule = InstantTaskExecutorRule()
+
     private lateinit var db: AppDatabase
     private lateinit var dao: BookmarksDao
 
     @Before
     fun before() {
         db = Room.inMemoryDatabaseBuilder(InstrumentationRegistry.getContext(), AppDatabase::class.java)
+                .allowMainThreadQueries()
                 .build()
         dao = db.bookmarksDao()
     }