summaryrefslogtreecommitdiff
path: root/format-common/src
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-02-27 21:26:21 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2023-02-27 21:26:21 +0530
commit3d47ecd698e582934cae7e54ecb42eb2fb4d8db9 (patch)
tree4101fe2944742b9f72d8ead4286aea4f74e5f08d /format-common/src
parenta6e845f461e1ed09d6ea34b6ecbf10327190e1b1 (diff)
refactor(format-common): migrate to `uri-kmp` and convert to JVM library
Diffstat (limited to 'format-common/src')
-rw-r--r--format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt2
-rw-r--r--format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt3
-rw-r--r--format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt5
3 files changed, 1 insertions, 9 deletions
diff --git a/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt b/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt
index 741a21a7..bb97c90c 100644
--- a/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt
+++ b/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt
@@ -1,6 +1,6 @@
package app.passwordstore.util.totp
-import android.net.Uri
+import com.eygraber.uri.Uri
import javax.inject.Inject
/** [Uri] backed TOTP URL parser. */
diff --git a/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
index 31ced9f3..73e55b34 100644
--- a/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
+++ b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt
@@ -23,11 +23,8 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.delay
import kotlinx.coroutines.test.runTest
import org.junit.Rule
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
@OptIn(ExperimentalCoroutinesApi::class, ExperimentalTime::class)
-@RunWith(RobolectricTestRunner::class)
class PasswordEntryTest {
@get:Rule val coroutineTestRule: CoroutineTestRule = CoroutineTestRule()
diff --git a/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt b/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt
index c62df0e7..e462c490 100644
--- a/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt
+++ b/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt
@@ -7,12 +7,7 @@ package app.passwordstore.util.totp
import kotlin.test.Test
import kotlin.test.assertEquals
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [23])
class UriTotpFinderTest {
private val totpFinder = UriTotpFinder()