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

Commit b11ec40

Browse files
mythzmythz
committed
rewrite async tests so only run when Dialect changes
1 parent de0fff5 commit b11ec40

File tree

6 files changed

+40
-90
lines changed

6 files changed

+40
-90
lines changed

‎tests/ServiceStack.OrmLite.Tests/ApiSqlServerTests.cs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,16 @@ namespace ServiceStack.OrmLite.Tests
1010
public class ApiSqlServerTests
1111
: OrmLiteTestBase
1212
{
13-
private IDbConnection db;
14-
15-
[SetUp]
16-
public void SetUp()
13+
[Test]
14+
public void API_SqlServer_Examples()
1715
{
16+
if (Dialect != Dialect.SqlServer) return;
17+
1818
SuppressIfOracle("SQL Server tests");
19-
db = CreateSqlServerDbFactory().OpenDbConnection();
19+
var db = CreateSqlServerDbFactory().OpenDbConnection();
2020
db.DropAndCreateTable<Person>();
2121
db.DropAndCreateTable<PersonWithAutoId>();
22-
}
2322

24-
[TearDown]
25-
public void TearDown()
26-
{
27-
db.Dispose();
28-
}
29-
30-
[Test]
31-
public void API_SqlServer_Examples()
32-
{
3323
db.Insert(Person.Rockstars);
3424

3525
db.Select<Person>(x => x.Age > 40);
@@ -342,6 +332,7 @@ public void API_SqlServer_Examples()
342332

343333
db.SaveAll(new[]{ new Person { Id = 14, FirstName = "Amy", LastName = "Winehouse", Age = 27 },
344334
new Person { Id = 15, FirstName = "Amy", LastName = "Winehouse", Age = 27 } });
335+
db.Dispose();
345336
}
346337
}
347338
}

‎tests/ServiceStack.OrmLite.Tests/ApiSqliteTests.cs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,15 @@ namespace ServiceStack.OrmLite.Tests
99
public class ApiSqliteTests
1010
: OrmLiteTestBase
1111
{
12-
private IDbConnection db;
13-
14-
[SetUp]
15-
public void SetUp()
12+
[Test]
13+
public void API_Sqlite_Examples()
1614
{
17-
db = CreateSqliteMemoryDbFactory().OpenDbConnection();
15+
if (Dialect != Dialect.Sqlite) return;
16+
17+
var db = CreateSqliteMemoryDbFactory().OpenDbConnection();
1818
db.DropAndCreateTable<Person>();
1919
db.DropAndCreateTable<PersonWithAutoId>();
20-
}
2120

22-
[TearDown]
23-
public void TearDown()
24-
{
25-
db.Dispose();
26-
}
27-
28-
[Test]
29-
public void API_Sqlite_Examples()
30-
{
3121
db.Insert(Person.Rockstars);
3222

3323
db.Select<Person>(x => x.Age > 40);
@@ -350,6 +340,7 @@ public void API_Sqlite_Examples()
350340

351341
db.SaveAll(new[]{ new Person { Id = 14, FirstName = "Amy", LastName = "Winehouse", Age = 27 },
352342
new Person { Id = 15, FirstName = "Amy", LastName = "Winehouse", Age = 27 } });
343+
db.Dispose();
353344
}
354345

355346
}

‎tests/ServiceStack.OrmLite.Tests/Async/Legacy/ApiMySqlLegacyTestsAsync.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,16 @@ namespace ServiceStack.OrmLite.Tests.Async.Legacy
99
public class ApiMySqlLegacyTestsAsync
1010
: OrmLiteTestBase
1111
{
12-
private IDbConnection db;
13-
14-
[SetUp]
15-
public void SetUp()
12+
[Test]
13+
public async Task API_MySql_Legacy_Examples_Async()
1614
{
15+
if (Dialect != Dialect.MySql) return;
16+
1717
SuppressIfOracle("MySql tests");
18-
db = CreateMySqlDbFactory().OpenDbConnection();
18+
var db = CreateMySqlDbFactory().OpenDbConnection();
1919
db.DropAndCreateTable<Person>();
2020
db.DropAndCreateTable<PersonWithAutoId>();
21-
}
22-
23-
[TearDown]
24-
public void TearDown()
25-
{
26-
db.Dispose();
27-
}
2821

29-
[Test]
30-
public async Task API_MySql_Legacy_Examples_Async()
31-
{
3222
await db.SelectAsync<Person>(q => q.Where(x => x.Age > 40).OrderBy(x => x.Id));
3323
Assert.That(db.GetLastSql(), Is.EqualTo("SELECT `Id`, `FirstName`, `LastName`, `Age` \nFROM `Person`\nWHERE (`Age` > @0)\nORDER BY `Id`"));
3424

@@ -105,6 +95,8 @@ public async Task API_MySql_Legacy_Examples_Async()
10595

10696
await db.DeleteFmtAsync(table: "Person", where: "Age = {0}".SqlFmt(27));
10797
Assert.That(db.GetLastSql(), Is.EqualTo("DELETE FROM `Person` WHERE Age = 27"));
98+
99+
db.Dispose();
108100
}
109101
}
110102
}

