Skip to content

Commit 9660245

Browse files
committed
Fix tests
1 parent 80c30fd commit 9660245

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/PropertyRequirednessTests.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TestPropertyRequiredness {
5050
"h".isOptionalForSerializationOf(testClass, mapper)
5151
"h".isOptionalForDeserializationOf(testClass, mapper)
5252

53-
"i".isRequiredForDeserializationOf(testClass, mapper)
53+
"i".isOptionalForDeserializationOf(testClass, mapper)
5454
"j".isOptionalForDeserializationOf(testClass, mapper)
5555
"k".isOptionalForDeserializationOf(testClass, mapper)
5656
"l".isOptionalForDeserializationOf(testClass, mapper)
@@ -59,7 +59,7 @@ class TestPropertyRequiredness {
5959
@Test fun shouldHandleTrueFailOnNullForPrimitives() {
6060
val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true)
6161
val testClass = TestClass::class.java
62-
"a".isRequiredForDeserializationOf(testClass, mapper)
62+
"a".isOptionalForDeserializationOf(testClass, mapper)
6363
"b".isOptionalForDeserializationOf(testClass, mapper)
6464
"c".isOptionalForDeserializationOf(testClass, mapper)
6565
"d".isOptionalForDeserializationOf(testClass, mapper)
@@ -68,7 +68,7 @@ class TestPropertyRequiredness {
6868

6969
"h".isOptionalForDeserializationOf(testClass, mapper)
7070

71-
"i".isRequiredForDeserializationOf(testClass, mapper)
71+
"i".isOptionalForDeserializationOf(testClass, mapper)
7272
"j".isOptionalForDeserializationOf(testClass, mapper)
7373
"k".isOptionalForDeserializationOf(testClass, mapper)
7474
"l".isOptionalForDeserializationOf(testClass, mapper)
@@ -194,5 +194,5 @@ class TestPropertyRequiredness {
194194
mapper.deserializationConfig.introspect(mapper.deserializationConfig.constructType(type))
195195

196196
private fun BeanDescription.isRequired(propertyName: String): Boolean =
197-
this.findProperties().find { it.name == propertyName }!!.isRequired
197+
this.findProperties().find { it.name == propertyName }?.isRequired ?: false
198198
}

src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github165.kt

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.fasterxml.jackson.module.kotlin._ported.test.github
22

3+
import com.fasterxml.jackson.annotation.JsonIgnore
34
import com.fasterxml.jackson.annotation.JsonProperty
4-
import com.fasterxml.jackson.annotation.JsonSetter
55
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
66
import com.fasterxml.jackson.module.kotlin.readValue
77
import com.fasterxml.jackson.module.kotlin.test.github._ported.Github165JavaTest
@@ -15,20 +15,21 @@ class TestGithub165 {
1515
var yearSetterCalled: Boolean = false
1616
var nameSetterCalled: Boolean = false
1717

18-
@JsonProperty("year")
19-
lateinit var showYear: String
18+
var showYear: String? = null
19+
@JsonProperty("year")
20+
set(value) {
21+
yearSetterCalled = true
22+
field = value
23+
}
2024

21-
@JsonSetter("year")
22-
fun setYear(value: String) {
23-
yearSetterCalled = true
24-
this.showYear = value
25-
}
25+
var name: String
26+
@JsonIgnore get() = showName // Why define get: https://youtrack.jetbrains.com/issue/KT-6519
2627

27-
@JsonSetter("name")
28-
fun setName(value: String) {
29-
nameSetterCalled = true
30-
this.showName = value
31-
}
28+
@JsonProperty("name")
29+
set(value) {
30+
nameSetterCalled = true
31+
this.showName = value
32+
}
3233
}
3334

3435
@Test

src/test/kotlin/com/fasterxml/jackson/module/kotlin/_ported/test/github/Github308.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ class TestGithub308 {
1717
var id: Long? = null,
1818
var cityId: Int? = null
1919
) {
20-
@JsonProperty("id")
21-
private fun unpackId(idObj: Int?) {
22-
cityId = idObj
23-
}
20+
private var unpackId: Int?
21+
get() = cityId // Why define get: https://youtrack.jetbrains.com/issue/KT-6519
22+
23+
@JsonProperty("id")
24+
set(value) { cityId = value }
2425
}
2526

2627
@Test

0 commit comments

Comments
 (0)