summaryrefslogtreecommitdiffhomepage
path: root/android/lib
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-01-16 10:37:39 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-01-16 10:37:39 +0100
commitee9597c4628773fcc6cc93306bab5e01ce2401f1 (patch)
treeb31dc3da5c2089430d887a2ea3662adfba364aca /android/lib
parent2ddea954bd1f4bfb351d9ae6e93440be000a17a6 (diff)
parent90e0283595e61de703d93cdc8871d7b16ae5f80f (diff)
downloadmullvadvpn-ee9597c4628773fcc6cc93306bab5e01ce2401f1.tar.xz
mullvadvpn-ee9597c4628773fcc6cc93306bab5e01ce2401f1.zip
Merge branch 'migrate-missed-junit4-test-and-try-to-prevent-junit4-for-droid-636'
Diffstat (limited to 'android/lib')
-rw-r--r--android/lib/ipc/build.gradle.kts3
-rw-r--r--android/lib/ipc/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlowTest.kt2
2 files changed, 4 insertions, 1 deletions
diff --git a/android/lib/ipc/build.gradle.kts b/android/lib/ipc/build.gradle.kts
index 85b15dacaf..35fa3c4f1e 100644
--- a/android/lib/ipc/build.gradle.kts
+++ b/android/lib/ipc/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
id(Dependencies.Plugin.androidLibraryId)
id(Dependencies.Plugin.kotlinAndroidId)
id(Dependencies.Plugin.kotlinParcelizeId)
+ id(Dependencies.Plugin.junit5) version Versions.Plugin.junit5
}
android {
@@ -33,6 +34,8 @@ dependencies {
implementation(Dependencies.Kotlin.stdlib)
implementation(Dependencies.KotlinX.coroutinesAndroid)
+ androidTestImplementation(Dependencies.junitApi)
+ androidTestImplementation(Dependencies.junitEngine)
androidTestImplementation(Dependencies.AndroidX.testRunner)
androidTestImplementation(Dependencies.Kotlin.test)
}
diff --git a/android/lib/ipc/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlowTest.kt b/android/lib/ipc/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlowTest.kt
index e3ad447cc2..a125af6059 100644
--- a/android/lib/ipc/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlowTest.kt
+++ b/android/lib/ipc/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/ipc/HandlerFlowTest.kt
@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.take
import kotlinx.coroutines.flow.toList
import kotlinx.coroutines.runBlocking
import kotlinx.parcelize.Parcelize
-import org.junit.Test
+import org.junit.jupiter.api.Test
class HandlerFlowTest {
val looper by lazy { Looper.getMainLooper() }