‎tests/ServiceStack.OrmLite.Tests/Async/Legacy/ApiPostgreSqlLegacyTestsAsync.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,16 @@ namespace ServiceStack.OrmLite.Tests.Async.Legacy
99
public class ApiPostgreSqlLegacyTestsAsync
1010
: OrmLiteTestBase
1111
{
12-
private IDbConnection db;
13-
14-
[SetUp]
15-
public void SetUp()
12+
[Test]
13+
public async Task API_PostgreSql_Legacy_Examples_Async()
1614
{
15+
if (Dialect != Dialect.PostgreSql) return;
16+
1717
SuppressIfOracle("SQL Server tests");
18-
db = CreatePostgreSqlDbFactory().OpenDbConnection();
18+
var db = CreatePostgreSqlDbFactory().OpenDbConnection();
1919
db.DropAndCreateTable<Person>();
2020
db.DropAndCreateTable<PersonWithAutoId>();
21-
}
22-
23-
[TearDown]
24-
public void TearDown()
25-
{
26-
db.Dispose();
27-
}
2821

29-
[Test]
30-
public async Task API_PostgreSql_Legacy_Examples_Async()
31-
{
3222
await db.InsertAsync(Person.Rockstars);
3323

3424
await db.SelectAsync<Person>(q => q.Where(x => x.Age > 40).OrderBy(x => x.Id));
@@ -107,6 +97,8 @@ public async Task API_PostgreSql_Legacy_Examples_Async()
10797

10898
await db.DeleteFmtAsync(table: "Person", where: "age = {0}".SqlFmt(27));
10999
Assert.That(db.GetLastSql(), Is.EqualTo("DELETE FROM \"person\" WHERE age = 27"));
100+
101+
db.Dispose();
110102
}
111103
}
112104
}

‎tests/ServiceStack.OrmLite.Tests/Async/Legacy/ApiSqlServerLegacyTestsAsync.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,16 @@ namespace ServiceStack.OrmLite.Tests.Async.Legacy
99
public class ApiSqlServerLegacyTestsAsync
1010
: OrmLiteTestBase
1111
{
12-
private IDbConnection db;
13-
14-
[SetUp]
15-
public void SetUp()
12+
[Test]
13+
public async Task API_SqlServer_Legacy_Examples_Async()
1614
{
15+
if (Dialect != Dialect.SqlServer) return;
16+
1717
SuppressIfOracle("SQL Server tests");
18-
db = CreateSqlServerDbFactory().OpenDbConnection();
18+
var db = CreateSqlServerDbFactory().OpenDbConnection();
1919
db.DropAndCreateTable<Person>();
2020
db.DropAndCreateTable<PersonWithAutoId>();
21-
}
2221

23-
[TearDown]
24-
public void TearDown()
25-
{
26-
db.Dispose();
27-
}
28-
29-
[Test]
30-
public async Task API_SqlServer_Legacy_Examples_Async()
31-
{
3222
await db.InsertAsync(Person.Rockstars);
3323

3424
await db.SelectAsync<Person>(q => q.Where(x => x.Age > 40).OrderBy(x => x.Id));
@@ -107,6 +97,8 @@ public async Task API_SqlServer_Legacy_Examples_Async()
10797

10898
await db.DeleteFmtAsync(table: "Person", where: "Age = {0}".SqlFmt(27));
10999
Assert.That(db.GetLastSql(), Is.EqualTo("DELETE FROM \"Person\" WHERE Age = 27"));
100+
101+
db.Dispose();
110102
}
111103
}
112104
}

‎tests/ServiceStack.OrmLite.Tests/Async/Legacy/ApiSqliteLegacyTestsAsync.cs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,15 @@ namespace ServiceStack.OrmLite.Tests.Async.Legacy
99
public class ApiSqliteLegacyTestsAsync
1010
: OrmLiteTestBase
1111
{
12-
private IDbConnection db;
13-
14-
[SetUp]
15-
public void SetUp()
12+
[Test]
13+
public async Task API_Sqlite_Legacy_Examples_Async()
1614
{
17-
db = CreateSqliteMemoryDbFactory().OpenDbConnection();
15+
if (Dialect != Dialect.Sqlite) return;
16+
17+
var db = CreateSqliteMemoryDbFactory().OpenDbConnection();
1818
db.DropAndCreateTable<Person>();
1919
db.DropAndCreateTable<PersonWithAutoId>();
20-
}
21-
22-
[TearDown]
23-
public void TearDown()
24-
{
25-
db.Dispose();
26-
}
2720

28-
[Test]
29-
public async Task API_Sqlite_Legacy_Examples_Async()
30-
{
3121
await db.InsertAsync(Person.Rockstars);
3222

3323
await db.SelectAsync<Person>(q => q.Where(x => x.Age > 40).OrderBy(x => x.Id));
@@ -106,6 +96,8 @@ public async Task API_Sqlite_Legacy_Examples_Async()
10696

10797
await db.DeleteFmtAsync(table: "Person", where: "Age = {0}".SqlFmt(27));
10898
Assert.That(db.GetLastSql(), Is.EqualTo("DELETE FROM \"Person\" WHERE Age = 27"));
99+
100+
db.Dispose();
109101
}
110102
}
111103
}

0 commit comments

Comments
 (0)