diff options
| author | David Göransson <david.goransson90@gmail.com> | 2024-01-10 15:04:30 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-11 09:51:38 +0100 |
| commit | abb2b79a830fbdaa0afa22a5cb2c272fa94a538c (patch) | |
| tree | ecc720997aeb3568b9d02a2c7c099ea220d37c3f /android/buildSrc/src | |
| parent | b5decd12a264c3e37092211eb0951dac6c640670 (diff) | |
| download | mullvadvpn-abb2b79a830fbdaa0afa22a5cb2c272fa94a538c.tar.xz mullvadvpn-abb2b79a830fbdaa0afa22a5cb2c272fa94a538c.zip | |
Migrate app unit tests to Junit5
Diffstat (limited to 'android/buildSrc/src')
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 55 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Versions.kt | 4 |
2 files changed, 34 insertions, 25 deletions
diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 8e38491f41..c68e6b417c 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -2,7 +2,15 @@ object Dependencies { const val androidVolley = "com.android.volley:volley:${Versions.Android.volley}" const val commonsValidator = "commons-validator:commons-validator:${Versions.commonsValidator}" const val jodaTime = "joda-time:joda-time:${Versions.jodaTime}" - const val junit = "junit:junit:${Versions.junit}" + const val junitApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junit}" + const val junitEngine = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit}" + const val junitParams = "org.junit.jupiter:junit-jupiter-params:${Versions.junit}" + const val junitAndroidTestExtensions = + "de.mannodermaus.junit5:android-test-core:${Versions.Android.junit}" + const val junitAndroidTestCore = + "de.mannodermaus.junit5:android-test-extensions:${Versions.Android.junit}" + const val junitAndroidTestRunner = + "de.mannodermaus.junit5:android-test-runner:${Versions.Android.junit}" const val konsist = "com.lemonappdev:konsist:${Versions.konsist}" const val leakCanary = "com.squareup.leakcanary:leakcanary-android:${Versions.leakCanary}" const val mockkWebserver = "com.squareup.okhttp3:mockwebserver:${Versions.mockWebserver}" @@ -22,14 +30,10 @@ object Dependencies { "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.AndroidX.lifecycle}" const val espressoCore = "androidx.test.espresso:espresso-core:${Versions.AndroidX.espresso}" - const val testCore = - "androidx.test:core:${Versions.AndroidX.test}" - const val testMonitor = - "androidx.test:monitor:${Versions.AndroidX.testMonitor}" - const val testRunner = - "androidx.test:runner:${Versions.AndroidX.testRunner}" - const val testRules = - "androidx.test:rules:${Versions.AndroidX.test}" + const val testCore = "androidx.test:core:${Versions.AndroidX.test}" + const val testMonitor = "androidx.test:monitor:${Versions.AndroidX.testMonitor}" + const val testRunner = "androidx.test:runner:${Versions.AndroidX.testRunner}" + const val testRules = "androidx.test:rules:${Versions.AndroidX.test}" const val testUiAutomator = "androidx.test.uiautomator:uiautomator:${Versions.AndroidX.uiautomator}" const val testOrchestrator = @@ -37,25 +41,27 @@ object Dependencies { } object Compose { - const val destinations = "io.github.raamcosta.compose-destinations:core:${Versions.Compose.destinations}" - const val destinationsKsp = "io.github.raamcosta.compose-destinations:ksp:${Versions.Compose.destinations}" const val constrainLayout = "androidx.constraintlayout:constraintlayout-compose:${Versions.Compose.constrainLayout}" + const val destinations = + "io.github.raamcosta.compose-destinations:core:${Versions.Compose.destinations}" + const val destinationsKsp = + "io.github.raamcosta.compose-destinations:ksp:${Versions.Compose.destinations}" const val foundation = "androidx.compose.foundation:foundation:${Versions.Compose.foundation}" - const val junit = "androidx.compose.ui:ui-test-junit4:${Versions.Compose.base}" + const val junit5 = "de.mannodermaus.junit5:android-test-compose:${Versions.Android.junit}" const val material3 = "androidx.compose.material3:material3:${Versions.Compose.material3}" const val testManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}" + const val ui = "androidx.compose.ui:ui:${Versions.Compose.base}" const val uiController = "com.google.accompanist:accompanist-systemuicontroller:${Versions.Compose.uiController}" - const val ui = "androidx.compose.ui:ui:${Versions.Compose.base}" - const val uiUtil = "androidx.compose.ui:ui-util:${Versions.Compose.base}" + const val uiTestManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}" const val uiTooling = "androidx.compose.ui:ui-tooling:${Versions.Compose.base}" - const val uiToolingPreview = - "androidx.compose.ui:ui-tooling-preview:${Versions.Compose.base}" const val uiToolingAndroidPreview = "androidx.compose.ui:ui-tooling-preview-android:${Versions.Compose.base}" - + const val uiToolingPreview = + "androidx.compose.ui:ui-tooling-preview:${Versions.Compose.base}" + const val uiUtil = "androidx.compose.ui:ui-util:${Versions.Compose.base}" } object Koin { @@ -111,17 +117,18 @@ object Dependencies { const val androidApplicationId = "com.android.application" const val androidLibraryId = "com.android.library" const val androidTestId = "com.android.test" - const val playPublisher = - "com.github.triplet.gradle:play-publisher:${Versions.Plugin.playPublisher}" - const val playPublisherId = "com.github.triplet.play" - const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" - const val kotlinAndroidId = "kotlin-android" - const val kotlinParcelizeId = "kotlin-parcelize" const val dependencyCheck = "org.owasp:dependency-check-gradle:${Versions.Plugin.dependencyCheck}" const val dependencyCheckId = "org.owasp.dependencycheck" const val gradleVersionsId = "com.github.ben-manes.versions" - const val ktfmtId = "com.ncorti.ktfmt.gradle" + const val junit5 = "de.mannodermaus.android-junit5" + const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}" + const val kotlinAndroidId = "kotlin-android" + const val kotlinParcelizeId = "kotlin-parcelize" const val ksp = "com.google.devtools.ksp" + const val ktfmtId = "com.ncorti.ktfmt.gradle" + const val playPublisher = + "com.github.triplet.gradle:play-publisher:${Versions.Plugin.playPublisher}" + const val playPublisherId = "com.github.triplet.play" } } diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index fede1556f7..dc5c5d923b 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -1,7 +1,7 @@ object Versions { const val commonsValidator = "1.7" const val jodaTime = "2.12.5" - const val junit = "4.13.2" + const val junit = "5.10.0" const val jvmTarget = "17" const val konsist = "0.13.0" const val kotlin = "1.9.20" @@ -15,6 +15,7 @@ object Versions { object Android { const val compileSdkVersion = 34 + const val junit = "1.4.0" const val minSdkVersion = 26 const val targetSdkVersion = 34 const val volley = "1.2.1" @@ -52,6 +53,7 @@ object Versions { const val playPublisher = "3.8.4" const val dependencyCheck = "8.3.1" const val gradleVersions = "0.47.0" + const val junit5 = "1.10.0.0" const val ktfmt = "0.13.0" // Ksp version is linked with kotlin version, find matching release here: // https://github.com/google/ksp/releases |
