Merge pull request #180 from EnderErol/add-junit5-dependency

Add junit5 dependency
badoo · Feb 9, 2023 · e6be8fe · e6be8fe
2 parents cc29395 + 277303d
commit e6be8fe
Show file tree

Hide file tree

Showing 24 changed files with 335 additions and 355 deletions.
diff --git a/binder/build.gradle b/binder/build.gradle
@@ -11,8 +11,9 @@ dependencies {
     implementation libs.rxkotlin
     implementation libs.kotlin.stdlib
 
-    testImplementation libs.junit
-    testImplementation libs.kotlin.test.junit
+    testImplementation libs.junit5
+    testImplementation libs.junit.params
+    testImplementation libs.junit.platform.launcher
     testImplementation libs.mockito.kotlin
 }
 
@@ -24,3 +25,7 @@ compileKotlin {
         jvmTarget = JavaVersion.VERSION_11
     }
 }
+
+test {
+    useJUnitPlatform()
+}
diff --git a/binder/src/test/java/com/badoo/binder/BinderTest.kt b/binder/src/test/java/com/badoo/binder/BinderTest.kt
@@ -4,7 +4,7 @@ import com.badoo.binder.connector.Connector
 import io.reactivex.Observable
 import io.reactivex.ObservableSource
 import io.reactivex.subjects.PublishSubject
-import org.junit.Test
+import org.junit.jupiter.api.Test
 
 class BinderTest {
 

diff --git a/binder/src/test/java/com/badoo/binder/LifecycleTest.kt b/binder/src/test/java/com/badoo/binder/LifecycleTest.kt
@@ -5,13 +5,12 @@ import com.badoo.binder.lifecycle.ManualLifecycle
 import io.reactivex.ObservableSource
 import io.reactivex.functions.Consumer
 import io.reactivex.subjects.PublishSubject
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 
-
 class LifecycleTest {
 
     private val lifecycle: ManualLifecycle = Lifecycle.manual()

diff --git a/binder/src/test/java/com/badoo/binder/TestConsumer.kt b/binder/src/test/java/com/badoo/binder/TestConsumer.kt
@@ -1,7 +1,7 @@
 package com.badoo.binder
 
 import io.reactivex.functions.Consumer
-import kotlin.test.assertEquals
+import org.junit.jupiter.api.Assertions.assertEquals
 
 class TestConsumer<T> : Consumer<T> {
     val values = mutableListOf<T>()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,6 +29,8 @@ gsonVersion = "2.8.5"
 
 # Testing
 junitVersion = "4.12"
+junit5Version = "5.9.2"
+junitPlatformLauncherVersion = "1.9.2"
 supportTestVersion = "1.3.0"
 mockitoKotlinVersion = "4.0.0"
 
@@ -81,6 +83,9 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gsonVersion" }
 
 # Testing
 junit = { module = "junit:junit", version.ref = "junitVersion" }
+junit5 = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5Version" }
+junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version = "junit5Version"}
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junitPlatformLauncherVersion" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" }
 mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlinVersion" }
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "supportTestVersion" }

diff --git a/mvicore-android/build.gradle b/mvicore-android/build.gradle
@@ -34,6 +34,15 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11
     }
+
+    testOptions {
+        unitTests {
+            all {
+                useJUnitPlatform()
+            }
+        }
+    }
+
 }
 
 dependencies {
@@ -45,8 +54,11 @@ dependencies {
     implementation libs.rxkotlin
     implementation libs.rxandroid
 
-    testImplementation libs.junit
-    testImplementation libs.kotlin.test.junit
+    testImplementation libs.junit5
+    testImplementation libs.junit.params
+    testImplementation libs.junit.platform.launcher
+
+    androidTestImplementation libs.junit
     androidTestImplementation libs.androidx.test.runner
     androidTestImplementation libs.androidx.test.rules