Improved AppStateProviderTest

grzesiek2010 · May 5, 2021 · b550a29 · b550a29
1 parent 2549d44
commit b550a29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -360,6 +360,7 @@ dependencies {
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.mockito:mockito-core:3.7.7"
     testImplementation 'org.mockito:mockito-inline:3.7.7'
+    testImplementation "org.mockito.kotlin:mockito-kotlin:3.2.0"
 
     testImplementation(project(path: ':testshared')) {
         exclude group: 'org.robolectric' // Some tests in `collect_app` don't work with newer Robolectric

diff --git a/collect_app/src/test/java/org/odk/collect/android/utilities/AppStateProviderTest.kt b/collect_app/src/test/java/org/odk/collect/android/utilities/AppStateProviderTest.kt
@@ -1,12 +1,12 @@
 package org.odk.collect.android.utilities
 
 import android.content.pm.PackageInfo
-import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mockito.`when`
 import org.mockito.Mockito.mock
+import org.mockito.kotlin.whenever
 import org.odk.collect.android.preferences.keys.MetaKeys
 import org.odk.collect.shared.Settings
 
@@ -26,25 +26,25 @@ class AppStateProviderTest {
     fun `When app is newly installed isFreshInstall() should return true when opened for the first time`() {
         packageInfo.firstInstallTime = 100
         packageInfo.lastUpdateTime = 100
-        `when`(metaSettings.contains(MetaKeys.FIRST_LAUNCH)).thenReturn(false)
+        whenever(metaSettings.contains(MetaKeys.FIRST_LAUNCH)).thenReturn(false)
 
-        assertThat(appStateProvider.isFreshInstall(), `is`(true))
+        assertThat(appStateProvider.isFreshInstall(), equalTo(true))
     }
 
     @Test
     fun `When app is newly installed isFreshInstall() should return false when opened not for the first time`() {
         packageInfo.firstInstallTime = 100
         packageInfo.lastUpdateTime = 100
-        `when`(metaSettings.contains(MetaKeys.FIRST_LAUNCH)).thenReturn(true)
+        whenever(metaSettings.contains(MetaKeys.FIRST_LAUNCH)).thenReturn(true)
 
-        assertThat(appStateProvider.isFreshInstall(), `is`(false))
+        assertThat(appStateProvider.isFreshInstall(), equalTo(false))
     }
 
     @Test
     fun `When app is updated should return false`() {
         packageInfo.firstInstallTime = 100
         packageInfo.lastUpdateTime = 200
 
-        assertThat(appStateProvider.isFreshInstall(), `is`(false))
+        assertThat(appStateProvider.isFreshInstall(), equalTo(false))
     }
 }