Closes mozilla-mobile#991: Fix tests

psymoon · Oct 16, 2018 · e852799 · e852799
1 parent 5dd0101
commit e852799
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ apply from: "$project.rootDir/tools/gradle/versionCode.gradle"
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.2'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.mozilla.tv.firefox"
@@ -120,7 +120,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.robolectric:robolectric:3.8"
+    testImplementation "org.robolectric:robolectric:4.0-alpha-3"
     testImplementation 'org.mockito:mockito-core:2.21.0'
 
     androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'

diff --git a/app/src/test/java/org/mozilla/focus/TestResource.kt b/app/src/test/java/org/mozilla/focus/TestResource.kt
@@ -10,5 +10,5 @@ private const val POCKET_DIR = "pocket"
 enum class TestResource(private val path: String) {
     POCKET_VIDEO_RECOMMENDATION("$POCKET_DIR/video_recommendations.json");
 
-    fun get(): String = this::class.java.classLoader.getResource(path).readText()
+    fun get(): String = this::class.java.classLoader!!.getResource(path)!!.readText()
 }
diff --git a/app/src/test/java/org/mozilla/focus/autocomplete/UrlAutoCompleteFilterTest.kt b/app/src/test/java/org/mozilla/focus/autocomplete/UrlAutoCompleteFilterTest.kt
@@ -15,7 +15,6 @@ import org.junit.runner.RunWith
 import org.mockito.ArgumentCaptor
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.verify
-import org.mozilla.focus.BuildConfig
 import org.mozilla.focus.R
 import org.mozilla.focus.widget.InlineAutocompleteEditText
 import org.mozilla.focus.widget.InlineAutocompleteEditText.AutocompleteResult
@@ -24,7 +23,7 @@ import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, packageName = "org.mozilla.focus")
+@Config(packageName = "org.mozilla.focus")
 class UrlAutoCompleteFilterTest {
     @After
     fun tearDown() {

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.2.1'
 
         classpath 'org.ajoberstar:grgit:1.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"