Skip to content

File tree

1 file changed

+12
-16
lines changed

1 file changed

+12
-16
lines changed

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

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
66
import com.fasterxml.jackson.databind.PropertyNamingStrategies
77
import com.fasterxml.jackson.databind.SerializationFeature
88
import com.fasterxml.jackson.module.kotlin.*
9-
import org.hamcrest.CoreMatchers.equalTo
10-
import org.hamcrest.MatcherAssert.assertThat
119
import org.junit.jupiter.api.Test
1210
import java.io.StringWriter
1311
import java.util.*
@@ -35,12 +33,12 @@ class TestJacksonWithKotlin {
3533
createDtField: Date = createdDt,
3634
isNameField: Boolean = isName,
3735
) {
38-
assertThat(nameField, equalTo("Frank"))
39-
assertThat(ageField, equalTo(30))
40-
assertThat(addressField, equalTo("something here"))
41-
assertThat(wrongNameField, equalTo(true))
42-
assertThat(createDtField, equalTo(Date(1477419948000)))
43-
assertThat(isNameField, equalTo(false))
36+
assertEquals("Frank", nameField)
37+
assertEquals(30, ageField)
38+
assertEquals("something here", addressField)
39+
assertEquals(true, wrongNameField)
40+
assertEquals(Date(1477419948000), createDtField)
41+
assertFalse(isNameField)
4442
}
4543
}
4644

@@ -117,7 +115,7 @@ class TestJacksonWithKotlin {
117115
val test1out = StringWriter()
118116
normalCasedMapper.writeValue(test1out, stateObj)
119117

120-
assertThat(test1out.getBuffer().toString(), equalTo(normalCasedJson))
118+
assertEquals(normalCasedJson, test1out.getBuffer().toString())
121119
}
122120

123121
// ==================
@@ -138,7 +136,7 @@ class TestJacksonWithKotlin {
138136
stateObj.validate()
139137

140138
val test1out = normalCasedMapper.writeValueAsString(stateObj)
141-
assertThat(test1out, equalTo(normalCasedJson))
139+
assertEquals(normalCasedJson, test1out)
142140
}
143141

144142
// ==================
@@ -206,7 +204,7 @@ class TestJacksonWithKotlin {
206204
stateObj.validate()
207205

208206
val test1out = pascalCasedMapper.writeValueAsString(stateObj)
209-
assertThat(test1out, equalTo(pascalCasedJson))
207+
assertEquals(pascalCasedJson, test1out)
210208
}
211209

212210
private class HasSameParamNameConstructor(val value: Int) {
@@ -250,7 +248,7 @@ class TestJacksonWithKotlin {
250248
@Test fun findingFactoryMethod() {
251249
val stateObj = normalCasedMapper.readValue(normalCasedJson, StateObjectWithFactory::class.java)
252250
stateObj.validate()
253-
assertThat(stateObj.factoryUsed, equalTo(true))
251+
assertEquals(true, stateObj.factoryUsed)
254252
}
255253

256254
private class StateObjectWithFactoryNoParamAnnotations(
@@ -278,8 +276,7 @@ class TestJacksonWithKotlin {
278276
@Test fun findingFactoryMethod2() {
279277
try {
280278
normalCasedMapper.readValue(normalCasedJson, StateObjectWithFactoryNoParamAnnotations::class.java)
281-
}
282-
catch (ex: Exception) {
279+
} catch (ex: Exception) {
283280
ex.printStackTrace()
284281
fail("Exception not expected")
285282
}
@@ -313,7 +310,7 @@ class TestJacksonWithKotlin {
313310
@Test fun findingFactoryMethod3() {
314311
val stateObj = normalCasedMapper.readValue(normalCasedJson, StateObjectWithFactoryOnNamedCompanion::class.java)
315312
stateObj.validate()
316-
assertThat(stateObj.factoryUsed, equalTo(true))
313+
assertTrue(stateObj.factoryUsed)
317314
}
318315

319316
// GH #14 failing due to this enum type
@@ -346,4 +343,3 @@ class TestJacksonWithKotlin {
346343
assertTrue(Gh14FailureWithEnum::class.java.isKotlinClass())
347344
}
348345
}
349-

0 commit comments

Comments
 (0)