Skip to content

Commit 33adf40

Browse files
authored
Merge pull request #1001 from k163377/fix-via-762
Delete branches that are no longer needed due to #762 resolution
2 parents cae5ba2 + 9131e53 commit 33adf40

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

src/test/kotlin/com/fasterxml/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullablePrimitive/DeserializeByConstructorWithDefaultArgumentsTest.kt

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import com.fasterxml.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Nu
66
import com.fasterxml.jackson.module.kotlin.readValue
77
import org.junit.jupiter.api.Assertions
88
import org.junit.jupiter.api.Test
9-
import org.junit.jupiter.api.assertThrows
10-
import kotlin.reflect.jvm.internal.KotlinReflectionInternalError
119

1210
/**
1311
* Up to argument size 32 there is one mask argument for the default argument,
@@ -53,12 +51,7 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
5351

5452
@Test
5553
fun test32() {
56-
assertThrows<KotlinReflectionInternalError> {
57-
Assertions.assertEquals(Dst32(), defaultMapper.readValue<Dst32>("{}"))
58-
// TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed.
59-
// After upgrading to Kotlin 2.0, remove exception-related descriptions.
60-
if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("")
61-
}
54+
Assertions.assertEquals(Dst32(), defaultMapper.readValue<Dst32>("{}"))
6255
}
6356

6457
data class Dst33(
@@ -171,12 +164,7 @@ class DeserializeByConstructorWithDefaultArgumentsTest {
171164

172165
@Test
173166
fun test64() {
174-
assertThrows<KotlinReflectionInternalError> {
175-
Assertions.assertEquals(Dst64(), defaultMapper.readValue<Dst64>("{}"))
176-
// TODO: #762 is resolved after Kotlin 2.0, so the reason why throw is done is to make CI with Kotlin 2.0 succeed.
177-
// After upgrading to Kotlin 2.0, remove exception-related descriptions.
178-
if (KotlinVersion.CURRENT.major >= 2) throw KotlinReflectionInternalError("")
179-
}
167+
Assertions.assertEquals(Dst64(), defaultMapper.readValue<Dst64>("{}"))
180168
}
181169

182170
data class Dst65(

0 commit comments

Comments
 (0)