Skip to content

Commit a582011

Browse files
JooHyukKimJooHyukKim
authored
Remove hardcoded system new line (#572)
1 parent 4e7378e commit a582011

File tree

5 files changed

+50
-38
lines changed

5 files changed

+50
-38
lines changed

‎src/test/java/com/fasterxml/jackson/dataformat/xml/XmlTestBase.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,14 @@
2020
public abstract class XmlTestBase
2121
extends TestCase
2222
{
23+
24+
protected static final String DEFAULT_NEW_LINE;
25+
26+
static {
27+
String newLine = System.getProperty("line.separator");
28+
DEFAULT_NEW_LINE = newLine == null ? "\n" : newLine;
29+
}
30+
2331
@JsonPropertyOrder({ "first", "last", "id" })
2432
protected static class NameBean {
2533
@JacksonXmlProperty(isAttribute=true)

‎src/test/java/com/fasterxml/jackson/dataformat/xml/misc/TextValueTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public void testSerializeAsText() throws IOException
104104
assertEquals("<Simple a=\"13\">something</Simple>", xml);
105105
// [dataformat-xml#56]: should work with indentation as well
106106
xml = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(new Simple());
107-
assertEquals("<Simple a=\"13\">something</Simple>\n", xml);
107+
assertEquals("<Simple a=\"13\">something</Simple>" + DEFAULT_NEW_LINE, xml);
108108
}
109109

110110
public void testDeserializeAsText() throws IOException

‎src/test/java/com/fasterxml/jackson/dataformat/xml/ser/Base64VariantWriteTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ private void _testBinaryVariants(Base64Variant b64v, String expEncoded,
8282
r = r.with(b64v);
8383
}
8484
final String EXP = indent ?
85-
"<BinaryValue>\n <value>"+expEncoded+"</value>\n</BinaryValue>" :
85+
"<BinaryValue>" + DEFAULT_NEW_LINE +
86+
" <value>"+expEncoded+"</value>" + DEFAULT_NEW_LINE +
87+
"</BinaryValue>" :
8688
"<BinaryValue><value>"+expEncoded+"</value></BinaryValue>";
8789
final String xml = w.writeValueAsString(new BinaryValue(BINARY_DATA)).trim();
8890

‎src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XmlPrettyPrinterTest.java

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ public void setUp() throws Exception {
9191
_xmlMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
9292
}
9393

94-
private static final String SYSTEM_DEFAULT_NEW_LINE = System.getProperty("line.separator");
95-
9694
/*
9795
/**********************************************************
9896
/* Unit tests
@@ -159,16 +157,21 @@ public void testSimpleMap() throws Exception
159157
public void testWithAttr() throws Exception
160158
{
161159
String xml = _xmlMapper.writeValueAsString(new AttrBean());
162-
assertEquals("<AttrBean count=\"3\"/>\n", xml);
160+
assertEquals("<AttrBean count=\"3\"/>" + DEFAULT_NEW_LINE, xml);
163161
String xml2 = _xmlMapper.writeValueAsString(new AttrBean2());
164-
assertEquals("<AttrBean2 count=\"3\">\n <value>14</value>\n</AttrBean2>\n", xml2);
162+
assertEquals(
163+
"<AttrBean2 count=\"3\">" + DEFAULT_NEW_LINE +
164+
" <value>14</value>" + DEFAULT_NEW_LINE +
165+
"</AttrBean2>" + DEFAULT_NEW_LINE,
166+
xml2);
165167
}
166168

167169
public void testEmptyElem() throws Exception
168170
{
169171
PojoFor123 simple = new PojoFor123("foobar");
170172
String xml = _xmlMapper.writeValueAsString(simple);
171-
assertEquals("<PojoFor123 name=\"foobar\"/>\n", xml);
173+
assertEquals("<PojoFor123 name=\"foobar\"/>" + DEFAULT_NEW_LINE,
174+
xml);
172175
}
173176

174177
public void testMultiLevel172() throws Exception
@@ -181,15 +184,15 @@ public void testMultiLevel172() throws Exception
181184
// unify possible apostrophes to quotes
182185
xml = a2q(xml);
183186

184-
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + SYSTEM_DEFAULT_NEW_LINE
185-
+"<Company>" + SYSTEM_DEFAULT_NEW_LINE
186-
+" <e>" + SYSTEM_DEFAULT_NEW_LINE
187-
+" <employee>" + SYSTEM_DEFAULT_NEW_LINE
188-
+" <id>abc</id>" + SYSTEM_DEFAULT_NEW_LINE
189-
+" <type>FULL_TIME</type>" + SYSTEM_DEFAULT_NEW_LINE
190-
+" </employee>" + SYSTEM_DEFAULT_NEW_LINE
191-
+" </e>" + SYSTEM_DEFAULT_NEW_LINE
192-
+"</Company>" + SYSTEM_DEFAULT_NEW_LINE,
187+
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + DEFAULT_NEW_LINE
188+
+"<Company>" + DEFAULT_NEW_LINE
189+
+" <e>" + DEFAULT_NEW_LINE
190+
+" <employee>" + DEFAULT_NEW_LINE
191+
+" <id>abc</id>" + DEFAULT_NEW_LINE
192+
+" <type>FULL_TIME</type>" + DEFAULT_NEW_LINE
193+
+" </employee>" + DEFAULT_NEW_LINE
194+
+" </e>" + DEFAULT_NEW_LINE
195+
+"</Company>" + DEFAULT_NEW_LINE,
193196
xml);
194197
}
195198

@@ -232,15 +235,15 @@ public void testNewLine_systemDefault() throws Exception {
232235
xml = a2q(xml);
233236

234237
// with indentation, should get newLines in prolog/epilog too
235-
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + SYSTEM_DEFAULT_NEW_LINE
236-
+ "<Company>" + SYSTEM_DEFAULT_NEW_LINE
237-
+ " <e>" + SYSTEM_DEFAULT_NEW_LINE
238-
+ " <employee>" + SYSTEM_DEFAULT_NEW_LINE
239-
+ " <id>abc</id>" + SYSTEM_DEFAULT_NEW_LINE
240-
+ " <type>FULL_TIME</type>" + SYSTEM_DEFAULT_NEW_LINE
241-
+ " </employee>" + SYSTEM_DEFAULT_NEW_LINE
242-
+ " </e>" + SYSTEM_DEFAULT_NEW_LINE
243-
+ "</Company>" + SYSTEM_DEFAULT_NEW_LINE,
238+
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + DEFAULT_NEW_LINE
239+
+ "<Company>" + DEFAULT_NEW_LINE
240+
+ " <e>" + DEFAULT_NEW_LINE
241+
+ " <employee>" + DEFAULT_NEW_LINE
242+
+ " <id>abc</id>" + DEFAULT_NEW_LINE
243+
+ " <type>FULL_TIME</type>" + DEFAULT_NEW_LINE
244+
+ " </employee>" + DEFAULT_NEW_LINE
245+
+ " </e>" + DEFAULT_NEW_LINE
246+
+ "</Company>" + DEFAULT_NEW_LINE,
244247
xml);
245248
}
246249

@@ -255,15 +258,15 @@ public void testNewLine_UseSystemDefaultLineSeperatorOnNullCustomNewLine() throw
255258
// unify possible apostrophes to quotes
256259
xml = a2q(xml);
257260

258-
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + SYSTEM_DEFAULT_NEW_LINE
259-
+ "<Company>" + SYSTEM_DEFAULT_NEW_LINE
260-
+ " <e>" + SYSTEM_DEFAULT_NEW_LINE
261-
+ " <employee>" + SYSTEM_DEFAULT_NEW_LINE
262-
+ " <id>abc</id>" + SYSTEM_DEFAULT_NEW_LINE
263-
+ " <type>FULL_TIME</type>" + SYSTEM_DEFAULT_NEW_LINE
264-
+ " </employee>" + SYSTEM_DEFAULT_NEW_LINE
265-
+ " </e>" + SYSTEM_DEFAULT_NEW_LINE
266-
+ "</Company>" + SYSTEM_DEFAULT_NEW_LINE,
261+
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + DEFAULT_NEW_LINE
262+
+ "<Company>" + DEFAULT_NEW_LINE
263+
+ " <e>" + DEFAULT_NEW_LINE
264+
+ " <employee>" + DEFAULT_NEW_LINE
265+
+ " <id>abc</id>" + DEFAULT_NEW_LINE
266+
+ " <type>FULL_TIME</type>" + DEFAULT_NEW_LINE
267+
+ " </employee>" + DEFAULT_NEW_LINE
268+
+ " </e>" + DEFAULT_NEW_LINE
269+
+ "</Company>" + DEFAULT_NEW_LINE,
267270
xml);
268271
}
269272
}

‎src/test/java/com/fasterxml/jackson/dataformat/xml/ser/XsiNilSerializationTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ public void testNilPropertyWithIndent() throws IOException
4141
final String xml = MAPPER.writerWithDefaultPrettyPrinter()
4242
.writeValueAsString(new WrapperBean<>(null))
4343
.trim();
44-
assertEquals(
45-
"<WrapperBean>\n"
46-
+" <value xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:nil=\"true\"/>\n"
47-
+"</WrapperBean>", xml);
44+
assertEquals("<WrapperBean>" + DEFAULT_NEW_LINE
45+
+ " <value xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:nil=\"true\"/>" + DEFAULT_NEW_LINE
46+
+ "</WrapperBean>", xml);
4847
}
4948
}

0 commit comments

Comments
 (0)