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

Commit 2ca7d4a

Browse files
mythzmythz
committed
cleanup
1 parent 23eadf2 commit 2ca7d4a

File tree

4 files changed

+254
-297
lines changed

4 files changed

+254
-297
lines changed

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteSaveTests.cs

Lines changed: 61 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Data;
34
using NUnit.Framework;
45
using ServiceStack.Common.Tests.Models;
56

@@ -9,139 +10,127 @@ namespace ServiceStack.OrmLite.FirebirdTests
910
public class OrmLiteSaveTests
1011
: OrmLiteTestBase
1112
{
12-
13+
private IDbConnection Open() =>
14+
new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open();
15+
1316
[Test]
1417
public void Can_Save_into_ModelWithFieldsOfDifferentTypes_table()
1518
{
16-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
17-
{
18-
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
19+
using var db = Open();
20+
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
1921

20-
var row = ModelWithFieldsOfDifferentTypes.Create(1);
22+
var row = ModelWithFieldsOfDifferentTypes.Create(1);
2123

22-
db.Save(row);
23-
}
24+
db.Save(row);
2425
}
2526

2627
[Test]
2728
public void Can_Save_and_select_from_ModelWithFieldsOfDifferentTypes_table()
2829
{
29-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
30-
{
31-
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
30+
using var db = Open();
31+
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
3232

33-
var row = ModelWithFieldsOfDifferentTypes.Create(1);
33+
var row = ModelWithFieldsOfDifferentTypes.Create(1);
3434

35-
db.Save(row);
35+
db.Save(row);
3636

37-
var rows = db.Select<ModelWithFieldsOfDifferentTypes>();
37+
var rows = db.Select<ModelWithFieldsOfDifferentTypes>();
3838

39-
Assert.That(rows, Has.Count.EqualTo(1));
39+
Assert.That(rows, Has.Count.EqualTo(1));
4040

41-
ModelWithFieldsOfDifferentTypes.AssertIsEqual(rows[0], row);
42-
}
41+
ModelWithFieldsOfDifferentTypes.AssertIsEqual(rows[0], row);
4342
}
4443

4544
[Test]
4645
public void Can_SaveAll_and_select_from_ModelWithFieldsOfDifferentTypes_table()
4746
{
48-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
49-
{
50-
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
47+
using var db = Open();
48+
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
5149

52-
var rowIds = new List<int> { 1, 2, 3, 4, 5 };
53-
var newRows = rowIds.ConvertAll(x => ModelWithFieldsOfDifferentTypes.Create(x));
50+
var rowIds = new List<int> { 1, 2, 3, 4, 5 };
51+
var newRows = rowIds.ConvertAll(x => ModelWithFieldsOfDifferentTypes.Create(x));
5452

55-
db.SaveAll(newRows);
53+
db.SaveAll(newRows);
5654

57-
var rows = db.Select<ModelWithFieldsOfDifferentTypes>();
55+
var rows = db.Select<ModelWithFieldsOfDifferentTypes>();
5856

59-
Assert.That(rows, Has.Count.EqualTo(newRows.Count));
60-
}
57+
Assert.That(rows, Has.Count.EqualTo(newRows.Count));
6158
}
6259

6360
[Test]
6461
public void Can_SaveAll_and_select_from_ModelWithFieldsOfDifferentTypes_table_with_no_ids()
6562
{
66-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
67-
{
68-
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
69-
db.DeleteAll<ModelWithFieldsOfDifferentTypes>();
70-
var rowIds = new List<int> { 1, 2, 3, 4, 5 };
71-
var newRows = rowIds.ConvertAll(x => ModelWithFieldsOfDifferentTypes.Create(default(int)));
63+
using var db = Open();
64+
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
65+
db.DeleteAll<ModelWithFieldsOfDifferentTypes>();
66+
var rowIds = new List<int> { 1, 2, 3, 4, 5 };
67+
var newRows = rowIds.ConvertAll(x => ModelWithFieldsOfDifferentTypes.Create(default(int)));
7268

73-
db.SaveAll(newRows);
69+
db.SaveAll(newRows);
7470

75-
var rows = db.Select<ModelWithFieldsOfDifferentTypes>();
71+
var rows = db.Select<ModelWithFieldsOfDifferentTypes>();
7672

77-
Assert.That(rows, Has.Count.EqualTo(newRows.Count));
78-
}
73+
Assert.That(rows, Has.Count.EqualTo(newRows.Count));
7974
}
8075

8176
[Test]
8277
public void Can_Save_table_with_null_fields()
8378
{
84-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
85-
{
86-
db.CreateTable<ModelWithIdAndName>(true);
87-
db.DeleteAll<ModelWithIdAndName>();
88-
var row = ModelWithIdAndName.Create(0);
89-
row.Name = null;
79+
using var db = Open();
80+
db.CreateTable<ModelWithIdAndName>(true);
81+
db.DeleteAll<ModelWithIdAndName>();
82+
var row = ModelWithIdAndName.Create(0);
83+
row.Name = null;
9084

91-
db.Save(row);
85+
db.Save(row);
9286

93-
var rows = db.Select<ModelWithIdAndName>();
87+
var rows = db.Select<ModelWithIdAndName>();
9488

95-
Assert.That(rows, Has.Count.EqualTo(1));
89+
Assert.That(rows, Has.Count.EqualTo(1));
9690

97-
ModelWithIdAndName.AssertIsEqual(rows[0], row);
98-
}
91+
ModelWithIdAndName.AssertIsEqual(rows[0], row);
9992
}
10093

10194
[Test]
10295
public void Can_Save_TaskQueue_table()
10396
{
104-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
105-
{
106-
db.CreateTable<TaskQueue>(true);
97+
using var db = Open();
98+
db.CreateTable<TaskQueue>(true);
10799

108-
var row = TaskQueue.Create(1);
100+
var row = TaskQueue.Create(1);
109101

110-
db.Save(row);
102+
db.Save(row);
111103

112-
var rows = db.Select<TaskQueue>();
104+
var rows = db.Select<TaskQueue>();
113105

114-
Assert.That(rows, Has.Count.EqualTo(1));
106+
Assert.That(rows, Has.Count.EqualTo(1));
115107

116-
//Update the auto-increment id
117-
row.Id = rows[0].Id;
108+
//Update the auto-increment id
109+
row.Id = rows[0].Id;
118110

119-
TaskQueue.AssertIsEqual(rows[0], row);
120-
}
111+
TaskQueue.AssertIsEqual(rows[0], row);
121112
}
122113

123114
[Test]
124115
public void Can_SaveAll_and_select_from_Movie_table()
125116
{
126-
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
127-
{
128-
db.CreateTable<Movie>(true);
117+
using var db = Open();
118+
db.CreateTable<Movie>(true);
129119

130-
var top5Movies = new List<Movie>
131-
{
132-
new Movie { Id = "tt0111161", Title = "The Shawshank Redemption", Rating = 9.2m, Director = "Frank Darabont", ReleaseDate = new DateTime(1995,2,17), TagLine = "Fear can hold you prisoner. Hope can set you free.", Genres = new List<string>{"Crime","Drama"}, },
133-
new Movie { Id = "tt0068646", Title = "The Godfather", Rating = 9.2m, Director = "Francis Ford Coppola", ReleaseDate = new DateTime(1972,3,24), TagLine = "An offer you can't refuse.", Genres = new List<string> {"Crime","Drama", "Thriller"}, },
134-
new Movie { Id = "tt1375666", Title = "Inception", Rating = 9.2m, Director = "Christopher Nolan", ReleaseDate = new DateTime(2010,7,16), TagLine = "Your mind is the scene of the crime", Genres = new List<string>{"Action", "Mystery", "Sci-Fi", "Thriller"}, },
135-
new Movie { Id = "tt0071562", Title = "The Godfather: Part II", Rating = 9.0m, Director = "Francis Ford Coppola", ReleaseDate = new DateTime(1974,12,20), Genres = new List<string> {"Crime","Drama", "Thriller"}, },
136-
new Movie { Id = "tt0060196", Title = "The Good, the Bad and the Ugly", Rating = 9.0m, Director = "Sergio Leone", ReleaseDate = new DateTime(1967,12,29), TagLine = "They formed an alliance of hate to steal a fortune in dead man's gold", Genres = new List<string>{"Adventure","Western"}, },
137-
};
120+
var top5Movies = new List<Movie>
121+
{
122+
new Movie { Id = "tt0111161", Title = "The Shawshank Redemption", Rating = 9.2m, Director = "Frank Darabont", ReleaseDate = new DateTime(1995,2,17), TagLine = "Fear can hold you prisoner. Hope can set you free.", Genres = new List<string>{"Crime","Drama"}, },
123+
new Movie { Id = "tt0068646", Title = "The Godfather", Rating = 9.2m, Director = "Francis Ford Coppola", ReleaseDate = new DateTime(1972,3,24), TagLine = "An offer you can't refuse.", Genres = new List<string> {"Crime","Drama", "Thriller"}, },
124+
new Movie { Id = "tt1375666", Title = "Inception", Rating = 9.2m, Director = "Christopher Nolan", ReleaseDate = new DateTime(2010,7,16), TagLine = "Your mind is the scene of the crime", Genres = new List<string>{"Action", "Mystery", "Sci-Fi", "Thriller"}, },
125+
new Movie { Id = "tt0071562", Title = "The Godfather: Part II", Rating = 9.0m, Director = "Francis Ford Coppola", ReleaseDate = new DateTime(1974,12,20), Genres = new List<string> {"Crime","Drama", "Thriller"}, },
126+
new Movie { Id = "tt0060196", Title = "The Good, the Bad and the Ugly", Rating = 9.0m, Director = "Sergio Leone", ReleaseDate = new DateTime(1967,12,29), TagLine = "They formed an alliance of hate to steal a fortune in dead man's gold", Genres = new List<string>{"Adventure","Western"}, },
127+
};
138128

139-
db.SaveAll(top5Movies);
129+
db.SaveAll(top5Movies);
140130

141-
var rows = db.Select<Movie>();
131+
var rows = db.Select<Movie>();
142132

143-
Assert.That(rows, Has.Count.EqualTo(top5Movies.Count));
144-
}
133+
Assert.That(rows, Has.Count.EqualTo(top5Movies.Count));
145134
}
146135

147136
}

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteTestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void Log(string text)
3636

