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

Commit 4d19cd1

Browse files
committed
fix tests with new NormalizeNewLines behavior
1 parent 4b6edbe commit 4d19cd1

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

lib/netstandard1.1/ServiceStack.Text.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/netstandard1.3/ServiceStack.Text.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/ServiceStack.OrmLite.Tests/Async/AutoQueryTestsAsync.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public async Task Can_Select_custom_fields_using_dynamic_Async()
156156
}
157157

158158
Assert.That(sb.ToString().NormalizeNewLines(), Is.EqualTo(
159-
"First 1,Last 1,Dept 1\nFirst 2,Last 2,Dept 2\nFirst 3,Last 3,Dept 3\n"));
159+
"First 1,Last 1,Dept 1\nFirst 2,Last 2,Dept 2\nFirst 3,Last 3,Dept 3"));
160160

161161
q = db.From<DeptEmployee>()
162162
.Join<Department2>()
@@ -177,7 +177,7 @@ public async Task Can_Select_custom_fields_using_dynamic_Async()
177177
}
178178
}
179179

180-
Assert.That(sb.ToString().NormalizeNewLines(), Is.EqualTo("Dept 1\nDept 2\nDept 3\n"));
180+
Assert.That(sb.ToString().NormalizeNewLines(), Is.EqualTo("Dept 1\nDept 2\nDept 3"));
181181
}
182182
}
183183
}

tests/ServiceStack.OrmLite.Tests/AutoQueryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ public void Can_Select_custom_fields_using_dynamic()
379379
}
380380

381381
Assert.That(sb.ToString().NormalizeNewLines(), Is.EqualTo(
382-
"First 1,Last 1,Dept 1\nFirst 2,Last 2,Dept 2\nFirst 3,Last 3,Dept 3\n"));
382+
"First 1,Last 1,Dept 1\nFirst 2,Last 2,Dept 2\nFirst 3,Last 3,Dept 3"));
383383

384384
q = db.From<DeptEmployee>()
385385
.Join<Department2>()
@@ -398,7 +398,7 @@ public void Can_Select_custom_fields_using_dynamic()
398398
sb.AppendLine(result.Name);
399399
}
400400

401-
Assert.That(sb.ToString().NormalizeNewLines(), Is.EqualTo("Dept 1\nDept 2\nDept 3\n"));
401+
Assert.That(sb.ToString().NormalizeNewLines(), Is.EqualTo("Dept 1\nDept 2\nDept 3"));
402402
}
403403
}
404404

tests/ServiceStack.OrmLite.Tests/Issues/CsvTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void Can_serialize_Dapper_results_to_CSV()
2525
Assert.That(json.ToLower(), Is.EqualTo("[{\"Id\":1,\"Name\":\"Foo\"},{\"Id\":2,\"Name\":\"Bar\"}]".ToLower()));
2626

2727
var csv = CsvSerializer.SerializeToCsv(results);
28-
Assert.That(csv.NormalizeNewLines().ToLower(), Is.EqualTo("Id,Name\n1,Foo\n2,Bar\n".ToLower()));
28+
Assert.That(csv.NormalizeNewLines().ToLower(), Is.EqualTo("Id,Name\n1,Foo\n2,Bar".ToLower()));
2929
}
3030
}
3131

@@ -45,11 +45,11 @@ public void Can_serialize_OrmLite_results_to_CSV()
4545
Assert.That(json.ToLower(), Is.EqualTo("[{\"Id\":1,\"Name\":\"Foo\"},{\"Id\":2,\"Name\":\"Bar\"}]".ToLower()));
4646

4747
var csv = results.ToCsv();
48-
Assert.That(csv.NormalizeNewLines().ToLower(), Is.EqualTo("Id,Name\n1,Foo\n2,Bar\n".ToLower()));
48+
Assert.That(csv.NormalizeNewLines().ToLower(), Is.EqualTo("Id,Name\n1,Foo\n2,Bar".ToLower()));
4949

5050
var rows = db.Select<Dictionary<string,object>>("select * from Poco Order By Id");
5151
csv = rows.ToCsv();
52-
Assert.That(csv.NormalizeNewLines().ToLower(), Is.EqualTo("Id,Name\n1,Foo\n2,Bar\n".ToLower()));
52+
Assert.That(csv.NormalizeNewLines().ToLower(), Is.EqualTo("Id,Name\n1,Foo\n2,Bar".ToLower()));
5353
}
5454
}
5555
}

tests/ServiceStack.OrmLite.Tests/TemplateDbTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ namespace ServiceStack.OrmLite.Tests
77
{
88
public class TemplateDbTests : OrmLiteTestBase
99
{
10-
public TemplateDbTests() : base(Dialect.SqlServer) {}
11-
1210
[Test]
1311
public async Task Can_retrieve_single_record_with_param()
1412
{
@@ -32,6 +30,8 @@ public async Task Can_retrieve_single_record_with_param()
3230
[Test]
3331
public async Task Can_call_dbSingle_with_param()
3432
{
33+
if (Dialect == Dialect.Sqlite) return;
34+
3535
using (var db = OpenDbConnection())
3636
{
3737
db.DropAndCreateTable<Rockstar>();

0 commit comments

Comments
 (0)