Skip to content

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

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

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ import com.fasterxml.jackson.module.kotlin.minusAssign
1414
import com.fasterxml.jackson.module.kotlin.plusAssign
1515
import com.fasterxml.jackson.module.kotlin.readValue
1616
import com.fasterxml.jackson.module.kotlin.treeToValue
17-
import org.hamcrest.CoreMatchers.`is`
18-
import org.hamcrest.CoreMatchers.equalTo
19-
import org.hamcrest.MatcherAssert.assertThat
17+
import org.junit.jupiter.api.Assertions.assertEquals
18+
import org.junit.jupiter.api.Assertions.assertTrue
2019
import org.junit.jupiter.api.Test
2120

22-
class TestExtensionMethods {
21+
private class TestExtensionMethods {
2322
val mapper: ObjectMapper = jacksonObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, false)
2423

2524
data class BasicPerson(val name: String, val age: Int)
@@ -33,17 +32,17 @@ class TestExtensionMethods {
3332

3433
val expectedPerson = BasicPerson("John Smith", 30)
3534

36-
assertThat(inferRightSide, equalTo(expectedPerson))
37-
assertThat(inferLeftSide, equalTo(expectedPerson))
38-
assertThat(person, equalTo(expectedPerson))
35+
assertEquals(expectedPerson, inferRightSide)
36+
assertEquals(expectedPerson, inferLeftSide)
37+
assertEquals(expectedPerson, person)
3938
}
4039

4140
data class MyData(val a: String, val b: Int)
4241

4342
@Test fun testStackOverflow33368328() {
4443
val jsonStr = """[{"a": "value1", "b": 1}, {"a": "value2", "b": 2}]"""
4544
val myList: List<MyData> = mapper.readValue(jsonStr)
46-
assertThat(myList, equalTo(listOf(MyData("value1", 1), MyData("value2", 2))))
45+
assertEquals(listOf(MyData("value1", 1), MyData("value2", 2)), myList)
4746
}
4847

4948
@Test fun testOperatorFunExtensions() {
@@ -56,8 +55,8 @@ class TestExtensionMethods {
5655
objectNode -= "foo1"
5756
objectNode -= listOf("foo2")
5857

59-
assertThat("foo1" !in objectNode, `is`(true))
60-
assertThat("foo3" in objectNode, `is`(true))
58+
assertTrue("foo1" !in objectNode)
59+
assertTrue("foo3" in objectNode)
6160

6261
val arrayNode = factory.arrayNode()
6362
arrayNode += "foo"
@@ -66,35 +65,34 @@ class TestExtensionMethods {
6665
arrayNode += 1.0
6766
arrayNode += "bar".toByteArray()
6867

69-
assertThat(arrayNode.size(), `is`(5))
68+
assertEquals(5, arrayNode.size())
7069

7170
(4 downTo 0).forEach { arrayNode -= it }
72-
assertThat(arrayNode.size(), `is`(0))
71+
assertEquals(0, arrayNode.size())
7372
}
7473

75-
@Test fun noTypeErasure(){
74+
@Test fun noTypeErasure() {
7675
data class Person(val name: String)
7776
val source = """[ { "name" : "Neo" } ]"""
7877
val tree = mapper.readTree(source)
7978

8079
val readValueResult: List<Person> = mapper.readValue(source)
81-
assertThat(readValueResult, `is`(listOf(Person("Neo"))))
80+
assertEquals(listOf(Person("Neo")), readValueResult)
8281

8382
val treeToValueResult: List<Person> = mapper.treeToValue(tree)
84-
assertThat(treeToValueResult, `is`(listOf(Person("Neo"))))
83+
assertEquals(listOf(Person("Neo")), treeToValueResult)
8584

8685
val convertValueResult: List<Person> = mapper.convertValue(tree)
87-
assertThat(convertValueResult, `is`(listOf(Person("Neo"))))
86+
assertEquals(listOf(Person("Neo")), convertValueResult)
8887
}
8988

9089
@Test fun mixInExtensionTest() {
91-
9290
data class Person(val name: String)
9391
abstract class PersonMixIn { @JsonIgnore var name: String = "" }
9492

9593
val mapper: JsonMapper = jsonMapper { addMixIn<Person, PersonMixIn>() }
9694
val serializedPerson: String = mapper.writeValueAsString(Person("test"))
9795

98-
assertThat(serializedPerson, `is`("{}"))
96+
assertEquals("{}", serializedPerson)
9997
}
10098
}

0 commit comments

Comments
 (0)