Skip to content

Commit 33a7848

Browse files
committed
Fix unit tests
1 parent 57f7dcc commit 33a7848

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package tools.jackson.module.kotlin.test
33
import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonFormat
55
import com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING
6-
import tools.jackson.databind.SerializationFeature
76
import tools.jackson.databind.json.JsonMapper
87
import tools.jackson.module.kotlin.KotlinFeature
98
import tools.jackson.module.kotlin.kotlinModule
109
import tools.jackson.module.kotlin.readValue
1110
import org.junit.jupiter.api.Test
11+
import tools.jackson.databind.cfg.DateTimeFeature
1212
import java.time.Instant
1313
import kotlin.test.assertContentEquals
1414
import kotlin.test.assertEquals
@@ -24,7 +24,7 @@ class DurationTests {
2424
@Test
2525
fun `should serialize Kotlin duration using Java time module`() {
2626
val mapper = mapperBuilder
27-
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
27+
.disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
2828
.build()
2929

3030
val result = mapper.writeValueAsString(1.hours)
@@ -44,7 +44,7 @@ class DurationTests {
4444
@Test
4545
fun `should serialize Kotlin duration inside list using Java time module`() {
4646
val mapper = mapperBuilder
47-
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
47+
.disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
4848
.build()
4949

5050
val result = mapper.writeValueAsString(listOf(1.hours, 2.hours, 3.hours))
@@ -64,7 +64,7 @@ class DurationTests {
6464
@Test
6565
fun `should serialize Kotlin duration inside map using Java time module`() {
6666
val mapper = mapperBuilder
67-
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
67+
.disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
6868
.build()
6969

7070
val result = mapper.writeValueAsString(
@@ -109,8 +109,8 @@ class DurationTests {
109109
@Test
110110
fun `should serialize Kotlin duration inside data class using Java time module`() {
111111
val mapper = mapperBuilder
112-
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
113-
.disable(SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
112+
.disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
113+
.disable(DateTimeFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
114114
.build()
115115

116116
val result = mapper.writeValueAsString(Meeting(Instant.parse("2023-06-20T14:00:00Z"), 1.5.hours))
@@ -143,7 +143,7 @@ class DurationTests {
143143
@Test
144144
fun `should serialize Kotlin duration inside data class using Java time module and mixin`() {
145145
val mapper = mapperBuilder
146-
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
146+
.disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
147147
.addMixIn(Meeting::class.java, MeetingMixin::class.java)
148148
.build()
149149

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import com.fasterxml.jackson.annotation.JsonCreator
44
import com.fasterxml.jackson.annotation.JsonIgnore
55
import com.fasterxml.jackson.annotation.JsonProperty
66
import tools.jackson.databind.PropertyNamingStrategies
7-
import tools.jackson.databind.SerializationFeature
87
import tools.jackson.module.kotlin.*
98
import tools.jackson.databind.MapperFeature
109
import org.junit.jupiter.api.Test
1110
import tools.jackson.databind.DeserializationFeature
11+
import tools.jackson.databind.cfg.DateTimeFeature
1212
import java.io.StringWriter
1313
import java.util.*
1414
import kotlin.properties.Delegates
@@ -49,11 +49,11 @@ class ParameterNameTests {
4949

5050
private val normalCasedMapper = jacksonMapperBuilder()
5151
.enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
52-
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
52+
.disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
5353
.build()
5454

5555
private val pascalCasedMapper = jacksonMapperBuilder()
56-
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
56+
.disable(DateTimeFeature.WRITE_DATES_AS_TIMESTAMPS)
5757
.propertyNamingStrategy(PropertyNamingStrategies.UPPER_CAMEL_CASE)
5858
.build()
5959

0 commit comments

Comments
 (0)