diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt index 3c90dba06..5a7e7de79 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt @@ -46,7 +46,7 @@ class KotlinModuleTest { enable(NullToEmptyMap) enable(NullIsSameAsDefault) enable(SingletonSupport) - enable(StrictNullChecks) + enable(NewStrictNullChecks) enable(KotlinPropertyNameAsImplicitName) enable(UseJavaDurationConversion) }.build() @@ -100,7 +100,7 @@ class KotlinModuleTest { @Test fun builder_EnableStrictNullChecks() { val module = KotlinModule.Builder().apply { - enable(StrictNullChecks) + enable(NewStrictNullChecks) }.build() assertTrue(module.strictNullChecks) @@ -114,7 +114,7 @@ class KotlinModuleTest { enable(NullToEmptyMap) enable(NullIsSameAsDefault) enable(SingletonSupport) - enable(StrictNullChecks) + enable(NewStrictNullChecks) }.build() val serialized = jdkSerialize(module) diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/StrictNullChecksTestOld.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/StrictNullChecksTestOld.kt index bbb15895e..ec82ee926 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/StrictNullChecksTestOld.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/StrictNullChecksTestOld.kt @@ -1,9 +1,8 @@ package com.fasterxml.jackson.module.kotlin.test -import com.fasterxml.jackson.databind.ObjectMapper -import com.fasterxml.jackson.module.kotlin.KotlinFeature.StrictNullChecks +import com.fasterxml.jackson.module.kotlin.KotlinFeature import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException -import com.fasterxml.jackson.module.kotlin.kotlinModule +import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertArrayEquals import org.junit.jupiter.api.Assertions.assertEquals @@ -13,7 +12,10 @@ import org.junit.jupiter.api.assertThrows import kotlin.test.assertNull class StrictNullChecksTestOld { - private val mapper = ObjectMapper().registerModule(kotlinModule { enable(StrictNullChecks) }) + private val mapper = jacksonObjectMapper { + disable(KotlinFeature.NewStrictNullChecks) + enable(KotlinFeature.StrictNullChecks) + } /** collection tests */ diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub757.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub757.kt index f9c00f50a..0245c9b85 100644 --- a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub757.kt +++ b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub757.kt @@ -11,7 +11,7 @@ class GitHub757 { @Test fun test() { val kotlinModule = KotlinModule.Builder() - .enable(KotlinFeature.StrictNullChecks) + .enable(KotlinFeature.NewStrictNullChecks) .build() val mapper = JsonMapper.builder() .addModule(kotlinModule)