convert several tests to utilize kotlin-test

CruGlobal · Oct 15, 2023 · e4e1024 · e4e1024
1 parent 385abec
commit e4e1024
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/AppUpdateSnackbarTest.kt b/app/src/testDebug/kotlin/org/cru/godtools/ui/dashboard/AppUpdateSnackbarTest.kt
@@ -17,11 +17,11 @@ import io.mockk.coVerify
 import io.mockk.confirmVerified
 import io.mockk.excludeRecords
 import io.mockk.mockk
+import kotlin.test.Test
+import kotlin.test.assertTrue
 import org.cru.godtools.BuildConfig
 import org.cru.godtools.R
-import org.junit.Assert.assertTrue
 import org.junit.Rule
-import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
@@ -102,7 +102,7 @@ class AppUpdateSnackbarTest {
                 )
             }
             confirmVerified(snackbarHostState)
-            assertTrue("Default to Flexible Update", appUpdateManager.isConfirmationDialogVisible)
+            assertTrue(appUpdateManager.isConfirmationDialogVisible, "Default to Flexible Update")
         }
     }
 

diff --git a/library/base/src/test/kotlin/org/cru/godtools/base/FileSystemTest.kt b/library/base/src/test/kotlin/org/cru/godtools/base/FileSystemTest.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import io.mockk.every
 import io.mockk.mockk
 import java.io.File
+import kotlin.test.BeforeTest
 import kotlinx.coroutines.test.runTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
-import org.junit.Before
 import org.junit.Test
 
 class FileSystemTest {
@@ -16,7 +16,7 @@ class FileSystemTest {
 
     private lateinit var fileSystem: FileSystem
 
-    @Before
+    @BeforeTest
     fun setup() {
         fileSystem = FileSystem(context, "resources")
     }

diff --git a/library/base/src/test/kotlin/org/cru/godtools/base/SettingsTest.kt b/library/base/src/test/kotlin/org/cru/godtools/base/SettingsTest.kt
@@ -2,12 +2,12 @@ package org.cru.godtools.base
 
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlin.test.BeforeTest
+import kotlin.test.Test
 import org.cru.godtools.base.Settings.Companion.FEATURE_TUTORIAL_ONBOARDING
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
 import org.junit.runner.RunWith
 
 private const val FEATURE_TEST = "testFeature"
@@ -16,7 +16,7 @@ private const val FEATURE_TEST = "testFeature"
 class SettingsTest {
     private lateinit var settings: Settings
 
-    @Before
+    @BeforeTest
     fun setup() {
         settings = Settings(ApplicationProvider.getApplicationContext())
     }

diff --git a/library/base/src/test/kotlin/org/cru/godtools/base/util/LocaleUtilsGetDisplayNameTest.kt b/library/base/src/test/kotlin/org/cru/godtools/base/util/LocaleUtilsGetDisplayNameTest.kt
@@ -10,9 +10,9 @@ import io.mockk.mockk
 import io.mockk.verify
 import java.util.Locale
 import kotlin.random.Random
+import kotlin.test.BeforeTest
+import kotlin.test.Test
 import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
@@ -23,7 +23,7 @@ private const val PACKAGE_NAME = "packageName"
 class LocaleUtilsGetDisplayNameTest {
     lateinit var context: Context
 
-    @Before
+    @BeforeTest
     fun setup() {
         context = mockk {
             every { packageName } returns PACKAGE_NAME