WiP bump Junit

buchner · Nov 14, 2024 · 3d68849 · 3d68849
1 parent 389d588
commit 3d68849
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 13 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -3,14 +3,12 @@ import org.gradle.api.artifacts.dsl.DependencyHandler
 object Libraries {
     internal object Versions {
         const val hamcrest = "2.2"
-        const val junit = "5.6.2"
         const val kotlin = "1.5.0"
         const val logback = "1.2.3"
     }
 
     const val hamcrest = "org.hamcrest:hamcrest:${Versions.hamcrest}"
     const val hamcrestLibrary = "org.hamcrest:hamcrest-library:${Versions.hamcrest}"
-    const val junitApi = "org.junit.jupiter:junit-jupiter-api:${Versions.junit}"
     const val kotlinReflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin}"
 }
 
@@ -21,7 +19,6 @@ object TestLibraries {
 
     const val hamcrest = Libraries.hamcrest
     const val hamcrestLibrary = Libraries.hamcrestLibrary
-    const val junitJupiter = "org.junit.jupiter:junit-jupiter:${Libraries.Versions.junit}"
     const val kotestRunner = "io.kotest:kotest-runner-junit5-jvm:${Versions.kotest}"
     const val kotestProperty = "io.kotest:kotest-property:${Versions.kotest}"
     const val kotestAssert = "io.kotest:kotest-assertions-core:${Versions.kotest}"

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
-    testImplementation(TestLibraries.junitJupiter)
+    testImplementation(libs.junit.jupiter)
     testImplementHamcrest()
     testImplementation(TestLibraries.kotlinReflect)
     testImplementKotest()

diff --git a/java-demo/build.gradle.kts b/java-demo/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     testImplementation(project(":hamcrest-support"))
     testImplementation(project(":slf4j-logback"))
     testImplementHamcrest()
-    testImplementation(TestLibraries.junitJupiter)
+    testImplementation(libs.junit.jupiter)
 }
 
 tasks.test { configure<JacocoTaskExtension> { isEnabled = false } }
diff --git a/junit5-support/build.gradle.kts b/junit5-support/build.gradle.kts
@@ -9,8 +9,8 @@ plugins {
 dependencies {
     implementation(project(":core"))
     implementation(kotlin("stdlib-jdk8"))
-    implementation(Libraries.junitApi)
-    testImplementation(TestLibraries.junitJupiter)
+    implementation(libs.junit.jupiterapi)
+    testImplementation(libs.junit.jupiter)
     testImplementHamcrest()
     testImplementation(TestLibraries.kotlinReflect)
     testImplementKotest()

diff --git a/junit5-support/src/test/kotlin/net/torommo/logspy/LogSpyExtensionTest.kt b/junit5-support/src/test/kotlin/net/torommo/logspy/LogSpyExtensionTest.kt
@@ -6,12 +6,10 @@ import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.TestInstance.Lifecycle
 import org.junit.jupiter.api.assertThrows
-import org.junit.jupiter.api.extension.ExtensionContext
+import org.junit.jupiter.api.extension.*
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace
 import org.junit.jupiter.api.extension.ExtensionContext.Store
-import org.junit.jupiter.api.extension.ParameterContext
-import org.junit.jupiter.api.extension.ParameterResolutionException
-import org.junit.jupiter.api.extension.TestInstances
+import org.junit.jupiter.api.parallel.ExecutionMode
 import org.junit.platform.commons.util.AnnotationUtils
 import java.lang.reflect.AnnotatedElement
 import java.lang.reflect.Method
@@ -215,6 +213,22 @@ internal class LogSpyExtensionTest : FreeSpec() {
         ExtensionContext {
         private val stores = mutableMapOf<Namespace, Store>()
 
+        override fun <T : Any?> getConfigurationParameter(
+            key: String?,
+            transformer: Function<String, T>?
+        ): Optional<T> {
+            return Optional.empty<T & Any>()
+        }
+
+        override fun getExecutionMode(): ExecutionMode {
+            return ExecutionMode.SAME_THREAD
+        }
+
+        // TODO continue here
+        override fun getExecutableInvoker(): ExecutableInvoker {
+            TODO("Not yet implemented")
+        }
+
         override fun getElement(): Optional<AnnotatedElement> {
             return Optional.empty()
         }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,6 +2,9 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             plugin("ktlint", "org.jlleitschuh.gradle.ktlint").version("12.1.1")
+            version("junit", "5.11.3")
+            library("junit-jupiterapi", "org.junit.jupiter", "junit-jupiter-api").versionRef("junit")
+            library("junit-jupiter", "org.junit.jupiter", "junit-jupiter").versionRef("junit")
             version("logback", "1.3.14")
             library("logback-core", "ch.qos.logback", "logback-core").versionRef("logback")
             library("logback-classic", "ch.qos.logback", "logback-classic").versionRef("logback")

diff --git a/slf4j-logback/build.gradle.kts b/slf4j-logback/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     implementation(libs.logback.core)
     testImplementation(project(":testing"))
     testImplementation(project(":hamcrest-support"))
-    testImplementation(TestLibraries.junitJupiter)
+    testImplementation(libs.junit.jupiter)
     testImplementHamcrest()
     testImplementKotest()
 }
diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     implementation(project(":junit5-support"))
     implementation(kotlin("stdlib-jdk8"))
     implementation(project(":hamcrest-support"))
-    implementation(TestLibraries.junitJupiter)
+    implementation(libs.junit.jupiter)
     implementation(TestLibraries.hamcrest)
     implementation(TestLibraries.hamcrestLibrary)
     implementation(libs.slf4j)