Skip to content

Commit aee3e16

Browse files
committed
Fix test line ending issues
1 parent 726c05d commit aee3e16

File tree

2 files changed

+37
-28
lines changed

2 files changed

+37
-28
lines changed

test/JsonMapperTest.cs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,15 @@ public void ExportPrettyPrint ()
351351
sample["flaming"] = "pie";
352352
sample["nine"] = 9;
353353

354-
string expected = @"
355-
{
356-
""rolling"" : ""stones"",
357-
""flaming"" : ""pie"",
358-
""nine"" : 9
359-
}";
354+
string expected =string.Join(
355+
Environment.NewLine,
356+
new [] {
357+
"",
358+
"{",
359+
" \"rolling\" : \"stones\",",
360+
" \"flaming\" : \"pie\",",
361+
" \"nine\" : 9",
362+
"}"});
360363

361364
JsonWriter writer = new JsonWriter ();
362365
writer.PrettyPrint = true;
@@ -368,12 +371,15 @@ public void ExportPrettyPrint ()
368371
writer.Reset ();
369372
writer.IndentValue = 8;
370373

371-
expected = @"
372-
{
373-
""rolling"" : ""stones"",
374-
""flaming"" : ""pie"",
375-
""nine"" : 9
376-
}";
374+
expected = string.Join(
375+
Environment.NewLine,
376+
new [] {
377+
"",
378+
"{",
379+
" \"rolling\" : \"stones\",",
380+
" \"flaming\" : \"pie\",",
381+
" \"nine\" : 9",
382+
"}"});
377383
JsonMapper.ToJson (sample, writer);
378384

379385
Assert.AreEqual (expected, writer.ToString (), "A2");

test/JsonWriterTest.cs

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -232,21 +232,24 @@ public void PrettyPrintTest ()
232232
{
233233
JsonWriter writer = new JsonWriter ();
234234

235-
string json = @"
236-
[
237-
{
238-
""precision"" : ""zip"",
239-
""Latitude"" : 37.7668,
240-
""Longitude"" : -122.3959,
241-
""City"" : ""SAN FRANCISCO""
242-
},
243-
{
244-
""precision"" : ""zip"",
245-
""Latitude"" : 37.371991,
246-
""Longitude"" : -122.02602,
247-
""City"" : ""SUNNYVALE""
248-
}
249-
]";
235+
string json = string.Join(
236+
Environment.NewLine,
237+
new [] {
238+
"",
239+
"[",
240+
" {",
241+
" \"precision\" : \"zip\",",
242+
" \"Latitude\" : 37.7668,",
243+
" \"Longitude\" : -122.3959,",
244+
" \"City\" : \"SAN FRANCISCO\"",
245+
" },",
246+
" {",
247+
" \"precision\" : \"zip\",",
248+
" \"Latitude\" : 37.371991,",
249+
" \"Longitude\" : -122.02602,",
250+
" \"City\" : \"SUNNYVALE\"",
251+
" }",
252+
"]"});
250253

251254
writer.PrettyPrint = true;
252255

@@ -276,7 +279,7 @@ public void PrettyPrintTest ()
276279
writer.WriteObjectEnd ();
277280
writer.WriteArrayEnd ();
278281

279-
Assert.AreEqual (writer.ToString (), json);
282+
Assert.AreEqual (json, writer.ToString ());
280283
}
281284

282285
[Test]

0 commit comments

Comments
 (0)