3737
public IDbConnection OpenDbConnection(string connString = null)
3838
{
39-
connString = connString ?? ConnectionString;
39+
connString ??= ConnectionString;
4040
return connString.OpenDbConnection();
4141
}
4242
}

‎tests/ServiceStack.OrmLite.Tests/Issues/SaveAllIssue.cs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,18 @@ class UserRole
1515
[Test]
1616
public void Can_use_SaveAll_to_save_one_column_table()
1717
{
18-
using (var db = OpenDbConnection())
19-
{
20-
db.CreateTableIfNotExists<UserRole>();
18+
using var db = OpenDbConnection();
19+
db.CreateTableIfNotExists<UserRole>();
2120

22-
db.SaveAll(new[]
23-
{
24-
new UserRole { Name = "Admin" },
25-
new UserRole { Name = "Reader" },
26-
new UserRole { Name = "Writer" },
27-
});
21+
db.SaveAll(new[]
22+
{
23+
new UserRole { Name = "Admin" },
24+
new UserRole { Name = "Reader" },
25+
new UserRole { Name = "Writer" },
26+
});
2827

29-
var rows = db.Select<UserRole>();
30-
Assert.That(rows.Map(x => x.Name), Is.EquivalentTo(new[]{ "Admin", "Reader", "Writer"}));
31-
}
28+
var rows = db.Select<UserRole>();
29+
Assert.That(rows.Map(x => x.Name), Is.EquivalentTo(new[]{ "Admin", "Reader", "Writer"}));
3230
}
3331
}
3432
}

0 commit comments

Comments
 (0)