Skip to content

Commit 7cac382

Browse files
DamirAinullinNickCraver
authored andcommitted
Replaced Connection with GetClosedConnection in some unit tests… (#1337)
…cording to their names.
1 parent 3b0cd9a commit 7cac382

File tree

1 file changed

+32
-18
lines changed

1 file changed

+32
-18
lines changed

Dapper.Tests/AsyncTests.cs

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ public sealed class MicrosoftSqlClientAsyncTests : AsyncTests<MicrosoftSqlClient
1818
#endif
1919

2020
[Collection(NonParallelDefinition.Name)]
21-
public sealed class SystemSqlClientAsyncQueryCacheTests : AsyncQueryCacheTests<SystemSqlClientProvider> {
21+
public sealed class SystemSqlClientAsyncQueryCacheTests : AsyncQueryCacheTests<SystemSqlClientProvider>
22+
{
2223
public SystemSqlClientAsyncQueryCacheTests(ITestOutputHelper log) : base(log) { }
2324
}
2425
#if MSSQLCLIENT
2526
[Collection(NonParallelDefinition.Name)]
26-
public sealed class MicrosoftSqlClientAsyncQueryCacheTests : AsyncQueryCacheTests<MicrosoftSqlClientProvider> {
27+
public sealed class MicrosoftSqlClientAsyncQueryCacheTests : AsyncQueryCacheTests<MicrosoftSqlClientProvider>
28+
{
2729
public MicrosoftSqlClientAsyncQueryCacheTests(ITestOutputHelper log) : base(log) { }
2830
}
2931
#endif
@@ -32,7 +34,7 @@ public MicrosoftSqlClientAsyncQueryCacheTests(ITestOutputHelper log) : base(log)
3234
public abstract class AsyncTests<TProvider> : TestBase<TProvider> where TProvider : SqlServerDatabaseProvider
3335
{
3436
private DbConnection _marsConnection;
35-
37+
3638
private DbConnection MarsConnection => _marsConnection ?? (_marsConnection = Provider.GetOpenConnection(true));
3739

3840
[Fact]
@@ -128,9 +130,12 @@ public void TestLongOperationWithCancellation()
128130
[Fact]
129131
public async Task TestBasicStringUsageClosedAsync()
130132
{
131-
var query = await connection.QueryAsync<string>("select 'abc' as [Value] union all select @txt", new { txt = "def" }).ConfigureAwait(false);
132-
var arr = query.ToArray();
133-
Assert.Equal(new[] { "abc", "def" }, arr);
133+
using (var conn = GetClosedConnection())
134+
{
135+
var query = await conn.QueryAsync<string>("select 'abc' as [Value] union all select @txt", new { txt = "def" }).ConfigureAwait(false);
136+
var arr = query.ToArray();
137+
Assert.Equal(new[] { "abc", "def" }, arr);
138+
}
134139
}
135140

136141
[Fact]
@@ -159,9 +164,12 @@ public async Task TestExecuteAsync()
159164
[Fact]
160165
public void TestExecuteClosedConnAsyncInner()
161166
{
162-
var query = connection.ExecuteAsync("declare @foo table(id int not null); insert @foo values(@id);", new { id = 1 });
163-
var val = query.Result;
164-
Assert.Equal(1, val);
167+
using (var conn = GetClosedConnection())
168+
{
169+
var query = conn.ExecuteAsync("declare @foo table(id int not null); insert @foo values(@id);", new { id = 1 });
170+
var val = query.Result;
171+
Assert.Equal(1, val);
172+
}
165173
}
166174

167175
[Fact]
@@ -248,23 +256,29 @@ public async Task TestMultiAsyncViaFirstOrDefault()
248256
[Fact]
249257
public async Task TestMultiClosedConnAsync()
250258
{
251-
using (SqlMapper.GridReader multi = await connection.QueryMultipleAsync("select 1; select 2").ConfigureAwait(false))
259+
using (var conn = GetClosedConnection())
252260
{
253-
Assert.Equal(1, multi.ReadAsync<int>().Result.Single());
254-
Assert.Equal(2, multi.ReadAsync<int>().Result.Single());
261+
using (SqlMapper.GridReader multi = await conn.QueryMultipleAsync("select 1; select 2").ConfigureAwait(false))
262+
{
263+
Assert.Equal(1, multi.ReadAsync<int>().Result.Single());
264+
Assert.Equal(2, multi.ReadAsync<int>().Result.Single());
265+
}
255266
}
256267
}
257268

258269
[Fact]
259270
public async Task TestMultiClosedConnAsyncViaFirstOrDefault()
260271
{
261-
using (SqlMapper.GridReader multi = await connection.QueryMultipleAsync("select 1; select 2; select 3; select 4; select 5;").ConfigureAwait(false))
272+
using (var conn = GetClosedConnection())
262273
{
263-
Assert.Equal(1, multi.ReadFirstOrDefaultAsync<int>().Result);
264-
Assert.Equal(2, multi.ReadAsync<int>().Result.Single());
265-
Assert.Equal(3, multi.ReadFirstOrDefaultAsync<int>().Result);
266-
Assert.Equal(4, multi.ReadAsync<int>().Result.Single());
267-
Assert.Equal(5, multi.ReadFirstOrDefaultAsync<int>().Result);
274+
using (SqlMapper.GridReader multi = await conn.QueryMultipleAsync("select 1; select 2; select 3; select 4; select 5").ConfigureAwait(false))
275+
{
276+
Assert.Equal(1, multi.ReadFirstOrDefaultAsync<int>().Result);
277+
Assert.Equal(2, multi.ReadAsync<int>().Result.Single());
278+
Assert.Equal(3, multi.ReadFirstOrDefaultAsync<int>().Result);
279+
Assert.Equal(4, multi.ReadAsync<int>().Result.Single());
280+
Assert.Equal(5, multi.ReadFirstOrDefaultAsync<int>().Result);
281+
}
268282
}
269283
}
270284

0 commit comments

Comments
 (0)