Merge pull request #640 from k163377/fix-test-on-windows

Fixed problem with test failure in windows.
FasterXML · Mar 4, 2023 · 8e7aeb9 · 8e7aeb9
2 parents 9c6e3bc + fba0842
commit 8e7aeb9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -26,6 +26,7 @@ WrongWrong (@k163377)
 * #629: Changed to not cache valueParameters
 * #631: Fix minor bugs in SimpleModule.addSerializer/addDeserializer
 * #634: Fix ReflectionCache to be serializable
+* #640: Fixed problem with test failure in windows.
 
 # 2.14.0
 

diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/TestCommons.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/TestCommons.kt
@@ -0,0 +1,13 @@
+package com.fasterxml.jackson.module.kotlin
+
+import com.fasterxml.jackson.core.util.DefaultIndenter
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.ObjectWriter
+
+// This `printer` is used to match the output from Jackson to the newline char of the source code.
+// If this is removed, comparisons will fail in a Windows-like platform.
+val LF_PRINTER: DefaultPrettyPrinter =
+ DefaultPrettyPrinter().withObjectIndenter(DefaultIndenter().withLinefeed("\n"))
+
+fun ObjectMapper.testPrettyWriter(): ObjectWriter = this.writer(LF_PRINTER)
diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub524.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub524.kt
@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.testPrettyWriter
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotEquals
@@ -39,7 +40,7 @@ class GitHub524 {
  fun test() {
  val sm = SimpleModule()
  .addSerializer(Serializer())
- val writer = jacksonMapperBuilder().addModule(sm).build().writerWithDefaultPrettyPrinter()
+ val writer = jacksonMapperBuilder().addModule(sm).build().testPrettyWriter()
 
  // 18446744073709551615 is ULong.MAX_VALUE.
  assertEquals(

diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub530.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub530.kt
@@ -2,6 +2,7 @@ package com.fasterxml.jackson.module.kotlin.test.github
 
 import com.fasterxml.jackson.annotation.JsonValue
 import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
+import com.fasterxml.jackson.module.kotlin.testPrettyWriter
 import kotlin.test.assertEquals
 import org.junit.Test
 
@@ -37,7 +38,7 @@ class GitHub530 {
  @JvmInline
  value class JsonValueGetterImplementation(val value: Int) : JsonValueGetter
 
- private val writer = jacksonMapperBuilder().build().writerWithDefaultPrettyPrinter()
+ private val writer = jacksonMapperBuilder().build().testPrettyWriter()
 
  @Test
  fun valueParamGetterAnnotated() {

diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github464.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/Github464.kt
@@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.fasterxml.jackson.module.kotlin.testPrettyWriter
 import org.junit.Ignore
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -75,7 +76,7 @@ class Github464 {
  @Suppress("UNCHECKED_CAST")
  val writer: ObjectWriter = jacksonObjectMapper()
  .apply { serializerProvider.setNullKeySerializer(NullValueClassKeySerializer as JsonSerializer<Any?>) }
- .writerWithDefaultPrettyPrinter()
+ .testPrettyWriter()
 
  assertEquals(
  """
@@ -117,7 +118,7 @@ class Github464 {
  .apply {
  serializerProvider.setNullKeySerializer(NullValueClassKeySerializer as JsonSerializer<Any?>)
  serializerProvider.setNullValueSerializer(NullValueSerializer)
- }.writerWithDefaultPrettyPrinter()
+ }.testPrettyWriter()
 
  assertEquals(
  """

diff --git a/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub337.kt b/src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/failing/GitHub337.kt
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.MapperFeature.SORT_PROPERTIES_ALPHABETICALLY
 import com.fasterxml.jackson.module.kotlin.jacksonMapperBuilder
+import com.fasterxml.jackson.module.kotlin.testPrettyWriter
 import org.junit.Ignore
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -16,7 +17,7 @@ class TestGitHub337 {
  .configure(SORT_PROPERTIES_ALPHABETICALLY, true)
  .build()
  .setSerializationInclusion(JsonInclude.Include.ALWAYS)
- private val writer = mapper.writerWithDefaultPrettyPrinter()
+ private val writer = mapper.testPrettyWriter()
 
  @Test
  @Ignore