From 1ade4eaf645b4272ac25f2aa055c1368acd43da7 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 3 Dec 2021 00:39:54 +0530 Subject: Cleanup dependency declarations and upgrade to Kotlin 1.6.0 (#1565) --- .../java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt | 12 ++++++------ .../java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt | 2 +- .../msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'app/src/test/java') diff --git a/app/src/test/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt b/app/src/test/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt index 4e9f8b17..c37eb626 100644 --- a/app/src/test/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt +++ b/app/src/test/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt @@ -11,12 +11,12 @@ import android.content.SharedPreferences import androidx.core.content.edit import com.github.ivanshafran.sharedpreferencesmock.SPMockBuilder import dev.msfjarvis.aps.util.extensions.getString -import org.junit.Assert.assertEquals -import org.junit.Assert.assertFalse -import org.junit.Assert.assertNull -import org.junit.Before +import kotlin.test.BeforeTest +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertFalse +import kotlin.test.assertNull import org.junit.Rule -import org.junit.Test import org.junit.rules.TemporaryFolder class MigrationsTest { @@ -29,7 +29,7 @@ class MigrationsTest { private lateinit var encryptedSharedPreferences: SharedPreferences private lateinit var proxySharedPreferences: SharedPreferences - @Before + @BeforeTest fun setup() { context = SPMockBuilder().createContext() filesDir = tempFolder.root.path diff --git a/app/src/test/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt b/app/src/test/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt index 37cbef2f..8d1d5915 100644 --- a/app/src/test/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt +++ b/app/src/test/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt @@ -5,8 +5,8 @@ package dev.msfjarvis.aps.util.totp +import kotlin.test.Test import kotlin.test.assertEquals -import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config diff --git a/app/src/test/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt b/app/src/test/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt index 3d511132..ea58460d 100644 --- a/app/src/test/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt +++ b/app/src/test/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt @@ -4,10 +4,10 @@ */ package dev.msfjarvis.aps.util.viewmodel +import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertNull import kotlin.test.assertTrue -import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner import org.robolectric.annotation.Config -- cgit v1.2.3