Merge remote-tracking branch 'FasterXML/2.19'

Author: k163377

pom.xml

@@ -111,15 +111,26 @@
 
         <!-- only for testing... -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit</artifactId>
             <version>${version.kotlin}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>tools.jackson.dataformat</groupId>

release-notes/CREDITS-2.x

@@ -18,6 +18,7 @@ Contributors:
 # 2.19.0 (not yet released)
 
 WrongWrong (@k163377)
+* #866: Upgrade to JUnit5
 * #861: Update Kotlin to 1.9.24
 * #858: Refactor findDefaultCreator
 * #839: Remove useKotlinPropertyNameForGetter and unify with kotlinPropertyNameAsImplicitName

src/test/kotlin/tools/jackson/module/kotlin/ArgumentBucketTest.kt

@@ -1,27 +1,31 @@
 package tools.jackson.module.kotlin
 
 import com.fasterxml.jackson.annotation.JsonCreator
-import org.junit.Ignore
-import org.junit.experimental.runners.Enclosed
-import org.junit.runner.RunWith
+import org.junit.jupiter.api.Nested
 import kotlin.reflect.KFunction
 import kotlin.reflect.full.functions
 import kotlin.reflect.full.hasAnnotation
-import kotlin.test.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
-
-@RunWith(Enclosed::class)
 class ArgumentBucketTest {
-    class Normal {
-        @Ignore
-        data class Constructor(val foo: String, val bar: String)
+    data class Constructor(val foo: String, val bar: String)
+
+    data class Method(val foo: String, val bar: String) {
+        companion object {
+            @JvmStatic
+            @JsonCreator
+            fun of(foo: String, bar: String): Method = Method(foo, bar)
+        }
+    }
 
+    @Nested
+    inner class Normal {
         @Test
         fun constructorTest() {
-            val function: KFunction<*> = Normal::Constructor
+            val function: KFunction<*> = ::Constructor
             val params = function.parameters
             val generator = BucketGenerator.forConstructor(params.size)
             val bucket = generator.generate()
@@ -45,15 +49,6 @@ class ArgumentBucketTest {
             assertEquals("bar", bucket[params[1]])
         }
 
-        @Ignore
-        data class Method(val foo: String, val bar: String) {
-            companion object {
-                @JvmStatic
-                @JsonCreator
-                fun of(foo: String, bar: String): Method = Method(foo, bar)
-            }
-        }
-
         @Test
         fun methodTest() {
             val function: KFunction<*> = Method.Companion::class.functions.first { it.hasAnnotation<JsonCreator>() }

src/test/kotlin/tools/jackson/module/kotlin/DslTest.kt

@@ -7,8 +7,8 @@ import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection
 import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyMap
 import tools.jackson.module.kotlin.KotlinFeature.SingletonSupport
 import tools.jackson.module.kotlin.KotlinFeature.StrictNullChecks
-import org.junit.Assert.assertNotNull
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue

src/test/kotlin/tools/jackson/module/kotlin/JDKSerializabilityTestHelper.kt

@@ -1,6 +1,6 @@
 package tools.jackson.module.kotlin
 
-import junit.framework.TestCase
+import org.junit.jupiter.api.Assertions.fail
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.ObjectInputStream
@@ -14,14 +14,13 @@ fun jdkSerialize(o: Any): ByteArray {
     return bytes.toByteArray()
 }
 
-fun <T> jdkDeserialize(raw: ByteArray): T? {
+fun <T> jdkDeserialize(raw: ByteArray): T {
     val objIn = ObjectInputStream(ByteArrayInputStream(raw))
     return try {
         @Suppress("UNCHECKED_CAST")
         objIn.readObject() as T
     } catch (e: ClassNotFoundException) {
-        TestCase.fail("Missing class: " + e.message)
-        null
+        fail("Missing class: " + e.message)
     } finally {
         objIn.close()
     }

src/test/kotlin/tools/jackson/module/kotlin/KotlinInstantiatorsTest.kt

@@ -1,10 +1,8 @@
 package tools.jackson.module.kotlin
 
 import tools.jackson.databind.deser.std.StdValueInstantiator
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertThrows
-import org.junit.Assert.assertTrue
-import org.junit.Test
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Test
 
 class KotlinInstantiatorsTest {
     private val mapper = jacksonObjectMapper()

src/test/kotlin/tools/jackson/module/kotlin/KotlinModuleTest.kt

@@ -1,11 +1,11 @@
 package tools.jackson.module.kotlin
 
 import tools.jackson.module.kotlin.KotlinFeature.*
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-import org.junit.Test
 import tools.jackson.databind.json.JsonMapper
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
 import kotlin.test.assertNotNull
 
 class KotlinModuleTest {

src/test/kotlin/tools/jackson/module/kotlin/MissingKotlinParameterExceptionTest.kt

@@ -1,6 +1,6 @@
 package tools.jackson.module.kotlin
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 

src/test/kotlin/tools/jackson/module/kotlin/ReflectionCacheTest.kt

@@ -1,6 +1,6 @@
 package tools.jackson.module.kotlin
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import kotlin.test.assertNotNull
 
 class ReflectionCacheTest {

src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/JacksonInjectTest.kt

@@ -1,13 +1,13 @@
 package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass
 
 import com.fasterxml.jackson.annotation.JacksonInject
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertThrows
-import org.junit.Test
 import tools.jackson.databind.InjectableValues
 import tools.jackson.databind.MapperFeature
 import tools.jackson.module.kotlin.jacksonMapperBuilder
 import tools.jackson.module.kotlin.jacksonObjectMapper
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Test
 
 class JacksonInjectTest {
     // This is specified as a getter because there is a possibility of problems if it is assigned to a field.