Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 87bdf70

Browse files
committed
Fix Environment.NewLine in tests on Linux
1 parent c400469 commit 87bdf70

File tree

3 files changed

+15
-23
lines changed

3 files changed

+15
-23
lines changed

tests/ServiceStack.Text.Tests/DataContractTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public void Csv_Serialize_Should_Respects_DataContract_Name()
210210
};
211211

212212
Assert.That(CsvSerializer.SerializeToString(classTwo),
213-
Is.EqualTo(String.Format("NewName{0}Value{0}", Environment.NewLine)));
213+
Is.EqualTo(String.Format("NewName\r\nValue\r\n")));
214214
}
215215

216216
[Test]

tests/ServiceStack.Text.Tests/GenericCollectionTests.cs

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void Can_serialize_Queue_string()
2222

2323
Serialize(queue);
2424

25-
Assert.That(CsvSerializer.SerializeToString(queue), Is.EqualTo("one,two,three" + Environment.NewLine));
25+
Assert.That(CsvSerializer.SerializeToString(queue), Is.EqualTo("one,two,three\r\n"));
2626
}
2727

2828
[Test]
@@ -36,7 +36,7 @@ public void Can_serialize_Queue_int()
3636

3737
Serialize(queue);
3838

39-
Assert.That(CsvSerializer.SerializeToString(queue), Is.EqualTo("1,2,3" + Environment.NewLine));
39+
Assert.That(CsvSerializer.SerializeToString(queue), Is.EqualTo("1,2,3\r\n"));
4040
}
4141

4242
[Test]
@@ -52,14 +52,10 @@ public void Can_serialize_Queue_Generic()
5252

5353
Assert.That(CsvSerializer.SerializeToString(queue),
5454
Is.EqualTo(
55-
"Id,Name"
56-
+ Environment.NewLine
57-
+ "1,Name1"
58-
+ Environment.NewLine
59-
+ "2,Name2"
60-
+ Environment.NewLine
61-
+ "3,Name3"
62-
+ Environment.NewLine
55+
"Id,Name\r\n"
56+
+ "1,Name1\r\n"
57+
+ "2,Name2\r\n"
58+
+ "3,Name3\r\n"
6359
));
6460
}
6561

@@ -74,7 +70,7 @@ public void Can_serialize_Stack_string()
7470

7571
Serialize(stack);
7672

77-
Assert.That(CsvSerializer.SerializeToString(stack), Is.EqualTo("three,two,one" + Environment.NewLine));
73+
Assert.That(CsvSerializer.SerializeToString(stack), Is.EqualTo("three,two,one\r\n"));
7874
}
7975

8076
[Test]
@@ -88,7 +84,7 @@ public void Can_serialize_Stack_int()
8884

8985
Serialize(stack);
9086

91-
Assert.That(CsvSerializer.SerializeToString(stack), Is.EqualTo("3,2,1" + Environment.NewLine));
87+
Assert.That(CsvSerializer.SerializeToString(stack), Is.EqualTo("3,2,1\r\n"));
9288
}
9389

9490
[Test]
@@ -104,14 +100,10 @@ public void Can_serialize_Stack_Generic()
104100

105101
Assert.That(CsvSerializer.SerializeToString(stack),
106102
Is.EqualTo(
107-
"Id,Name"
108-
+ Environment.NewLine
109-
+ "3,Name3"
110-
+ Environment.NewLine
111-
+ "2,Name2"
112-
+ Environment.NewLine
113-
+ "1,Name1"
114-
+ Environment.NewLine
103+
"Id,Name\r\n"
104+
+ "3,Name3\r\n"
105+
+ "2,Name2\r\n"
106+
+ "1,Name1\r\n"
115107
));
116108
}
117109
}

tests/ServiceStack.Text.Tests/JsonTests/EscapedCharsTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public void Can_serialize_array_of_control_chars_and_unicode()
269269
public void Can_serialize_windows_new_line()
270270
{
271271
const string expected = "\"Hi I\'m\\r\\nnew line :)\"";
272-
var text = "Hi I\'m" + Environment.NewLine + "new line :)";
272+
var text = "Hi I\'m\r\nnew line :)";
273273

274274
var result = JsonSerializer.SerializeToString(text);
275275

@@ -283,7 +283,7 @@ public void Can_serialize_object_with_escaped_chars()
283283
var model = new ModelWithIdAndName
284284
{
285285
Id = 1,
286-
Name = "Hi I'm" + Environment.NewLine + "new line :)"
286+
Name = "Hi I'm\r\nnew line :)"
287287
};
288288

289289
var result = JsonSerializer.SerializeToString(model);

0 commit comments

Comments
 (0)