From 9f8f999e07bef10005d3043053ad070048df7c4b Mon Sep 17 00:00:00 2001 From: joohyukkim Date: Sat, 18 Feb 2023 09:45:05 +0900 Subject: [PATCH] Remove hardcoded system new line --- .../jackson/dataformat/xml/XmlTestBase.java | 8 +++ .../dataformat/xml/misc/TextValueTest.java | 2 +- .../xml/ser/Base64VariantWriteTest.java | 4 +- .../xml/ser/XmlPrettyPrinterTest.java | 67 ++++++++++--------- .../xml/ser/XsiNilSerializationTest.java | 7 +- 5 files changed, 50 insertions(+), 38 deletions(-) diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/XmlTestBase.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/XmlTestBase.java index 294931a20..4a75778a3 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/XmlTestBase.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/XmlTestBase.java @@ -20,6 +20,14 @@ public abstract class XmlTestBase extends TestCase { + + protected static final String DEFAULT_NEW_LINE; + + static { + String newLine = System.getProperty("line.separator"); + DEFAULT_NEW_LINE = newLine == null ? "\n" : newLine; + } + @JsonPropertyOrder({ "first", "last", "id" }) protected static class NameBean { @JacksonXmlProperty(isAttribute=true) diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/misc/TextValueTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/misc/TextValueTest.java index c2bdb7aff..cc3c6a4e0 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/misc/TextValueTest.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/misc/TextValueTest.java @@ -104,7 +104,7 @@ public void testSerializeAsText() throws IOException assertEquals("something", xml); // [dataformat-xml#56]: should work with indentation as well xml = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(new Simple()); - assertEquals("something\n", xml); + assertEquals("something" + DEFAULT_NEW_LINE, xml); } public void testDeserializeAsText() throws IOException diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/Base64VariantWriteTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/Base64VariantWriteTest.java index bec34c9c2..908448a03 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/Base64VariantWriteTest.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/Base64VariantWriteTest.java @@ -82,7 +82,9 @@ private void _testBinaryVariants(Base64Variant b64v, String expEncoded, r = r.with(b64v); } final String EXP = indent ? - "\n "+expEncoded+"\n" : + "" + DEFAULT_NEW_LINE + + " "+expEncoded+"" + DEFAULT_NEW_LINE + + "" : ""+expEncoded+""; final String xml = w.writeValueAsString(new BinaryValue(BINARY_DATA)).trim(); diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XmlPrettyPrinterTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XmlPrettyPrinterTest.java index d7f76dce3..991c563c6 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XmlPrettyPrinterTest.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XmlPrettyPrinterTest.java @@ -91,8 +91,6 @@ public void setUp() throws Exception { _xmlMapper.configure(SerializationFeature.INDENT_OUTPUT, true); } - private static final String SYSTEM_DEFAULT_NEW_LINE = System.getProperty("line.separator"); - /* /********************************************************** /* Unit tests @@ -159,16 +157,21 @@ public void testSimpleMap() throws Exception public void testWithAttr() throws Exception { String xml = _xmlMapper.writeValueAsString(new AttrBean()); - assertEquals("\n", xml); + assertEquals("" + DEFAULT_NEW_LINE, xml); String xml2 = _xmlMapper.writeValueAsString(new AttrBean2()); - assertEquals("\n 14\n\n", xml2); + assertEquals( + "" + DEFAULT_NEW_LINE + + " 14" + DEFAULT_NEW_LINE + + "" + DEFAULT_NEW_LINE, + xml2); } public void testEmptyElem() throws Exception { PojoFor123 simple = new PojoFor123("foobar"); String xml = _xmlMapper.writeValueAsString(simple); - assertEquals("\n", xml); + assertEquals("" + DEFAULT_NEW_LINE, + xml); } public void testMultiLevel172() throws Exception @@ -181,15 +184,15 @@ public void testMultiLevel172() throws Exception // unify possible apostrophes to quotes xml = a2q(xml); - assertEquals("" + SYSTEM_DEFAULT_NEW_LINE - +"" + SYSTEM_DEFAULT_NEW_LINE - +" " + SYSTEM_DEFAULT_NEW_LINE - +" " + SYSTEM_DEFAULT_NEW_LINE - +" abc" + SYSTEM_DEFAULT_NEW_LINE - +" FULL_TIME" + SYSTEM_DEFAULT_NEW_LINE - +" " + SYSTEM_DEFAULT_NEW_LINE - +" " + SYSTEM_DEFAULT_NEW_LINE - +"" + SYSTEM_DEFAULT_NEW_LINE, + assertEquals("" + DEFAULT_NEW_LINE + +"" + DEFAULT_NEW_LINE + +" " + DEFAULT_NEW_LINE + +" " + DEFAULT_NEW_LINE + +" abc" + DEFAULT_NEW_LINE + +" FULL_TIME" + DEFAULT_NEW_LINE + +" " + DEFAULT_NEW_LINE + +" " + DEFAULT_NEW_LINE + +"" + DEFAULT_NEW_LINE, xml); } @@ -232,15 +235,15 @@ public void testNewLine_systemDefault() throws Exception { xml = a2q(xml); // with indentation, should get newLines in prolog/epilog too - assertEquals("" + SYSTEM_DEFAULT_NEW_LINE - + "" + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + " abc" + SYSTEM_DEFAULT_NEW_LINE - + " FULL_TIME" + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + "" + SYSTEM_DEFAULT_NEW_LINE, + assertEquals("" + DEFAULT_NEW_LINE + + "" + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + " abc" + DEFAULT_NEW_LINE + + " FULL_TIME" + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + "" + DEFAULT_NEW_LINE, xml); } @@ -255,15 +258,15 @@ public void testNewLine_UseSystemDefaultLineSeperatorOnNullCustomNewLine() throw // unify possible apostrophes to quotes xml = a2q(xml); - assertEquals("" + SYSTEM_DEFAULT_NEW_LINE - + "" + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + " abc" + SYSTEM_DEFAULT_NEW_LINE - + " FULL_TIME" + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + " " + SYSTEM_DEFAULT_NEW_LINE - + "" + SYSTEM_DEFAULT_NEW_LINE, + assertEquals("" + DEFAULT_NEW_LINE + + "" + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + " abc" + DEFAULT_NEW_LINE + + " FULL_TIME" + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + "" + DEFAULT_NEW_LINE, xml); } } diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XsiNilSerializationTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XsiNilSerializationTest.java index 502a67886..59f3c2a2c 100644 --- a/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XsiNilSerializationTest.java +++ b/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XsiNilSerializationTest.java @@ -41,9 +41,8 @@ public void testNilPropertyWithIndent() throws IOException final String xml = MAPPER.writerWithDefaultPrettyPrinter() .writeValueAsString(new WrapperBean<>(null)) .trim(); - assertEquals( -"\n" -+" \n" -+"", xml); + assertEquals("" + DEFAULT_NEW_LINE + + " " + DEFAULT_NEW_LINE + + "", xml); } }