diff --git a/release-notes/CREDITS b/release-notes/CREDITS index 9172d685f..6e7b4ec08 100644 --- a/release-notes/CREDITS +++ b/release-notes/CREDITS @@ -19,6 +19,9 @@ Contributors: # 3.0.0-rc5 (not yet released) +WrongWrong (@k163377) +* #988: Optimize imports + # 3.0.0-rc4 (10-May-2025) WrongWrong (@k163377) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/DslTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/DslTest.kt index 070f9e0d6..d428db811 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/DslTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/DslTest.kt @@ -1,14 +1,14 @@ package tools.jackson.module.kotlin +import org.junit.jupiter.api.Assertions.assertNotNull +import org.junit.jupiter.api.Test import tools.jackson.core.json.JsonReadFeature import tools.jackson.core.json.JsonWriteFeature +import tools.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks import tools.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyMap import tools.jackson.module.kotlin.KotlinFeature.SingletonSupport -import tools.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks -import org.junit.jupiter.api.Assertions.assertNotNull -import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/src/test/kotlin/tools/jackson/module/kotlin/KotlinInstantiatorsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/KotlinInstantiatorsTest.kt index 06d6893d6..19e1e4086 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/KotlinInstantiatorsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/KotlinInstantiatorsTest.kt @@ -1,8 +1,10 @@ package tools.jackson.module.kotlin -import tools.jackson.databind.deser.std.StdValueInstantiator -import org.junit.jupiter.api.Assertions.* +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test +import tools.jackson.databind.deser.std.StdValueInstantiator class KotlinInstantiatorsTest { private val mapper = jacksonObjectMapper() diff --git a/src/test/kotlin/tools/jackson/module/kotlin/KotlinModuleTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/KotlinModuleTest.kt index 937c452f7..6c381c0f3 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/KotlinModuleTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/KotlinModuleTest.kt @@ -1,12 +1,19 @@ package tools.jackson.module.kotlin -import tools.jackson.module.kotlin.KotlinFeature.* -import tools.jackson.databind.json.JsonMapper import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.databind.json.JsonMapper +import tools.jackson.module.kotlin.KotlinFeature.KotlinPropertyNameAsImplicitName +import tools.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks +import tools.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault +import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection +import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyMap +import tools.jackson.module.kotlin.KotlinFeature.SingletonSupport +import tools.jackson.module.kotlin.KotlinFeature.StrictNullChecks +import tools.jackson.module.kotlin.KotlinFeature.UseJavaDurationConversion import kotlin.test.assertNotNull class KotlinModuleTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/ReadValueTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/ReadValueTest.kt index 6cc73cc4e..88bd32f8b 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/ReadValueTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/ReadValueTest.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin -import tools.jackson.databind.DatabindException -import tools.jackson.databind.node.NullNode import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.databind.DatabindException +import tools.jackson.databind.node.NullNode import java.io.StringReader class ReadValueTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/ReadValuesTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/ReadValuesTest.kt index eafd5d4b1..99f6abe46 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/ReadValuesTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/ReadValuesTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin +import org.junit.jupiter.api.Nested +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows import tools.jackson.core.JsonParser import tools.jackson.databind.DatabindException import tools.jackson.databind.DeserializationContext import tools.jackson.databind.deser.std.StdDeserializer import tools.jackson.databind.module.SimpleModule -import org.junit.jupiter.api.Nested -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.assertThrows import kotlin.test.assertEquals class ReadValuesTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/JacksonInjectTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/JacksonInjectTest.kt index 0bd410ddf..7bc411cb3 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/JacksonInjectTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/JacksonInjectTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass import com.fasterxml.jackson.annotation.JacksonInject +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test import tools.jackson.databind.InjectableValues import tools.jackson.databind.MapperFeature import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.jacksonObjectMapper -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertThrows -import org.junit.jupiter.api.Test class JacksonInjectTest { // This is specified as a getter because there is a possibility of problems if it is assigned to a field. diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt index 9eee124b0..07087e7a5 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/NullableObjectEdgeCases.kt @@ -2,6 +2,9 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows import tools.jackson.core.JsonParser import tools.jackson.databind.DeserializationContext import tools.jackson.databind.annotation.JsonDeserialize @@ -9,9 +12,6 @@ import tools.jackson.databind.deser.std.StdDeserializer import tools.jackson.module.kotlin.WrapsNullableValueClassDeserializer import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.assertThrows import kotlin.reflect.jvm.internal.KotlinReflectionInternalError class NullableObjectEdgeCases { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt index 0e4ee6383..9b4c8fc2d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/WithoutCustomDeserializeMethodTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass -import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.module.kotlin.defaultMapper +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import java.lang.reflect.InvocationTargetException import kotlin.test.assertNotEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt index d4b5f5d18..461eff1ac 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NonNullObjectTest.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultArgument import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test class NonNullObjectTest { companion object { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt index 5aa08e9c9..1d344bb49 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/NullableObjectTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultArgument import com.fasterxml.jackson.annotation.JsonCreator -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import tools.jackson.module.kotlin.readValue class NullableObjectTest { companion object { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt index b4ffc9aa6..293d8547a 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/defaultArgument/PrimitiveTest.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.defaultArgument import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test class PrimitiveTest { companion object { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt index a68ef712a..aa54e448c 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/SpecifiedForObjectMapperTest.kt @@ -1,14 +1,14 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Nested +import org.junit.jupiter.api.Test import tools.jackson.databind.module.SimpleModule -import tools.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive -import tools.jackson.module.kotlin.jacksonMapperBuilder -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Nested -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue import kotlin.test.assertNotEquals class SpecifiedForObjectMapperTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt index 27aa1c02a..ab565ebeb 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/SpecifiedForClassTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.core.JsonParser import tools.jackson.databind.DeserializationContext import tools.jackson.databind.annotation.JsonDeserialize import tools.jackson.databind.deser.std.StdDeserializer import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test class SpecifiedForClassTest { @JsonDeserialize(using = Value.Deserializer::class) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt index caac8a966..369bfbe9d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NonNullObjectTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation.specifiedForProperty -import tools.jackson.databind.annotation.JsonDeserialize -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import tools.jackson.module.kotlin.readValue class NonNullObjectTest { companion object { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt index d348bbda1..49b2ef267 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/NullableObjectTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation.specifiedForProperty -import tools.jackson.databind.annotation.JsonDeserialize -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import tools.jackson.module.kotlin.readValue class NullableObjectTest { companion object { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt index c22e57c5b..bfd988267 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/deserializer/byAnnotation/specifiedForProperty/PrimitiveTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.deserializer.byAnnotation.specifiedForProperty -import tools.jackson.databind.annotation.JsonDeserialize -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import tools.jackson.module.kotlin.readValue class PrimitiveTest { companion object { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByJacksonTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByJacksonTest.kt index 9d7bd3f6e..ed3629fa7 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByJacksonTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByJacksonTest.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.jsonCreator import com.fasterxml.jackson.annotation.JsonCreator -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue // Test for Creator that can be handled by the Jackson mechanism. class HandledByJacksonTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByKogeraTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByKogeraTest.kt index 70d313873..5ad459e56 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByKogeraTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/HandledByKogeraTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.jsonCreator import com.fasterxml.jackson.annotation.JsonCreator -import tools.jackson.databind.exc.InvalidDefinitionException -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.Test +import tools.jackson.databind.exc.InvalidDefinitionException +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue // Test on the case of deserialization by ValueClassBoxDeserializer class HandledByKogeraTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/InCreatorArgumentTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/InCreatorArgumentTest.kt index df34d5f67..225e22147 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/InCreatorArgumentTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/jsonCreator/InCreatorArgumentTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.jsonCreator import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test private fun Primitive.modify(): Primitive = Primitive(v + 100) private fun NonNullObject.modify(): NonNullObject = NonNullObject("$v-creator") diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt index e41049499..dab6dab43 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/WithoutCustomDeserializeMethodTest.kt @@ -1,10 +1,5 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.mapKey -import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Nested @@ -14,7 +9,12 @@ import tools.jackson.databind.DatabindException import tools.jackson.databind.DeserializationContext import tools.jackson.databind.exc.InvalidDefinitionException import tools.jackson.databind.module.SimpleModule +import tools.jackson.module.kotlin.defaultMapper import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import tools.jackson.module.kotlin.readValue import java.lang.reflect.InvocationTargetException import tools.jackson.databind.KeyDeserializer as JacksonKeyDeserializer diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt index dc41f0d74..32baa542d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/SpecifiedForObjectMapperTest.kt @@ -1,14 +1,14 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.mapKey.keyDeserializer -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import tools.jackson.databind.module.SimpleModule import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import tools.jackson.module.kotlin.readValue class SpecifiedForObjectMapperTest { companion object { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForClassTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForClassTest.kt index bcf1040ce..4eeb3daed 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForClassTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForClassTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.mapKey.keyDeserializer.byAnnotation +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationContext +import tools.jackson.databind.annotation.JsonDeserialize import tools.jackson.module.kotlin.defaultMapper import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test -import tools.jackson.databind.annotation.JsonDeserialize import tools.jackson.databind.KeyDeserializer as JacksonKeyDeserializer class SpecifiedForClassTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForPropertyTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForPropertyTest.kt index 524a2bd53..61a4e8148 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForPropertyTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/mapKey/keyDeserializer/byAnnotation/SpecifiedForPropertyTest.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.mapKey.keyDeserializer.byAnnotation -import tools.jackson.databind.DeserializationContext -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test +import tools.jackson.databind.DeserializationContext import tools.jackson.databind.annotation.JsonDeserialize +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import tools.jackson.databind.KeyDeserializer as JacksonKeyDeserializer class SpecifiedForPropertyTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt index 8fe09b977..72830ff7f 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nonNullObject -import tools.jackson.module.kotlin.assertReflectEquals -import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.module.kotlin.assertReflectEquals +import tools.jackson.module.kotlin.defaultMapper +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject +import tools.jackson.module.kotlin.readValue import kotlin.reflect.jvm.internal.KotlinReflectionInternalError /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt index bcbc91b37..8e5907d95 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nonNullObject +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue /** * Up to argument size 32 there is one mask argument for the default argument, diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt index d86cf7e26..10a487cf4 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nonNullObject import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue /** * Up to argument size 32 there is one mask argument for the default argument, diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt index 5b28c9f0f..c4510f055 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nonNullObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nonNullObject import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NonNullObject -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue // Convert the property p to q (but not the value) to make it an input to the factory function. private fun replacePQ(src: String) = src.replace(Regex("""p\d+":""")) { "q" + it.value.substring(1) } diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt index eafb0a0fb..4b4bcbe84 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nullableObject -import tools.jackson.module.kotlin.assertReflectEquals -import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.module.kotlin.assertReflectEquals +import tools.jackson.module.kotlin.defaultMapper +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject +import tools.jackson.module.kotlin.readValue import kotlin.reflect.jvm.internal.KotlinReflectionInternalError /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt index 79521da91..dcb872296 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByConstructorWithoutDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nullableObject +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue /** * Up to argument size 32 there is one mask argument for the default argument, diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt index 093dfef97..0e95c390d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nullableObject import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue /** * Up to argument size 32 there is one mask argument for the default argument, diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt index 160723439..9eda65373 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/nullableObject/DeserializeByFactoryWithoutDefaultArgumentsTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.nullableObject import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.NullableObject -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue // Convert the property p to q (but not the value) to make it an input to the factory function. private fun replacePQ(src: String) = src.replace(Regex("""p\d+":""")) { "q" + it.value.substring(1) } diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt index 3ea9ed655..ad5c0239e 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.primitive -import tools.jackson.module.kotlin.assertReflectEquals -import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.module.kotlin.assertReflectEquals +import tools.jackson.module.kotlin.defaultMapper +import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive +import tools.jackson.module.kotlin.readValue import kotlin.reflect.jvm.internal.KotlinReflectionInternalError /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt index b8af628c9..95016cb21 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByConstructorWithoutDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.primitive +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue /** * Up to argument size 32 there is one mask argument for the default argument, diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt index b5420d574..03da51b12 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithDefaultArgumentsTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.primitive import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue /** * Up to argument size 32 there is one mask argument for the default argument, diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt index bc8568c11..152045148 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/deser/valueClass/parameterSize/primitive/DeserializeByFactoryWithoutDefaultArgumentsTest.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.parameterSize.primitive import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.kogeraIntegration.deser.valueClass.Primitive -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.readValue // Convert the property p to q (but not the value) to make it an input to the factory function. private fun replacePQ(src: String) = src.replace(Regex("""p\d+":""")) { "q" + it.value.substring(1) } diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt index 11187f0c8..2e4446903 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nonNullObject/ByAnnotationTest.kt @@ -2,8 +2,8 @@ package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer. import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.testPrettyWriter import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NonNullObject +import tools.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt index ff0729348..af60057c5 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NonNullValueTest.kt @@ -2,8 +2,8 @@ package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer. import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.testPrettyWriter import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject +import tools.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt index f435ce13c..7d07a377a 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/nullableObject/byAnnotation/NullValueTest.kt @@ -2,8 +2,8 @@ package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer. import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.testPrettyWriter import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.NullableObject +import tools.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt index be798663e..2f48f2ca4 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/kogeraIntegration/ser.valueClass/serializer/byAnnotation/primitive/ByAnnotationTest.kt @@ -2,8 +2,8 @@ package tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer. import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.testPrettyWriter import tools.jackson.module.kotlin.kogeraIntegration.ser.valueClass.serializer.Primitive +import tools.jackson.module.kotlin.testPrettyWriter import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/DurationTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/DurationTests.kt index 7f0f4574c..6b3eb5167 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/DurationTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/DurationTests.kt @@ -3,12 +3,12 @@ package tools.jackson.module.kotlin.test import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonFormat import com.fasterxml.jackson.annotation.JsonFormat.Shape.STRING +import org.junit.jupiter.api.Test +import tools.jackson.databind.cfg.DateTimeFeature import tools.jackson.databind.json.JsonMapper import tools.jackson.module.kotlin.KotlinFeature import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test -import tools.jackson.databind.cfg.DateTimeFeature import java.time.Instant import kotlin.test.assertContentEquals import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/ExtensionMethodsTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/ExtensionMethodsTests.kt index 21c67794a..8ee28f672 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/ExtensionMethodsTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/ExtensionMethodsTests.kt @@ -1,6 +1,9 @@ package tools.jackson.module.kotlin.test import com.fasterxml.jackson.annotation.JsonIgnore +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.databind.SerializationFeature import tools.jackson.databind.json.JsonMapper @@ -14,9 +17,6 @@ import tools.jackson.module.kotlin.minusAssign import tools.jackson.module.kotlin.plusAssign import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.treeToValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertTrue -import org.junit.jupiter.api.Test private class TestExtensionMethods { val mapper: ObjectMapper = jacksonMapperBuilder().disable(SerializationFeature.INDENT_OUTPUT) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/FailNullForPrimitiveTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/FailNullForPrimitiveTest.kt index 18d1fd660..e3a897a87 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/FailNullForPrimitiveTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/FailNullForPrimitiveTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationFeature import tools.jackson.databind.exc.MismatchedInputException import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertThrows -import org.junit.jupiter.api.Test class FailNullForPrimitiveTest { val mapper = jacksonMapperBuilder() diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/IteratorTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/IteratorTests.kt index 57f75c663..e14ac75d8 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/IteratorTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/IteratorTests.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Test import tools.jackson.core.type.TypeReference import tools.jackson.databind.ObjectMapper import tools.jackson.databind.SerializationFeature import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.module.kotlin.jacksonMapperBuilder -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestIteratorSubclass { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/KClassSerializerDeserializerTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/KClassSerializerDeserializerTest.kt index 9a5215d81..4f48b8492 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/KClassSerializerDeserializerTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/KClassSerializerDeserializerTest.kt @@ -1,5 +1,7 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.core.JsonGenerator import tools.jackson.core.JsonParser import tools.jackson.databind.DeserializationContext @@ -11,8 +13,6 @@ import tools.jackson.module.kotlin.addDeserializer import tools.jackson.module.kotlin.addSerializer import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test import java.math.BigDecimal import java.math.RoundingMode diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinBuiltinsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinBuiltinsTest.kt index 647ece368..675d15151 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinBuiltinsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinBuiltinsTest.kt @@ -1,11 +1,10 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper -import tools.jackson.databind.SerializationFeature import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test class TestJacksonWithKotlinBuiltins { private val mapper: ObjectMapper = jacksonObjectMapper() diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinFeatures.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinFeatures.kt index da960250e..231fb24ba 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinFeatures.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/KotlinFeatures.kt @@ -4,12 +4,13 @@ import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty -import tools.jackson.module.kotlin.* -import tools.jackson.module.kotlin.readValue -import tools.jackson.databind.MapperFeature import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationFeature +import tools.jackson.databind.MapperFeature +import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.properties.Delegates import kotlin.test.assertNull import kotlin.test.fail diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/NullToDefaultTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/NullToDefaultTests.kt index 1d52e8bd6..f62432543 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/NullToDefaultTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/NullToDefaultTests.kt @@ -1,14 +1,15 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows +import tools.jackson.databind.DeserializationFeature import tools.jackson.databind.json.JsonMapper import tools.jackson.module.kotlin.KotlinFeature.NullIsSameAsDefault import tools.jackson.module.kotlin.MissingKotlinParameterException import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.* -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.assertThrows -import tools.jackson.databind.DeserializationFeature class TestNullToDefault { private fun createMapper(allowDefaultingByNull: Boolean) = JsonMapper.builder() diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyCollectionTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyCollectionTest.kt index 70b62dd53..bb1206f4b 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyCollectionTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyCollectionTest.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.databind.json.JsonMapper import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyCollection import tools.jackson.module.kotlin.kotlinModule -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestNullToEmptyCollection { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyMapTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyMapTest.kt index a931a97df..49abef661 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyMapTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/NullToEmptyMapTest.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.databind.json.JsonMapper import tools.jackson.module.kotlin.KotlinFeature.NullToEmptyMap import tools.jackson.module.kotlin.kotlinModule -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestNullToEmptyMap { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/ObjectSingletonTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/ObjectSingletonTest.kt index 706307968..86246eaca 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/ObjectSingletonTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/ObjectSingletonTest.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.databind.json.JsonMapper import tools.jackson.module.kotlin.KotlinFeature.SingletonSupport import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test // [module-kotlin#225]: keep Kotlin singletons as singletons class TestObjectSingleton { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/ParameterNameTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/ParameterNameTests.kt index e2dc3d54a..b48a803ec 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/ParameterNameTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/ParameterNameTests.kt @@ -3,12 +3,14 @@ package tools.jackson.module.kotlin.test import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.module.kotlin.* -import tools.jackson.databind.MapperFeature import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationFeature +import tools.jackson.databind.MapperFeature +import tools.jackson.databind.PropertyNamingStrategies import tools.jackson.databind.cfg.DateTimeFeature +import tools.jackson.module.kotlin.isKotlinClass +import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.readValue import java.io.StringWriter import java.util.* import kotlin.properties.Delegates diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/PropertyRequirednessTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/PropertyRequirednessTests.kt index 37d2acab8..58611a36c 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/PropertyRequirednessTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/PropertyRequirednessTests.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.databind.BeanDescription import tools.jackson.databind.DeserializationFeature import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.jacksonMapperBuilder -import org.junit.jupiter.api.Test import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/SealedClassTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/SealedClassTest.kt index 3a901805b..dd897c7b3 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/SealedClassTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/SealedClassTest.kt @@ -3,11 +3,11 @@ package tools.jackson.module.kotlin.test import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonValue +import org.junit.jupiter.api.Test import tools.jackson.core.type.TypeReference import tools.jackson.databind.exc.MismatchedInputException import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.test.SealedClassTest.SuperClass.B -import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/SequenceSerdesTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/SequenceSerdesTests.kt index 6b8e714fa..0710383c7 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/SequenceSerdesTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/SequenceSerdesTests.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.test -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue +import org.junit.jupiter.api.Test import tools.jackson.core.JsonGenerator import tools.jackson.databind.SerializationContext import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.databind.ser.std.StdSerializer -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.test.assertEquals class TestSequenceDeserializer { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTest.kt index 5773330d3..2ef31eb96 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTest.kt @@ -1,15 +1,15 @@ package tools.jackson.module.kotlin.test -import tools.jackson.databind.json.JsonMapper -import tools.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks -import tools.jackson.module.kotlin.kotlinModule -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertArrayEquals import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import tools.jackson.databind.exc.InvalidNullException +import tools.jackson.databind.json.JsonMapper +import tools.jackson.module.kotlin.KotlinFeature.NewStrictNullChecks +import tools.jackson.module.kotlin.kotlinModule +import tools.jackson.module.kotlin.readValue import kotlin.test.assertNull class StrictNullChecksTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt index 557ca0ae5..42db5ae1c 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/StrictNullChecksTestOld.kt @@ -1,14 +1,14 @@ package tools.jackson.module.kotlin.test -import tools.jackson.module.kotlin.MissingKotlinParameterException -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertArrayEquals import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import tools.jackson.module.kotlin.KotlinFeature +import tools.jackson.module.kotlin.MissingKotlinParameterException import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.test.assertNull class StrictNullChecksTestOld { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersOnKeyTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersOnKeyTest.kt index 2bf55dafd..e4b267295 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersOnKeyTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersOnKeyTest.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test -import tools.jackson.core.exc.InputCoercionException -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertThrows import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import tools.jackson.core.exc.InputCoercionException +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import java.math.BigInteger import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersTests.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersTests.kt index 51842cfd4..5c9bcc2d6 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersTests.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersTests.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.test +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows import tools.jackson.core.exc.InputCoercionException import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test -import org.junit.jupiter.api.assertThrows import java.math.BigInteger internal class UnsignedNumbersTests { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/VarargDeserTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/VarargDeserTest.kt index 94ba215b0..fc30e85e4 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/VarargDeserTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/VarargDeserTest.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue - import org.junit.jupiter.api.Assertions.assertEquals - import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue // from https://github.com/ProjectMapK/jackson-module-kogera/blob/7872116052c9a4744c6d4e84ddd5cab6bb525024/src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/deser/VarargTest.kt class VarargDeserTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub338.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub338.kt index 3ce5b65cd..a351ba580 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub338.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub338.kt @@ -2,13 +2,13 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonRootName +import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationFeature import tools.jackson.dataformat.xml.XmlMapper import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty -import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.kotlinModule +import tools.jackson.module.kotlin.readValue import kotlin.test.assertEquals class GitHub338 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub524.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub524.kt index ab0e5c3f9..285b4dc5c 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub524.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub524.kt @@ -1,5 +1,6 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.core.JsonGenerator import tools.jackson.databind.SerializationContext import tools.jackson.databind.annotation.JsonSerialize @@ -8,7 +9,6 @@ import tools.jackson.databind.ser.std.StdSerializer import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.testPrettyWriter -import org.junit.jupiter.api.Test import kotlin.test.assertEquals // Most of the current behavior has been tested on GitHub464, so only serializer-related behavior is tested here. diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub530.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub530.kt index 9032252d3..169f0caf3 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub530.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub530.kt @@ -1,11 +1,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonValue +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.testPrettyWriter import kotlin.test.assertEquals -import org.junit.jupiter.api.Test -import kotlin.test.assertEquals class GitHub530 { // At the moment, the output is the same with or without `JsonValue`, diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub618.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub618.kt index 655232e9e..d8f0b820d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub618.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub618.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.core.JsonGenerator import tools.jackson.databind.SerializationContext import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.databind.ser.std.StdSerializer import tools.jackson.module.kotlin.jacksonObjectMapper -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class GitHub618 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub625.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub625.kt index 807bcf6f7..b677e8ff5 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub625.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub625.kt @@ -1,9 +1,8 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonInclude -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.testPrettyWriter import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals import kotlin.test.assertNotEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub668.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub668.kt index 33ef0abb3..689b2c5ae 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub668.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub668.kt @@ -6,7 +6,6 @@ import org.junit.jupiter.api.Test import tools.jackson.databind.BeanDescription import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.defaultMapper -import tools.jackson.module.kotlin.jacksonObjectMapper class GitHub668 { private inline fun ObjectMapper.introspectDeserialization(): BeanDescription = diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub757.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub757.kt index 3044169bc..4d60564f5 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub757.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub757.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.databind.json.JsonMapper import tools.jackson.module.kotlin.KotlinFeature import tools.jackson.module.kotlin.KotlinModule import tools.jackson.module.kotlin.convertValue -import org.junit.jupiter.api.Test import kotlin.test.assertNull class GitHub757 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub800.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub800.kt index b19512193..78191b1e5 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub800.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub800.kt @@ -1,16 +1,16 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.core.JsonParser import tools.jackson.databind.DeserializationContext -import tools.jackson.databind.ValueDeserializer import tools.jackson.databind.ObjectReader +import tools.jackson.databind.ValueDeserializer import tools.jackson.databind.module.SimpleModule import tools.jackson.dataformat.csv.CsvMapper +import tools.jackson.dataformat.csv.CsvReadFeature import tools.jackson.dataformat.csv.CsvSchema import tools.jackson.module.kotlin.kotlinModule -import org.junit.jupiter.api.Test -import tools.jackson.dataformat.csv.CsvReadFeature import kotlin.test.assertEquals class GitHub800 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub832.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub832.kt index 77602539f..42befe1e5 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub832.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub832.kt @@ -2,11 +2,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter -import tools.jackson.databind.ObjectMapper -import tools.jackson.module.kotlin.KotlinModule -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Test import tools.jackson.databind.json.JsonMapper +import tools.jackson.module.kotlin.KotlinModule +import tools.jackson.module.kotlin.readValue import kotlin.test.assertEquals class GitHub832 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub841.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub841.kt index 3f9c18999..7af229ef6 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub841.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub841.kt @@ -2,10 +2,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonInclude +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jsonMapper import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class GitHub841 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub844.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub844.kt index e0b50a5a7..4d10c4ff0 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub844.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub844.kt @@ -1,10 +1,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonTypeInfo -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.jsonMapper import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.test.assertEquals @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "_type") diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub873.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub873.kt index b4aa65914..b5845effe 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub873.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub873.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import com.fasterxml.jackson.annotation.JsonValue import tools.jackson.module.kotlin.defaultMapper import tools.jackson.module.kotlin.readValue -import com.fasterxml.jackson.annotation.JsonValue import kotlin.test.Test class GitHub873 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub876.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub876.kt index ab6698299..58d2a9312 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub876.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub876.kt @@ -2,11 +2,11 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.withConfigOverride import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub976.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub976.kt index 7b431004b..b79e8aeb2 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub976.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GitHub976.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.assertThrows import tools.jackson.databind.exc.InvalidNullException import tools.jackson.module.kotlin.KotlinFeature import tools.jackson.module.kotlin.jacksonObjectMapper -import org.junit.jupiter.api.assertThrows import kotlin.test.Test class GitHub976 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github101.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github101.kt index 3fa24073a..4020384b7 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github101.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github101.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JacksonInject +import org.junit.jupiter.api.Test import tools.jackson.databind.InjectableValues import tools.jackson.module.kotlin.jacksonObjectMapper -import org.junit.jupiter.api.Test import java.util.UUID import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github104.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github104.kt index bad749f6d..af47c911a 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github104.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github104.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test class TestGithub104 { abstract class SuperClass(val name: String) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github114.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github114.kt index c1beb2045..c094f04e0 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github114.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github114.kt @@ -2,9 +2,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub114 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github120.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github120.kt index ec808e27a..4ae27668d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github120.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github120.kt @@ -2,8 +2,8 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonValue -import tools.jackson.module.kotlin.jacksonObjectMapper import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class TestGithub120 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github124.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github124.kt index e17d5f4a3..66929eabf 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github124.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github124.kt @@ -1,7 +1,6 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator -import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github131.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github131.kt index 6d8872ef0..5052c8245 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github131.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github131.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub131 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github145.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github145.kt index f14b64bc4..2da400605 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github145.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github145.kt @@ -2,10 +2,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test @Suppress("UNUSED_VARIABLE") class TestGithub145 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github148.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github148.kt index 28288490b..9bf93dd48 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github148.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github148.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github import org.junit.jupiter.api.Nested -import tools.jackson.module.kotlin.jacksonObjectMapper import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class TestGithub148 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github149.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github149.kt index 145e22d37..5d4b03e67 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github149.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github149.kt @@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect import com.fasterxml.jackson.annotation.JsonBackReference import com.fasterxml.jackson.annotation.JsonManagedReference import com.fasterxml.jackson.annotation.JsonProperty -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.jacksonMapperBuilder -import tools.jackson.databind.MapperFeature import org.junit.jupiter.api.Test +import tools.jackson.databind.MapperFeature +import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.jacksonObjectMapper @Suppress("UNUSED_VARIABLE") class TestGithub149 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github15.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github15.kt index 8e5ebc0c3..176058b81 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github15.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github15.kt @@ -1,7 +1,8 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.module.kotlin.* import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.test.assertEquals class TestGithub15 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github153.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github153.kt index 6270492d0..05eb6f33f 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github153.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github153.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonRootName +import org.junit.jupiter.api.Test import tools.jackson.databind.exc.InvalidDefinitionException import tools.jackson.dataformat.xml.XmlMapper import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub153 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github155.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github155.kt index 821596050..1ccb69c5b 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github155.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github155.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test class TestGithub155 { data class Foo @JvmOverloads constructor( diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github158.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github158.kt index a51453234..b0c336bd9 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github158.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github158.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.databind.annotation.JsonDeserialize import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub158 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github161.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github161.kt index 705346ac3..aed7b3ff6 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github161.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github161.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationFeature import tools.jackson.databind.exc.MismatchedInputException import tools.jackson.module.kotlin.jacksonMapperBuilder -import org.junit.jupiter.api.Test import kotlin.test.fail class TestGithub161 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github165.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github165.kt index 1ba3f7c81..f501bf0ae 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github165.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github165.kt @@ -2,9 +2,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSetter +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github167.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github167.kt index 8c7828cb1..9397e9773 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github167.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github167.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.jacksonObjectMapper -import org.junit.jupiter.api.Test import java.util.function.IntSupplier diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github179.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github179.kt index c155023fa..4e7de116c 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github179.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github179.kt @@ -2,9 +2,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals // verifying work around for this issue, no bug present diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github180.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github180.kt index 6827c38b0..99638ff2a 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github180.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github180.kt @@ -2,9 +2,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertNull class TestGithub180 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github181.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github181.kt index 49e7a7653..7632d9673 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github181.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github181.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub181 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github194.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github194.kt index 124e0fedf..e3e24b88c 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github194.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github194.kt @@ -1,13 +1,13 @@ package tools.jackson.module.kotlin.test.github -import kotlin.test.assertEquals -import org.junit.jupiter.api.Test -import java.util.UUID import com.fasterxml.jackson.annotation.JsonIdentityInfo import com.fasterxml.jackson.annotation.ObjectIdGenerators +import org.junit.jupiter.api.Test import tools.jackson.databind.MapperFeature import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.jacksonObjectMapper +import java.util.UUID +import kotlin.test.assertEquals class TestGithub194 { val mapperWithFinalFieldsAsMutators = jacksonMapperBuilder() diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github196.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github196.kt index 57cce4fa6..492cb92c8 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github196.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github196.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertSame /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github207.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github207.kt index ce9ed70d3..70c946be3 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github207.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github207.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonValue +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.* -import org.junit.jupiter.api.Test class TestGithub207 { open class Wrapper(@JsonValue val value: String) { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github210.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github210.kt index e73071e60..7df960a9f 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github210.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github210.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test class TestGithub210 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github211.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github211.kt index c772ac228..33c4a8d7e 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github211.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github211.kt @@ -1,6 +1,5 @@ package tools.jackson.module.kotlin.test.github -import kotlin.test.assertEquals import com.fasterxml.jackson.annotation.JsonMerge import org.junit.jupiter.api.Test import tools.jackson.databind.JsonNode @@ -8,8 +7,8 @@ import tools.jackson.databind.MapperFeature import tools.jackson.databind.ObjectMapper import tools.jackson.databind.node.JsonNodeFactory import tools.jackson.databind.node.ObjectNode - import tools.jackson.module.kotlin.jacksonMapperBuilder +import kotlin.test.assertEquals class TestGithub211 { val mapperWithFinalFieldsAsMutators = jacksonMapperBuilder() diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github22.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github22.kt index 9f7ca6337..bfd9e11e3 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github22.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github22.kt @@ -1,10 +1,9 @@ package tools.jackson.module.kotlin.test.github -import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonValue +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub22 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github239.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github239.kt index 9a40834e8..fdeb5e38f 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github239.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github239.kt @@ -3,9 +3,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonTypeName +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github25.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github25.kt index 9c1d6cc78..c309055ef 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github25.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github25.kt @@ -2,8 +2,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonPropertyOrder -import tools.jackson.module.kotlin.* import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.properties.Delegates import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github26.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github26.kt index b9bfb9449..e0f30b2ae 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github26.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github26.kt @@ -1,11 +1,10 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationFeature import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.readValue import kotlin.test.assertEquals data class ClassWithPrimitivesWithDefaults(val i: Int = 5, val x: Int) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github269.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github269.kt index f41eaa350..d0fc1af85 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github269.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github269.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Test import tools.jackson.databind.annotation.JsonSerialize import tools.jackson.databind.ser.std.ToStringSerializer import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub269 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github27.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github27.kt index 138710001..a42f7a121 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github27.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github27.kt @@ -1,15 +1,14 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonIgnore -import tools.jackson.databind.SerializationFeature -import tools.jackson.module.kotlin.jacksonMapperBuilder -import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationFeature +import tools.jackson.databind.SerializationFeature import tools.jackson.module.kotlin.KotlinFeature +import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.readValue +import tools.jackson.module.kotlin.test.expectFailure import kotlin.test.assertTrue import kotlin.test.fail diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github270.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github270.kt index 18d5279d3..f8cd7eac5 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github270.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github270.kt @@ -1,7 +1,7 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.module.kotlin.jacksonObjectMapper import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class TestGithub270 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github29.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github29.kt index a2f697a50..a184a3d8d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github29.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github29.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub29 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github308.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github308.kt index cbceed018..e6e4b68cc 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github308.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github308.kt @@ -3,9 +3,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github32.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github32.kt index d5c9c0b9f..7bfa8559b 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github32.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github32.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue -import tools.jackson.databind.DatabindException import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.databind.DatabindException import tools.jackson.databind.exc.MismatchedInputException +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue private class TestGithub32 { @Test fun `valid mandatory data class constructor param`() { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github335.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github335.kt index c3f2bcfe6..5bc88d721 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github335.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github335.kt @@ -5,9 +5,9 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonTypeInfo.As import com.fasterxml.jackson.annotation.JsonTypeInfo.Id +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class Github335Test { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github340.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github340.kt index 0496722f6..8ec20dba0 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github340.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github340.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class OwnerRequestTest { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github356.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github356.kt index fead92f98..fd78f9346 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github356.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github356.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.databind.annotation.JsonDeserialize import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub356 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github396.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github396.kt index 29d6c2f36..1fdcbe0d8 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github396.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github396.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.dataformat.xml.XmlMapper import tools.jackson.module.kotlin.kotlinModule -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class Github396 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github42.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github42.kt index aae45d23a..b47cc9c8f 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github42.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github42.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.databind.DeserializationFeature -import tools.jackson.databind.DatabindException -import tools.jackson.module.kotlin.jacksonMapperBuilder -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows +import tools.jackson.databind.DatabindException +import tools.jackson.databind.DeserializationFeature +import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.readValue class TestGithub42_FailOnNullForPrimitives { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github46.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github46.kt index caa3cdfcb..eddcc1580 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github46.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github46.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.module.kotlin.* -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.reflect.full.primaryConstructor import kotlin.test.assertEquals diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github464.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github464.kt index b2e1c6aa4..da6174dd8 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github464.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github464.kt @@ -1,6 +1,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonPropertyOrder +import org.junit.jupiter.api.Assertions.assertNotEquals +import org.junit.jupiter.api.Nested +import org.junit.jupiter.api.Test import tools.jackson.core.JsonGenerator import tools.jackson.databind.ObjectMapper import tools.jackson.databind.ObjectWriter @@ -11,9 +14,6 @@ import tools.jackson.databind.ser.std.StdSerializer import tools.jackson.module.kotlin.KotlinModule import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.testPrettyWriter -import org.junit.jupiter.api.Assertions.assertNotEquals -import org.junit.jupiter.api.Nested -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class Github464 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github47.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github47.kt index 02bb1a0a1..d11941140 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github47.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github47.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.databind.MapperFeature import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub47 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github490.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github490.kt index ce5011d89..12243a2ad 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github490.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github490.kt @@ -1,12 +1,12 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Assertions.assertNull +import org.junit.jupiter.api.Test import tools.jackson.databind.JsonNode import tools.jackson.databind.node.NullNode import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertNull -import org.junit.jupiter.api.Test class TestGithub490 { val mapper = jacksonObjectMapper() diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github50.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github50.kt index f3679525c..e44e64906 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github50.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github50.kt @@ -1,11 +1,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonUnwrapped -import tools.jackson.databind.exc.InvalidDefinitionException +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub50 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github52.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github52.kt index ea27519bd..bdc6de008 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github52.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github52.kt @@ -2,8 +2,8 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonIgnore import com.fasterxml.jackson.annotation.JsonProperty -import tools.jackson.module.kotlin.jacksonObjectMapper import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class TestGithub52 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github526.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github526.kt index 0bc2eedbc..e37fdbfc0 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github526.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github526.kt @@ -2,9 +2,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class Github526 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github536.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github536.kt index c6153533a..a4394760b 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github536.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github536.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonKey +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonMapperBuilder import tools.jackson.module.kotlin.testPrettyWriter - import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Test class Github536 { @JvmInline diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github56.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github56.kt index 2214069d5..1df686484 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github56.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github56.kt @@ -2,9 +2,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonUnwrapped -import tools.jackson.databind.ObjectMapper -import tools.jackson.module.kotlin.* import org.junit.jupiter.api.Test +import tools.jackson.databind.ObjectMapper +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue import kotlin.test.assertEquals private class TestGithub56 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github57.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github57.kt index 2088dc1b1..70506ca60 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github57.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github57.kt @@ -1,10 +1,11 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.databind.DeserializationContext import tools.jackson.databind.KeyDeserializer import tools.jackson.databind.module.SimpleModule -import tools.jackson.module.kotlin.* -import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonMapperBuilder +import tools.jackson.module.kotlin.readValue class TestGithub57 { data class Github57Data(val map: Map, String>) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github62.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github62.kt index 631794f3d..1746aca7a 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github62.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github62.kt @@ -1,7 +1,7 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.module.kotlin.jacksonObjectMapper import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class TestGithub62 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github630.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github630.kt index be3688560..ba66f9b86 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github630.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github630.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.KotlinFeature import tools.jackson.module.kotlin.KotlinModule import tools.jackson.module.kotlin.jsonMapper -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class Github630 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github710.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github710.kt index 060a43cd2..fc14bcaff 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github710.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github710.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.KotlinFeature import tools.jackson.module.kotlin.KotlinModule import tools.jackson.module.kotlin.jsonMapper -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class Github710 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github722.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github722.kt index 5ea61db10..cf368515a 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github722.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github722.kt @@ -3,10 +3,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JacksonInject import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.databind.InjectableValues import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.jacksonObjectMapper -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class Github722 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github738.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github738.kt index 046a41d14..f0c3f8f9f 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github738.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github738.kt @@ -2,11 +2,11 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonSetter import com.fasterxml.jackson.annotation.Nulls +import org.junit.jupiter.api.Assertions.assertThrows +import org.junit.jupiter.api.Test import tools.jackson.databind.exc.MismatchedInputException import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Assertions.assertThrows -import org.junit.jupiter.api.Test class Github738 { data class D(@JsonSetter(nulls = Nulls.FAIL) val v: Int) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github80.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github80.kt index 97f667119..e422e8724 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github80.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github80.kt @@ -1,8 +1,8 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonProperty -import tools.jackson.module.kotlin.jacksonObjectMapper import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class TestGithub80 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github88.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github88.kt index 536cec447..0b14d57d4 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github88.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github88.kt @@ -1,7 +1,7 @@ package tools.jackson.module.kotlin.test.github -import tools.jackson.module.kotlin.jacksonObjectMapper import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class TestGithub88 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github91.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github91.kt index f3c15a754..1503d9762 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github91.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/Github91.kt @@ -2,10 +2,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonValue -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.readValue import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue class TestGithub91 { data class DataClass1(val name: String, val content: DataClass2) diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1005Test.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1005Test.kt index 30d81d7f4..1900564ae 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1005Test.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1005Test.kt @@ -2,9 +2,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.databind.ObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test class TestGithubDatabind1005 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1328.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1328.kt index 51f559bcf..f3456e69e 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1328.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/GithubDatabind1328.kt @@ -3,9 +3,9 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonTypeName +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithubDatabind1328 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/TestCasesFromSlack.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/TestCasesFromSlack.kt index 3c6e3c75f..c10a34d4a 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/TestCasesFromSlack.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/TestCasesFromSlack.kt @@ -2,9 +2,10 @@ package tools.jackson.module.kotlin.test.github import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import tools.jackson.databind.ObjectMapper -import tools.jackson.module.kotlin.* import org.junit.jupiter.api.Test +import tools.jackson.databind.ObjectMapper +import tools.jackson.module.kotlin.jacksonObjectMapper +import tools.jackson.module.kotlin.readValue class TestCasesFromSlack1 { data class Host @JsonCreator constructor( diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub337.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub337.kt index 7a16005ac..d40835cf8 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub337.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub337.kt @@ -3,10 +3,10 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonInclude import com.fasterxml.jackson.annotation.JsonProperty import org.junit.jupiter.api.Disabled +import org.junit.jupiter.api.Test import tools.jackson.databind.MapperFeature.SORT_PROPERTIES_ALPHABETICALLY import tools.jackson.module.kotlin.jsonMapper import tools.jackson.module.kotlin.testPrettyWriter -import org.junit.jupiter.api.Test import kotlin.test.assertEquals /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub451.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub451.kt index 567c4a6f3..be4fd8741 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub451.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub451.kt @@ -1,10 +1,9 @@ package tools.jackson.module.kotlin.test.github.failing -import tools.jackson.module.kotlin.jacksonObjectMapper -import tools.jackson.module.kotlin.test.expectFailure import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.opentest4j.AssertionFailedError +import tools.jackson.module.kotlin.jacksonObjectMapper import kotlin.test.assertEquals class GitHub451 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub478.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub478.kt index 1f54ecb92..5e6d7809d 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub478.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GitHub478.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonInclude +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jsonMapper import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class GitHub478Test { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github138.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github138.kt index e1469b72e..ae08f69c9 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github138.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github138.kt @@ -2,14 +2,14 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonRootName +import org.junit.jupiter.api.Test import tools.jackson.databind.exc.InvalidDefinitionException import tools.jackson.dataformat.xml.XmlMapper import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty import tools.jackson.dataformat.xml.annotation.JacksonXmlText +import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.test.expectFailure -import tools.jackson.module.kotlin.kotlinModule -import org.junit.jupiter.api.Test class TestGithub138 { @JsonRootName("sms") diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github271AlphaSortProperties.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github271AlphaSortProperties.kt index ce74e32c4..ab3d15a87 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github271AlphaSortProperties.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github271AlphaSortProperties.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonPropertyOrder +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub271 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github474.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github474.kt index ed1a7a7f2..e5e030d13 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github474.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github474.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub474 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github518.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github518.kt index b2757b008..c599ad8d2 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github518.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github518.kt @@ -1,5 +1,6 @@ package tools.jackson.module.kotlin.test.github.failing +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.KotlinFeature.SingletonSupport import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.jsonMapper @@ -7,8 +8,6 @@ import tools.jackson.module.kotlin.kotlinModule import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.test.expectFailure import kotlin.test.assertSame -import org.junit.jupiter.api.Test -import tools.jackson.module.kotlin.KotlinFeature /** * An empty object should be deserialized as *the* Unit instance for a nullable Unit reference Type. diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github54.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github54.kt index 226ecaa28..c9e6d06fd 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github54.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github54.kt @@ -2,11 +2,11 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonIdentityInfo import com.fasterxml.jackson.annotation.ObjectIdGenerators +import org.junit.jupiter.api.Test import tools.jackson.databind.deser.UnresolvedForwardReference import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test class TestGithub54 { @Test diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github611.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github611.kt index 95cf666cc..a5ff7ec54 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github611.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github611.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonProperty +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub611 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github71.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github71.kt index 5623a73a8..5b98e7600 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github71.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github71.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.github.failing +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test import kotlin.test.assertEquals class TestGithub71 { diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GithubDatabind1329.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GithubDatabind1329.kt index ed69f91dc..abc3814a0 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GithubDatabind1329.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/GithubDatabind1329.kt @@ -3,10 +3,10 @@ package tools.jackson.module.kotlin.test.github.failing import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.annotation.JsonTypeName +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.jacksonObjectMapper import tools.jackson.module.kotlin.readValue import tools.jackson.module.kotlin.test.expectFailure -import org.junit.jupiter.api.Test import kotlin.test.assertEquals import kotlin.test.assertNull diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithDefaultArgumentsTest.kt index 41c2ec588..ea2129f6f 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithDefaultArgumentsTest.kt @@ -1,9 +1,9 @@ package tools.jackson.module.kotlin.test.parameterSize +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.defaultMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithoutDefaultArgumentsTest.kt index f65d049ab..8ca02e8e9 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByConstructorWithoutDefaultArgumentsTest.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test.parameterSize +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithDefaultArgumentsTest.kt index 01883d17e..97b027572 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithDefaultArgumentsTest.kt @@ -1,10 +1,10 @@ package tools.jackson.module.kotlin.test.parameterSize import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.defaultMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals /** diff --git a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithoutDefaultArgumentsTest.kt b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithoutDefaultArgumentsTest.kt index 756d78a6f..b742128cb 100644 --- a/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithoutDefaultArgumentsTest.kt +++ b/src/test/kotlin/tools/jackson/module/kotlin/test/parameterSize/DeserializeByFactoryWithoutDefaultArgumentsTest.kt @@ -1,11 +1,11 @@ package tools.jackson.module.kotlin.test.parameterSize import com.fasterxml.jackson.annotation.JsonCreator +import org.junit.jupiter.api.Test import tools.jackson.module.kotlin.assertReflectEquals import tools.jackson.module.kotlin.callPrimaryConstructor import tools.jackson.module.kotlin.defaultMapper import tools.jackson.module.kotlin.readValue -import org.junit.jupiter.api.Test import kotlin.test.assertEquals // Convert the property p to q (but not the value) to make it an input to the factory function.