bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-10 20:07:59 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

Update JUnit and Mockk test dependencies (#6005)

Browse Source
This commit is contained in:
David Perez 2025-10-10 12:59:42 -05:00 committed by GitHub
parent 2b88743bea
commit 957460f403
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -291,7 +291,7 @@ dependencies {
testImplementation(libs.google.hilt.android.testing) testImplementation(libs.google.hilt.android.testing)
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage) testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)

2
authenticator/build.gradle.kts
View File

@ -238,7 +238,7 @@ dependencies {
testImplementation(libs.google.hilt.android.testing) testImplementation(libs.google.hilt.android.testing)
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage) testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)

2
authenticatorbridge/build.gradle.kts
View File

@ -70,7 +70,7 @@ dependencies {
// Test environment dependencies: // Test environment dependencies:
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)
testImplementation(libs.square.turbine) testImplementation(libs.square.turbine)
} }

2
core/build.gradle.kts
View File

@ -47,7 +47,7 @@ dependencies {
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage) testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)

2
cxf/build.gradle.kts
View File

@ -58,7 +58,7 @@ dependencies {
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage) testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)

2
data/build.gradle.kts
View File

@ -58,7 +58,7 @@ dependencies {
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage) testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)

8
gradle/libs.versions.toml
View File

@ -41,7 +41,7 @@ googleProtoBufPlugin = "0.9.5"
googleServices = "4.4.4" googleServices = "4.4.4"
googleReview = "2.0.2" googleReview = "2.0.2"
hilt = "2.57.2" hilt = "2.57.2"
junit5 = "5.13.4" junit = "6.0.0"
jvmTarget = "21" jvmTarget = "21"
# kotlin and ksp **must** use compatible versions, do not update either without the other. # kotlin and ksp **must** use compatible versions, do not update either without the other.
kotlin = "2.2.20" kotlin = "2.2.20"
@ -50,7 +50,7 @@ kotlinxCoroutines = "1.10.2"
kotlinxSerialization = "1.9.0" kotlinxSerialization = "1.9.0"
kotlinxKover = "0.9.2" kotlinxKover = "0.9.2"
ksp = "2.2.20-2.0.4" ksp = "2.2.20-2.0.4"
mockk = "1.14.5" mockk = "1.14.6"
okhttp = "5.1.0" okhttp = "5.1.0"
retrofitBom = "3.0.0" retrofitBom = "3.0.0"
robolectric = "4.16" robolectric = "4.16"
@ -112,8 +112,8 @@ google-play-review = { module = "com.google.android.play:review", version.ref =
google-protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "googleProtoBufJava" } google-protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "googleProtoBufJava" }
# Included so that Renovate tracks updates since protoc is not referenced directly in `dependency {}` blocks. # Included so that Renovate tracks updates since protoc is not referenced directly in `dependency {}` blocks.
google-protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "googleProtoBufJava" } google-protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "googleProtoBufJava" }
junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" } junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
junit-junit5 = { module = "org.junit.jupiter:junit-jupiter" } junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" } junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
junit-vintage = { module = "org.junit.vintage:junit-vintage-engine" } junit-vintage = { module = "org.junit.vintage:junit-vintage-engine" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" } kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" }

4
network/build.gradle.kts
View File

@ -59,7 +59,7 @@ dependencies {
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testImplementation(libs.junit.vintage) testImplementation(libs.junit.vintage)
testImplementation(libs.kotlinx.coroutines.test) testImplementation(libs.kotlinx.coroutines.test)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)
@ -69,7 +69,7 @@ dependencies {
testFixturesImplementation(project(":core")) testFixturesImplementation(project(":core"))
testFixturesImplementation(platform(libs.junit.bom)) testFixturesImplementation(platform(libs.junit.bom))
testFixturesRuntimeOnly(libs.junit.platform.launcher) testFixturesRuntimeOnly(libs.junit.platform.launcher)
testFixturesImplementation(libs.junit.junit5) testFixturesImplementation(libs.junit.jupiter)
testFixturesImplementation(libs.junit.vintage) testFixturesImplementation(libs.junit.vintage)
testFixturesImplementation(libs.kotlinx.serialization) testFixturesImplementation(libs.kotlinx.serialization)
testFixturesImplementation(libs.square.okhttp) testFixturesImplementation(libs.square.okhttp)

4
ui/build.gradle.kts
View File

@ -80,7 +80,7 @@ dependencies {
debugImplementation(libs.androidx.compose.ui.tooling) debugImplementation(libs.androidx.compose.ui.tooling)
testImplementation(platform(libs.junit.bom)) testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.junit5) testImplementation(libs.junit.jupiter)
testRuntimeOnly(libs.junit.platform.launcher) testRuntimeOnly(libs.junit.platform.launcher)
testImplementation(libs.junit.vintage) testImplementation(libs.junit.vintage)
testImplementation(libs.mockk.mockk) testImplementation(libs.mockk.mockk)
@ -93,7 +93,7 @@ dependencies {
testFixturesImplementation(libs.androidx.navigation.compose) testFixturesImplementation(libs.androidx.navigation.compose)
testFixturesImplementation(libs.google.hilt.android.testing) testFixturesImplementation(libs.google.hilt.android.testing)
testFixturesImplementation(platform(libs.junit.bom)) testFixturesImplementation(platform(libs.junit.bom))
testFixturesImplementation(libs.junit.junit5) testFixturesImplementation(libs.junit.jupiter)
testFixturesImplementation(libs.junit.vintage) testFixturesImplementation(libs.junit.vintage)
testFixturesImplementation(libs.kotlinx.coroutines.test) testFixturesImplementation(libs.kotlinx.coroutines.test)
testFixturesImplementation(libs.mockk.mockk) testFixturesImplementation(libs.mockk.mockk)

8
ui/src/testFixtures/kotlin/com/bitwarden/ui/platform/base/MainDispatcherExtension.kt
View File

@ -27,19 +27,19 @@ class MainDispatcherExtension(
AfterEachCallback, AfterEachCallback,
BeforeAllCallback, BeforeAllCallback,
BeforeEachCallback { BeforeEachCallback {
override fun afterAll(context: ExtensionContext?) { override fun afterAll(context: ExtensionContext) {
Dispatchers.resetMain() Dispatchers.resetMain()
} }
override fun afterEach(context: ExtensionContext?) { override fun afterEach(context: ExtensionContext) {
Dispatchers.resetMain() Dispatchers.resetMain()
} }
override fun beforeAll(context: ExtensionContext?) { override fun beforeAll(context: ExtensionContext) {
Dispatchers.setMain(testDispatcher) Dispatchers.setMain(testDispatcher)
} }
override fun beforeEach(context: ExtensionContext?) { override fun beforeEach(context: ExtensionContext) {
Dispatchers.setMain(testDispatcher) Dispatchers.setMain(testDispatcher)
} }
} }