Skip to content

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

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

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
44
import com.fasterxml.jackson.databind.SerializationFeature
55
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
66
import com.fasterxml.jackson.module.kotlin.readValue
7-
import org.hamcrest.CoreMatchers.equalTo
8-
import org.hamcrest.MatcherAssert.assertThat
7+
import org.junit.jupiter.api.Assertions.assertEquals
98
import org.junit.jupiter.api.Test
109

1110
class TestJacksonWithKotlinBuiltins {
@@ -17,9 +16,9 @@ class TestJacksonWithKotlinBuiltins {
1716
val json = """{"name":{"first":"John","second":"Smith"},"age":30}"""
1817
val expected = ClassWithPair(Pair("John", "Smith"), 30)
1918

20-
assertThat(mapper.writeValueAsString(expected), equalTo(json))
19+
assertEquals(json, mapper.writeValueAsString(expected))
2120
val stateObj = mapper.readValue<ClassWithPair>(json)
22-
assertThat(stateObj, equalTo(expected))
21+
assertEquals(expected, stateObj)
2322
}
2423

2524
private data class ClassWithPairMixedTypes(val person: Pair<String, Int>)
@@ -28,9 +27,9 @@ class TestJacksonWithKotlinBuiltins {
2827
val json = """{"person":{"first":"John","second":30}}"""
2928
val expected = ClassWithPairMixedTypes(Pair("John", 30))
3029

31-
assertThat(mapper.writeValueAsString(expected), equalTo(json))
30+
assertEquals(json, mapper.writeValueAsString(expected))
3231
val stateObj = mapper.readValue<ClassWithPairMixedTypes>(json)
33-
assertThat(stateObj, equalTo(expected))
32+
assertEquals(expected, stateObj)
3433
}
3534

3635
private data class ClassWithTriple(val name: Triple<String, String, String>, val age: Int)
@@ -39,9 +38,9 @@ class TestJacksonWithKotlinBuiltins {
3938
val json = """{"name":{"first":"John","second":"Davey","third":"Smith"},"age":30}"""
4039
val expected = ClassWithTriple(Triple("John", "Davey", "Smith"), 30)
4140

42-
assertThat(mapper.writeValueAsString(expected), equalTo(json))
41+
assertEquals(json, mapper.writeValueAsString(expected))
4342
val stateObj = mapper.readValue<ClassWithTriple>(json)
44-
assertThat(stateObj, equalTo(expected))
43+
assertEquals(expected, stateObj)
4544
}
4645

4746
private data class ClassWithRanges(val ages: IntRange, val distance: LongRange)
@@ -50,9 +49,9 @@ class TestJacksonWithKotlinBuiltins {
5049
val json = """{"ages":{"start":18,"end":40},"distance":{"start":5,"end":50}}"""
5150
val expected = ClassWithRanges(IntRange(18, 40), LongRange(5, 50))
5251

53-
assertThat(mapper.writeValueAsString(expected), equalTo(json))
52+
assertEquals(json, mapper.writeValueAsString(expected))
5453
val stateObj = mapper.readValue<ClassWithRanges>(json)
55-
assertThat(stateObj, equalTo(expected))
54+
assertEquals(expected, stateObj)
5655
}
5756

5857
private data class ClassWithPairMixedNullableTypes(val person: Pair<String?, Int?>)
@@ -61,20 +60,20 @@ class TestJacksonWithKotlinBuiltins {
6160
val json = """{"person":{"first":"John","second":null}}"""
6261
val expected = ClassWithPairMixedNullableTypes(Pair("John", null))
6362

64-
assertThat(mapper.writeValueAsString(expected), equalTo(json))
63+
assertEquals(json, mapper.writeValueAsString(expected))
6564
val stateObj = mapper.readValue<ClassWithPairMixedNullableTypes>(json)
66-
assertThat(stateObj, equalTo(expected))
65+
assertEquals(expected, stateObj)
6766
}
6867

69-
private data class GenericParametersClass<A, B: Any>(val one: A, val two: B)
68+
private data class GenericParametersClass<A, B : Any>(val one: A, val two: B)
7069
private data class GenericParameterConsumer(val thing: GenericParametersClass<String?, Int>)
7170

7271
@Test fun testGenericParametersInConstructor() {
7372
val json = """{"thing":{"one":null,"two":123}}"""
7473
val expected = GenericParameterConsumer(GenericParametersClass(null, 123))
7574

76-
assertThat(mapper.writeValueAsString(expected), equalTo(json))
75+
assertEquals(json, mapper.writeValueAsString(expected))
7776
val stateObj = mapper.readValue<GenericParameterConsumer>(json)
78-
assertThat(stateObj, equalTo(expected))
77+
assertEquals(expected, stateObj)
7978
}
8079
}

0 commit comments

Comments
 (0)