Skip to content

Commit 0dddca3

Browse files
committed
Adjusted tests to change configuration defaults in 3.0
1 parent 50eb824 commit 0dddca3

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinModuleTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class KotlinModuleTest {
4646
enable(NullToEmptyMap)
4747
enable(NullIsSameAsDefault)
4848
enable(SingletonSupport)
49-
enable(StrictNullChecks)
49+
enable(NewStrictNullChecks)
5050
enable(KotlinPropertyNameAsImplicitName)
5151
enable(UseJavaDurationConversion)
5252
}.build()
@@ -100,7 +100,7 @@ class KotlinModuleTest {
100100
@Test
101101
fun builder_EnableStrictNullChecks() {
102102
val module = KotlinModule.Builder().apply {
103-
enable(StrictNullChecks)
103+
enable(NewStrictNullChecks)
104104
}.build()
105105

106106
assertTrue(module.strictNullChecks)
@@ -114,7 +114,7 @@ class KotlinModuleTest {
114114
enable(NullToEmptyMap)
115115
enable(NullIsSameAsDefault)
116116
enable(SingletonSupport)
117-
enable(StrictNullChecks)
117+
enable(NewStrictNullChecks)
118118
}.build()
119119

120120
val serialized = jdkSerialize(module)

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/StrictNullChecksTestOld.kt

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.fasterxml.jackson.module.kotlin.test
22

3-
import com.fasterxml.jackson.databind.ObjectMapper
4-
import com.fasterxml.jackson.module.kotlin.KotlinFeature.StrictNullChecks
3+
import com.fasterxml.jackson.module.kotlin.KotlinFeature
54
import com.fasterxml.jackson.module.kotlin.MissingKotlinParameterException
6-
import com.fasterxml.jackson.module.kotlin.kotlinModule
5+
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
76
import com.fasterxml.jackson.module.kotlin.readValue
87
import org.junit.jupiter.api.Assertions.assertArrayEquals
98
import org.junit.jupiter.api.Assertions.assertEquals
@@ -13,7 +12,10 @@ import org.junit.jupiter.api.assertThrows
1312
import kotlin.test.assertNull
1413

1514
class StrictNullChecksTestOld {
16-
private val mapper = ObjectMapper().registerModule(kotlinModule { enable(StrictNullChecks) })
15+
private val mapper = jacksonObjectMapper {
16+
disable(KotlinFeature.NewStrictNullChecks)
17+
enable(KotlinFeature.StrictNullChecks)
18+
}
1719

1820
/** collection tests */
1921

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub757.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class GitHub757 {
1111
@Test
1212
fun test() {
1313
val kotlinModule = KotlinModule.Builder()
14-
.enable(KotlinFeature.StrictNullChecks)
14+
.enable(KotlinFeature.NewStrictNullChecks)
1515
.build()
1616
val mapper = JsonMapper.builder()
1717
.addModule(kotlinModule)

0 commit comments

Comments
 (0)