Skip to content

D
Dapper
Commit 26515d1a authored by Nick Craver's avatar Nick Craver
Browse files
Options

Enable ASYNC tests and port to xUnit 

There's a hit or miss on the dnx run style entry point now - but this
isn't really needed with dnx test, we can just drop the old code IMO.
parent 8c46aee6
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 134 deletions
Dapper.DNX.Tests/Tests.Async.cs
View file @ 26515d1a
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Threading; using System.Threading;
using System.Data.SqlClient; using System.Data.SqlClient;
using Xunit;
#if DOTNET5_2 #if DOTNET5_2
using IDbConnection = System.Data.Common.DbConnection; using IDbConnection = System.Data.Common.DbConnection;
...@@ -15,27 +16,33 @@ ...@@ -15,27 +16,33 @@
namespace DapperTests_NET45 namespace DapperTests_NET45
{ {
public class Tests public class Tests : IDisposable
{ {
public void TestBasicStringUsageAsync() public void Dispose() { }
[Fact]
public async Task TestBasicStringUsageAsync()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
var query = connection.QueryAsync<string>("select 'abc' as [Value] union all select @txt", new { txt = "def" }); var query = await connection.QueryAsync<string>("select 'abc' as [Value] union all select @txt", new { txt = "def" });
var arr = query.Result.ToArray(); var arr = query.ToArray();
arr.IsSequenceEqualTo(new[] { "abc", "def" }); arr.IsSequenceEqualTo(new[] { "abc", "def" });
} }
} }
public void TestBasicStringUsageAsyncNonBuffered()
[Fact]
public async Task TestBasicStringUsageAsyncNonBuffered()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
var query = connection.QueryAsync<string>(new CommandDefinition("select 'abc' as [Value] union all select @txt", new { txt = "def" }, flags: CommandFlags.None)); var query = await connection.QueryAsync<string>(new CommandDefinition("select 'abc' as [Value] union all select @txt", new { txt = "def" }, flags: CommandFlags.None));
var arr = query.Result.ToArray(); var arr = query.ToArray();
arr.IsSequenceEqualTo(new[] { "abc", "def" }); arr.IsSequenceEqualTo(new[] { "abc", "def" });
} }
} }
[Fact]
public void TestLongOperationWithCancellation() public void TestLongOperationWithCancellation()
{ {
using (var connection = Program.GetClosedConnection()) using (var connection = Program.GetClosedConnection())
...@@ -56,45 +63,50 @@ public void TestLongOperationWithCancellation() ...@@ -56,45 +63,50 @@ public void TestLongOperationWithCancellation()
} }
} }
public void TestBasicStringUsageClosedAsync() [Fact]
public async Task TestBasicStringUsageClosedAsync()
{ {
using (var connection = Program.GetClosedConnection()) using (var connection = Program.GetClosedConnection())
{ {
var query = connection.QueryAsync<string>("select 'abc' as [Value] union all select @txt", new { txt = "def" }); var query = await connection.QueryAsync<string>("select 'abc' as [Value] union all select @txt", new { txt = "def" });
var arr = query.Result.ToArray(); var arr = query.ToArray();
arr.IsSequenceEqualTo(new[] { "abc", "def" }); arr.IsSequenceEqualTo(new[] { "abc", "def" });
} }
} }
public void TestQueryDynamicAsync() [Fact]
public async Task TestQueryDynamicAsync()
{ {
using (var connection = Program.GetClosedConnection()) using (var connection = Program.GetClosedConnection())
{ {
var row = connection.QueryAsync("select 'abc' as [Value]").Result.Single(); var row = (await connection.QueryAsync("select 'abc' as [Value]")).Single();
string value = row.Value; string value = row.Value;
value.IsEqualTo("abc"); value.IsEqualTo("abc");
} }
} }
public void TestClassWithStringUsageAsync() [Fact]
public async Task TestClassWithStringUsageAsync()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
var query = connection.QueryAsync<BasicType>("select 'abc' as [Value] union all select @txt", new { txt = "def" }); var query = await connection.QueryAsync<BasicType>("select 'abc' as [Value] union all select @txt", new { txt = "def" });
var arr = query.Result.ToArray(); var arr = query.ToArray();
arr.Select(x => x.Value).IsSequenceEqualTo(new[] { "abc", "def" }); arr.Select(x => x.Value).IsSequenceEqualTo(new[] { "abc", "def" });
} }
} }
public void TestExecuteAsync() [Fact]
public async Task TestExecuteAsync()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
var query = connection.ExecuteAsync("declare @foo table(id int not null); insert @foo values(@id);", new { id = 1 }); var val = await connection.ExecuteAsync("declare @foo table(id int not null); insert @foo values(@id);", new { id = 1 });
var val = query.Result;
val.Equals(1); val.Equals(1);
} }
} }
[Fact]
public void TestExecuteClosedConnAsync() public void TestExecuteClosedConnAsync()
{ {
using (var connection = Program.GetClosedConnection()) using (var connection = Program.GetClosedConnection())
...@@ -105,18 +117,19 @@ public void TestExecuteClosedConnAsync() ...@@ -105,18 +117,19 @@ public void TestExecuteClosedConnAsync()
} }
} }
public void TestMultiMapWithSplitAsync() [Fact]
public async Task TestMultiMapWithSplitAsync()
{ {
var sql = @"select 1 as id, 'abc' as name, 2 as id, 'def' as name"; const string sql = @"select 1 as id, 'abc' as name, 2 as id, 'def' as name";
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
var productQuery = connection.QueryAsync<Product, Category, Product>(sql, (prod, cat) => var productQuery = await connection.QueryAsync<Product, Category, Product>(sql, (prod, cat) =>
{ {
prod.Category = cat; prod.Category = cat;
return prod; return prod;
}); });
var product = productQuery.Result.First(); var product = productQuery.First();
// assertions // assertions
product.Id.IsEqualTo(1); product.Id.IsEqualTo(1);
product.Name.IsEqualTo("abc"); product.Name.IsEqualTo("abc");
...@@ -125,16 +138,18 @@ public void TestMultiMapWithSplitAsync() ...@@ -125,16 +138,18 @@ public void TestMultiMapWithSplitAsync()
} }
} }
public void TestMultiMapArbitraryWithSplitAsync() { [Fact]
var sql = @"select 1 as id, 'abc' as name, 2 as id, 'def' as name"; public async Task TestMultiMapArbitraryWithSplitAsync()
{
const string sql = @"select 1 as id, 'abc' as name, 2 as id, 'def' as name";
using (var connection = Program.GetOpenConnection()) { using (var connection = Program.GetOpenConnection()) {
var productQuery = connection.QueryAsync<Product>(sql, new[] { typeof(Product), typeof(Category) }, (objects) => { var productQuery = await connection.QueryAsync<Product>(sql, new[] { typeof(Product), typeof(Category) }, (objects) => {
var prod = (Product)objects[0]; var prod = (Product)objects[0];
prod.Category = (Category)objects[1]; prod.Category = (Category)objects[1];
return prod; return prod;
}); });
var product = productQuery.Result.First(); var product = productQuery.First();
// assertions // assertions
product.Id.IsEqualTo(1); product.Id.IsEqualTo(1);
product.Name.IsEqualTo("abc"); product.Name.IsEqualTo("abc");
...@@ -143,18 +158,19 @@ public void TestMultiMapWithSplitAsync() ...@@ -143,18 +158,19 @@ public void TestMultiMapWithSplitAsync()
} }
} }
public void TestMultiMapWithSplitClosedConnAsync() [Fact]
public async Task TestMultiMapWithSplitClosedConnAsync()
{ {
var sql = @"select 1 as id, 'abc' as name, 2 as id, 'def' as name"; var sql = @"select 1 as id, 'abc' as name, 2 as id, 'def' as name";
using (var connection = Program.GetClosedConnection()) using (var connection = Program.GetClosedConnection())
{ {
var productQuery = connection.QueryAsync<Product, Category, Product>(sql, (prod, cat) => var productQuery = await connection.QueryAsync<Product, Category, Product>(sql, (prod, cat) =>
{ {
prod.Category = cat; prod.Category = cat;
return prod; return prod;
}); });
var product = productQuery.Result.First(); var product = productQuery.First();
// assertions // assertions
product.Id.IsEqualTo(1); product.Id.IsEqualTo(1);
product.Name.IsEqualTo("abc"); product.Name.IsEqualTo("abc");
...@@ -163,35 +179,40 @@ public void TestMultiMapWithSplitClosedConnAsync() ...@@ -163,35 +179,40 @@ public void TestMultiMapWithSplitClosedConnAsync()
} }
} }
public void TestMultiAsync() [Fact]
public async Task TestMultiAsync()
{ {
using (var conn = Program.GetOpenConnection()) using (var conn = Program.GetOpenConnection())
{ {
using (Dapper.SqlMapper.GridReader multi = conn.QueryMultipleAsync("select 1; select 2").Result) using (Dapper.SqlMapper.GridReader multi = await conn.QueryMultipleAsync("select 1; select 2"))
{ {
multi.ReadAsync<int>().Result.Single().IsEqualTo(1); multi.ReadAsync<int>().Result.Single().IsEqualTo(1);
multi.ReadAsync<int>().Result.Single().IsEqualTo(2); multi.ReadAsync<int>().Result.Single().IsEqualTo(2);
} }
} }
} }
public void TestMultiClosedConnAsync()
[Fact]
public async Task TestMultiClosedConnAsync()
{ {
using (var conn = Program.GetClosedConnection()) using (var conn = Program.GetClosedConnection())
{ {
using (Dapper.SqlMapper.GridReader multi = conn.QueryMultipleAsync("select 1; select 2").Result) using (Dapper.SqlMapper.GridReader multi = await conn.QueryMultipleAsync("select 1; select 2"))
{ {
multi.ReadAsync<int>().Result.Single().IsEqualTo(1); multi.ReadAsync<int>().Result.Single().IsEqualTo(1);
multi.ReadAsync<int>().Result.Single().IsEqualTo(2); multi.ReadAsync<int>().Result.Single().IsEqualTo(2);
} }
} }
} }
#if EXTERNALS #if EXTERNALS
public void ExecuteReaderOpenAsync() [Fact]
public async Task ExecuteReaderOpenAsync()
{ {
using (var conn = Program.GetOpenConnection()) using (var conn = Program.GetOpenConnection())
{ {
var dt = new DataTable(); var dt = new DataTable();
dt.Load(conn.ExecuteReaderAsync("select 3 as [three], 4 as [four]").Result); dt.Load(await conn.ExecuteReaderAsync("select 3 as [three], 4 as [four]"));
dt.Columns.Count.IsEqualTo(2); dt.Columns.Count.IsEqualTo(2);
dt.Columns[0].ColumnName.IsEqualTo("three"); dt.Columns[0].ColumnName.IsEqualTo("three");
dt.Columns[1].ColumnName.IsEqualTo("four"); dt.Columns[1].ColumnName.IsEqualTo("four");
...@@ -200,12 +221,14 @@ public void ExecuteReaderOpenAsync() ...@@ -200,12 +221,14 @@ public void ExecuteReaderOpenAsync()
((int)dt.Rows[0][1]).IsEqualTo(4); ((int)dt.Rows[0][1]).IsEqualTo(4);
} }
} }
public void ExecuteReaderClosedAsync()
[Fact]
public async Task ExecuteReaderClosedAsync()
{ {
using (var conn = Program.GetClosedConnection()) using (var conn = Program.GetClosedConnection())
{ {
var dt = new DataTable(); var dt = new DataTable();
dt.Load(conn.ExecuteReaderAsync("select 3 as [three], 4 as [four]").Result); dt.Load(await conn.ExecuteReaderAsync("select 3 as [three], 4 as [four]"));
dt.Columns.Count.IsEqualTo(2); dt.Columns.Count.IsEqualTo(2);
dt.Columns[0].ColumnName.IsEqualTo("three"); dt.Columns[0].ColumnName.IsEqualTo("three");
dt.Columns[1].ColumnName.IsEqualTo("four"); dt.Columns[1].ColumnName.IsEqualTo("four");
...@@ -216,89 +239,96 @@ public void ExecuteReaderClosedAsync() ...@@ -216,89 +239,96 @@ public void ExecuteReaderClosedAsync()
} }
#endif #endif
public void LiteralReplacementOpen() [Fact]
public async Task LiteralReplacementOpen()
{ {
using (var conn = Program.GetOpenConnection()) LiteralReplacement(conn); using (var conn = Program.GetOpenConnection()) await LiteralReplacement(conn);
} }
public void LiteralReplacementClosed() [Fact]
public async Task LiteralReplacementClosed()
{ {
using (var conn = Program.GetClosedConnection()) LiteralReplacement(conn); using (var conn = Program.GetClosedConnection()) await LiteralReplacement(conn);
} }
private void LiteralReplacement(IDbConnection connection) private async Task LiteralReplacement(IDbConnection connection)
{ {
try { connection.ExecuteAsync("drop table literal1").Wait(); } catch { } try
connection.ExecuteAsync("create table literal1 (id int not null, foo int not null)").Wait(); {
connection.ExecuteAsync("insert literal1 (id,foo) values ({=id}, @foo)", new { id = 123, foo = 456 }).Wait(); await connection.ExecuteAsync("drop table literal1");
} catch { }
await connection.ExecuteAsync("create table literal1 (id int not null, foo int not null)");
await connection.ExecuteAsync("insert literal1 (id,foo) values ({=id}, @foo)", new { id = 123, foo = 456 });
var rows = new[] { new { id = 1, foo = 2 }, new { id = 3, foo = 4 } }; var rows = new[] { new { id = 1, foo = 2 }, new { id = 3, foo = 4 } };
connection.ExecuteAsync("insert literal1 (id,foo) values ({=id}, @foo)", rows).Wait(); await connection.ExecuteAsync("insert literal1 (id,foo) values ({=id}, @foo)", rows);
var count = connection.QueryAsync<int>("select count(1) from literal1 where id={=foo}", new { foo = 123 }).Result.Single(); var count = (await connection.QueryAsync<int>("select count(1) from literal1 where id={=foo}", new { foo = 123 })).Single();
count.IsEqualTo(1); count.IsEqualTo(1);
int sum = connection.QueryAsync<int>("select sum(id) + sum(foo) from literal1").Result.Single(); int sum = (await connection.QueryAsync<int>("select sum(id) + sum(foo) from literal1")).Single();
sum.IsEqualTo(123 + 456 + 1 + 2 + 3 + 4); sum.IsEqualTo(123 + 456 + 1 + 2 + 3 + 4);
} }
public void LiteralReplacementDynamicOpen() [Fact]
public async Task LiteralReplacementDynamicOpen()
{ {
using (var conn = Program.GetOpenConnection()) LiteralReplacementDynamic(conn); using (var conn = Program.GetOpenConnection()) await LiteralReplacementDynamic(conn);
} }
public void LiteralReplacementDynamicClosed() [Fact]
public async Task LiteralReplacementDynamicClosed()
{ {
using (var conn = Program.GetClosedConnection()) LiteralReplacementDynamic(conn); using (var conn = Program.GetClosedConnection()) await LiteralReplacementDynamic(conn);
} }
private void LiteralReplacementDynamic(IDbConnection connection) private async Task LiteralReplacementDynamic(IDbConnection connection)
{ {
var args = new DynamicParameters(); var args = new DynamicParameters();
args.Add("id", 123); args.Add("id", 123);
try { connection.ExecuteAsync("drop table literal2").Wait(); } catch { } try { await connection.ExecuteAsync("drop table literal2"); } catch { }
connection.ExecuteAsync("create table literal2 (id int not null)").Wait(); await connection.ExecuteAsync("create table literal2 (id int not null)");
connection.ExecuteAsync("insert literal2 (id) values ({=id})", args).Wait(); await connection.ExecuteAsync("insert literal2 (id) values ({=id})", args);
args = new DynamicParameters(); args = new DynamicParameters();
args.Add("foo", 123); args.Add("foo", 123);
var count = connection.QueryAsync<int>("select count(1) from literal2 where id={=foo}", args).Result.Single(); var count = (await connection.QueryAsync<int>("select count(1) from literal2 where id={=foo}", args)).Single();
count.IsEqualTo(1); count.IsEqualTo(1);
} }
public void LiteralIn() [Fact]
public async Task LiteralIn()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
connection.ExecuteAsync("create table #literalin(id int not null);").Wait(); await connection.ExecuteAsync("create table #literalin(id int not null);");
connection.ExecuteAsync("insert #literalin (id) values (@id)", new[] { await connection.ExecuteAsync("insert #literalin (id) values (@id)", new[] {
new { id = 1 }, new { id = 1 },
new { id = 2 }, new { id = 2 },
new { id = 3 }, new { id = 3 },
}).Wait(); });
var count = connection.QueryAsync<int>("select count(1) from #literalin where id in {=ids}", var count = (await connection.QueryAsync<int>("select count(1) from #literalin where id in {=ids}",
new { ids = new[] { 1, 3, 4 } }).Result.Single(); new { ids = new[] { 1, 3, 4 } })).Single();
count.IsEqualTo(2); count.IsEqualTo(2);
} }
} }
[Fact]
public void RunSequentialVersusParallelAsync() public async Task RunSequentialVersusParallelAsync()
{ {
var ids = Enumerable.Range(1, 20000).Select(id => new { id }).ToArray(); var ids = Enumerable.Range(1, 20000).Select(id => new { id }).ToArray();
using (var connection = Program.GetOpenConnection(true)) using (var connection = Program.GetOpenConnection(true))
{ {
connection.ExecuteAsync(new CommandDefinition("select @id", ids.Take(5), flags: CommandFlags.None)).Wait(); await connection.ExecuteAsync(new CommandDefinition("select @id", ids.Take(5), flags: CommandFlags.None));
var watch = Stopwatch.StartNew(); var watch = Stopwatch.StartNew();
connection.ExecuteAsync(new CommandDefinition("select @id", ids, flags: CommandFlags.None)).Wait(); await connection.ExecuteAsync(new CommandDefinition("select @id", ids, flags: CommandFlags.None));
watch.Stop(); watch.Stop();
System.Console.WriteLine("No pipeline: {0}ms", watch.ElapsedMilliseconds); Console.WriteLine("No pipeline: {0}ms", watch.ElapsedMilliseconds);
watch = Stopwatch.StartNew(); watch = Stopwatch.StartNew();
connection.ExecuteAsync(new CommandDefinition("select @id", ids, flags: CommandFlags.Pipelined)).Wait(); await connection.ExecuteAsync(new CommandDefinition("select @id", ids, flags: CommandFlags.Pipelined));
watch.Stop(); watch.Stop();
System.Console.WriteLine("Pipeline: {0}ms", watch.ElapsedMilliseconds); Console.WriteLine("Pipeline: {0}ms", watch.ElapsedMilliseconds);
} }
} }
[Fact]
public void RunSequentialVersusParallelSync() public void RunSequentialVersusParallelSync()
{ {
var ids = Enumerable.Range(1, 20000).Select(id => new { id }).ToArray(); var ids = Enumerable.Range(1, 20000).Select(id => new { id }).ToArray();
using (var connection = Program.GetOpenConnection(true)) using (var connection = Program.GetOpenConnection(true))
{ {
...@@ -307,15 +337,16 @@ public void RunSequentialVersusParallelSync() ...@@ -307,15 +337,16 @@ public void RunSequentialVersusParallelSync()
var watch = Stopwatch.StartNew(); var watch = Stopwatch.StartNew();
connection.Execute(new CommandDefinition("select @id", ids, flags: CommandFlags.None)); connection.Execute(new CommandDefinition("select @id", ids, flags: CommandFlags.None));
watch.Stop(); watch.Stop();
System.Console.WriteLine("No pipeline: {0}ms", watch.ElapsedMilliseconds); Console.WriteLine("No pipeline: {0}ms", watch.ElapsedMilliseconds);
watch = Stopwatch.StartNew(); watch = Stopwatch.StartNew();
connection.Execute(new CommandDefinition("select @id", ids, flags: CommandFlags.Pipelined)); connection.Execute(new CommandDefinition("select @id", ids, flags: CommandFlags.Pipelined));
watch.Stop(); watch.Stop();
System.Console.WriteLine("Pipeline: {0}ms", watch.ElapsedMilliseconds); Console.WriteLine("Pipeline: {0}ms", watch.ElapsedMilliseconds);
} }
} }
[Fact]
public void AssertNoCacheWorksForQueryMultiple() public void AssertNoCacheWorksForQueryMultiple()
{ {
int a = 123, b = 456; int a = 123, b = 456;
...@@ -340,8 +371,6 @@ public void AssertNoCacheWorksForQueryMultiple() ...@@ -340,8 +371,6 @@ public void AssertNoCacheWorksForQueryMultiple()
after.IsEqualTo(0); after.IsEqualTo(0);
c.IsEqualTo(123); c.IsEqualTo(123);
d.IsEqualTo(456); d.IsEqualTo(456);
} }
class Product class Product
{ {
...@@ -355,20 +384,20 @@ class Category ...@@ -355,20 +384,20 @@ class Category
public string Name { get; set; } public string Name { get; set; }
public string Description { get; set; } public string Description { get; set; }
} }
class BasicType class BasicType
{ {
public string Value { get; set; } public string Value { get; set; }
} }
[Fact]
public void TypeBasedViaType() public async Task TypeBasedViaType()
{ {
Type type = GetSomeType(); Type type = GetSomeType();
using (var connection = Program.GetOpenConnection(true)) using (var connection = Program.GetOpenConnection(true))
{ {
dynamic actual = connection.QueryAsync(type, "select @A as [A], @B as [B]", new { A = 123, B = "abc" }).Result.FirstOrDefault(); dynamic actual = (await connection.QueryAsync(type, "select @A as [A], @B as [B]", new { A = 123, B = "abc" })).FirstOrDefault();
((object)actual).GetType().IsEqualTo(type); ((object)actual).GetType().IsEqualTo(type);
int a = actual.A; int a = actual.A;
string b = actual.B; string b = actual.B;
...@@ -387,37 +416,40 @@ public class SomeType ...@@ -387,37 +416,40 @@ public class SomeType
public string B { get; set; } public string B { get; set; }
} }
public void Issue22_ExecuteScalar() [Fact]
public async Task Issue22_ExecuteScalar()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
int i = connection.ExecuteScalarAsync<int>("select 123").Result; int i = await connection.ExecuteScalarAsync<int>("select 123");
i.IsEqualTo(123); i.IsEqualTo(123);
i = connection.ExecuteScalarAsync<int>("select cast(123 as bigint)").Result; i = await connection.ExecuteScalarAsync<int>("select cast(123 as bigint)");
i.IsEqualTo(123); i.IsEqualTo(123);
long j = connection.ExecuteScalarAsync<long>("select 123").Result; long j = await connection.ExecuteScalarAsync<long>("select 123");
j.IsEqualTo(123L); j.IsEqualTo(123L);
j = connection.ExecuteScalarAsync<long>("select cast(123 as bigint)").Result; j = await connection.ExecuteScalarAsync<long>("select cast(123 as bigint)");
j.IsEqualTo(123L); j.IsEqualTo(123L);
int? k = connection.ExecuteScalar<int?>("select @i", new { i = default(int?) }); int? k = await connection.ExecuteScalarAsync<int?>("select @i", new { i = default(int?) });
k.IsNull(); k.IsNull();
} }
} }
public void Issue346_QueryAsyncConvert() [Fact]
public async Task Issue346_QueryAsyncConvert()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
int i = connection.QueryAsync<int>("Select Cast(123 as bigint)").Result.First(); int i = (await connection.QueryAsync<int>("Select Cast(123 as bigint)")).First();
i.IsEqualTo(123); i.IsEqualTo(123);
} }
} }
public void TestSupportForDynamicParametersOutputExpressions() [Fact]
public async Task TestSupportForDynamicParametersOutputExpressions()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
...@@ -430,12 +462,12 @@ public void TestSupportForDynamicParametersOutputExpressions() ...@@ -430,12 +462,12 @@ public void TestSupportForDynamicParametersOutputExpressions()
p.Output(bob, b => b.Address.Name); p.Output(bob, b => b.Address.Name);
p.Output(bob, b => b.Address.PersonId); p.Output(bob, b => b.Address.PersonId);
connection.ExecuteAsync(@" await connection.ExecuteAsync(@"
SET @Occupation = 'grillmaster' SET @Occupation = 'grillmaster'
SET @PersonId = @PersonId + 1 SET @PersonId = @PersonId + 1
SET @NumberOfLegs = @NumberOfLegs - 1 SET @NumberOfLegs = @NumberOfLegs - 1
SET @AddressName = 'bobs burgers' SET @AddressName = 'bobs burgers'
SET @AddressPersonId = @PersonId", p).Wait(); SET @AddressPersonId = @PersonId", p);
bob.Occupation.IsEqualTo("grillmaster"); bob.Occupation.IsEqualTo("grillmaster");
bob.PersonId.IsEqualTo(2); bob.PersonId.IsEqualTo(2);
...@@ -444,7 +476,9 @@ public void TestSupportForDynamicParametersOutputExpressions() ...@@ -444,7 +476,9 @@ public void TestSupportForDynamicParametersOutputExpressions()
bob.Address.PersonId.IsEqualTo(2); bob.Address.PersonId.IsEqualTo(2);
} }
} }
public void TestSupportForDynamicParametersOutputExpressions_Scalar()
[Fact]
public async Task TestSupportForDynamicParametersOutputExpressions_Scalar()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
...@@ -457,13 +491,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Scalar() ...@@ -457,13 +491,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Scalar()
p.Output(bob, b => b.Address.Name); p.Output(bob, b => b.Address.Name);
p.Output(bob, b => b.Address.PersonId); p.Output(bob, b => b.Address.PersonId);
var result = (int)connection.ExecuteScalarAsync(@" var result = (int)(await connection.ExecuteScalarAsync(@"
SET @Occupation = 'grillmaster' SET @Occupation = 'grillmaster'
SET @PersonId = @PersonId + 1 SET @PersonId = @PersonId + 1
SET @NumberOfLegs = @NumberOfLegs - 1 SET @NumberOfLegs = @NumberOfLegs - 1
SET @AddressName = 'bobs burgers' SET @AddressName = 'bobs burgers'
SET @AddressPersonId = @PersonId SET @AddressPersonId = @PersonId
select 42", p).Result; select 42", p));
bob.Occupation.IsEqualTo("grillmaster"); bob.Occupation.IsEqualTo("grillmaster");
bob.PersonId.IsEqualTo(2); bob.PersonId.IsEqualTo(2);
...@@ -473,7 +507,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Scalar() ...@@ -473,7 +507,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Scalar()
result.IsEqualTo(42); result.IsEqualTo(42);
} }
} }
public void TestSupportForDynamicParametersOutputExpressions_Query_Default()
[Fact]
public async Task TestSupportForDynamicParametersOutputExpressions_Query_Default()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
...@@ -486,13 +522,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Default() ...@@ -486,13 +522,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Default()
p.Output(bob, b => b.Address.Name); p.Output(bob, b => b.Address.Name);
p.Output(bob, b => b.Address.PersonId); p.Output(bob, b => b.Address.PersonId);
var result = connection.QueryAsync<int>(@" var result = (await connection.QueryAsync<int>(@"
SET @Occupation = 'grillmaster' SET @Occupation = 'grillmaster'
SET @PersonId = @PersonId + 1 SET @PersonId = @PersonId + 1
SET @NumberOfLegs = @NumberOfLegs - 1 SET @NumberOfLegs = @NumberOfLegs - 1
SET @AddressName = 'bobs burgers' SET @AddressName = 'bobs burgers'
SET @AddressPersonId = @PersonId SET @AddressPersonId = @PersonId
select 42", p).Result.Single(); select 42", p)).Single();
bob.Occupation.IsEqualTo("grillmaster"); bob.Occupation.IsEqualTo("grillmaster");
bob.PersonId.IsEqualTo(2); bob.PersonId.IsEqualTo(2);
...@@ -502,7 +538,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Default() ...@@ -502,7 +538,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Default()
result.IsEqualTo(42); result.IsEqualTo(42);
} }
} }
public void TestSupportForDynamicParametersOutputExpressions_Query_Buffered()
[Fact]
public async Task TestSupportForDynamicParametersOutputExpressions_Query_Buffered()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
...@@ -515,13 +553,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Buffered() ...@@ -515,13 +553,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Buffered()
p.Output(bob, b => b.Address.Name); p.Output(bob, b => b.Address.Name);
p.Output(bob, b => b.Address.PersonId); p.Output(bob, b => b.Address.PersonId);
var result = connection.QueryAsync<int>(new CommandDefinition(@" var result = (await connection.QueryAsync<int>(new CommandDefinition(@"
SET @Occupation = 'grillmaster' SET @Occupation = 'grillmaster'
SET @PersonId = @PersonId + 1 SET @PersonId = @PersonId + 1
SET @NumberOfLegs = @NumberOfLegs - 1 SET @NumberOfLegs = @NumberOfLegs - 1
SET @AddressName = 'bobs burgers' SET @AddressName = 'bobs burgers'
SET @AddressPersonId = @PersonId SET @AddressPersonId = @PersonId
select 42", p, flags: CommandFlags.Buffered)).Result.Single(); select 42", p, flags: CommandFlags.Buffered))).Single();
bob.Occupation.IsEqualTo("grillmaster"); bob.Occupation.IsEqualTo("grillmaster");
bob.PersonId.IsEqualTo(2); bob.PersonId.IsEqualTo(2);
...@@ -531,7 +569,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Buffered() ...@@ -531,7 +569,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_Buffered()
result.IsEqualTo(42); result.IsEqualTo(42);
} }
} }
public void TestSupportForDynamicParametersOutputExpressions_Query_NonBuffered()
[Fact]
public async Task TestSupportForDynamicParametersOutputExpressions_Query_NonBuffered()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
...@@ -544,13 +584,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_NonBuffered() ...@@ -544,13 +584,13 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_NonBuffered()
p.Output(bob, b => b.Address.Name); p.Output(bob, b => b.Address.Name);
p.Output(bob, b => b.Address.PersonId); p.Output(bob, b => b.Address.PersonId);
var result = connection.QueryAsync<int>(new CommandDefinition(@" var result = (await connection.QueryAsync<int>(new CommandDefinition(@"
SET @Occupation = 'grillmaster' SET @Occupation = 'grillmaster'
SET @PersonId = @PersonId + 1 SET @PersonId = @PersonId + 1
SET @NumberOfLegs = @NumberOfLegs - 1 SET @NumberOfLegs = @NumberOfLegs - 1
SET @AddressName = 'bobs burgers' SET @AddressName = 'bobs burgers'
SET @AddressPersonId = @PersonId SET @AddressPersonId = @PersonId
select 42", p, flags: CommandFlags.None)).Result.Single(); select 42", p, flags: CommandFlags.None))).Single();
bob.Occupation.IsEqualTo("grillmaster"); bob.Occupation.IsEqualTo("grillmaster");
bob.PersonId.IsEqualTo(2); bob.PersonId.IsEqualTo(2);
...@@ -560,7 +600,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_NonBuffered() ...@@ -560,7 +600,9 @@ public void TestSupportForDynamicParametersOutputExpressions_Query_NonBuffered()
result.IsEqualTo(42); result.IsEqualTo(42);
} }
} }
public void TestSupportForDynamicParametersOutputExpressions_QueryMultiple()
[Fact]
public async Task TestSupportForDynamicParametersOutputExpressions_QueryMultiple()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
...@@ -574,14 +616,14 @@ public void TestSupportForDynamicParametersOutputExpressions_QueryMultiple() ...@@ -574,14 +616,14 @@ public void TestSupportForDynamicParametersOutputExpressions_QueryMultiple()
p.Output(bob, b => b.Address.PersonId); p.Output(bob, b => b.Address.PersonId);
int x, y; int x, y;
using (var multi = connection.QueryMultipleAsync(@" using (var multi = await connection.QueryMultipleAsync(@"
SET @Occupation = 'grillmaster' SET @Occupation = 'grillmaster'
SET @PersonId = @PersonId + 1 SET @PersonId = @PersonId + 1
SET @NumberOfLegs = @NumberOfLegs - 1 SET @NumberOfLegs = @NumberOfLegs - 1
SET @AddressName = 'bobs burgers' SET @AddressName = 'bobs burgers'
select 42 select 42
select 17 select 17
SET @AddressPersonId = @PersonId", p).Result) SET @AddressPersonId = @PersonId", p))
{ {
x = multi.ReadAsync<int>().Result.Single(); x = multi.ReadAsync<int>().Result.Single();
y = multi.ReadAsync<int>().Result.Single(); y = multi.ReadAsync<int>().Result.Single();
...@@ -597,27 +639,28 @@ select 17 ...@@ -597,27 +639,28 @@ select 17
} }
} }
public void TestSubsequentQueriesSuccess() [Fact]
public async Task TestSubsequentQueriesSuccess()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
var data0 = connection.QueryAsync<Foo0>("select 1 as [Id] where 1 = 0").Result.ToList(); var data0 = (await connection.QueryAsync<Foo0>("select 1 as [Id] where 1 = 0")).ToList();
data0.Count().IsEqualTo(0); data0.Count.IsEqualTo(0);
var data1 = connection.QueryAsync<Foo1>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.Buffered)).Result.ToList(); var data1 = (await connection.QueryAsync<Foo1>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.Buffered))).ToList();
data1.Count().IsEqualTo(0); data1.Count.IsEqualTo(0);
var data2 = connection.QueryAsync<Foo2>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.None)).Result.ToList(); var data2 = (await connection.QueryAsync<Foo2>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.None))).ToList();
data2.Count().IsEqualTo(0); data2.Count.IsEqualTo(0);
data0 = connection.QueryAsync<Foo0>("select 1 as [Id] where 1 = 0").Result.ToList(); data0 = (await connection.QueryAsync<Foo0>("select 1 as [Id] where 1 = 0")).ToList();
data0.Count().IsEqualTo(0); data0.Count.IsEqualTo(0);
data1 = connection.QueryAsync<Foo1>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.Buffered)).Result.ToList(); data1 = (await connection.QueryAsync<Foo1>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.Buffered))).ToList();
data1.Count().IsEqualTo(0); data1.Count.IsEqualTo(0);
data2 = connection.QueryAsync<Foo2>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.None)).Result.ToList(); data2 = (await connection.QueryAsync<Foo2>(new CommandDefinition("select 1 as [Id] where 1 = 0", flags: CommandFlags.None))).ToList();
data2.Count().IsEqualTo(0); data2.Count.IsEqualTo(0);
} }
} }
...@@ -659,10 +702,11 @@ class User ...@@ -659,10 +702,11 @@ class User
public string Name { get; set; } public string Name { get; set; }
} }
public void TestMultiMapArbitraryMaps() [Fact]
public async Task TestMultiMapArbitraryMaps()
{ {
// please excuse the trite example, but it is easier to follow than a more real-world one // please excuse the trite example, but it is easier to follow than a more real-world one
var createSql = @" const string createSql = @"
create table #ReviewBoards (Id int, Name varchar(20), User1Id int, User2Id int, User3Id int, User4Id int, User5Id int, User6Id int, User7Id int, User8Id int, User9Id int) create table #ReviewBoards (Id int, Name varchar(20), User1Id int, User2Id int, User3Id int, User4Id int, User5Id int, User6Id int, User7Id int, User8Id int, User9Id int)
create table #Users (Id int, Name varchar(20)) create table #Users (Id int, Name varchar(20))
...@@ -680,10 +724,10 @@ public void TestMultiMapArbitraryMaps() ...@@ -680,10 +724,10 @@ public void TestMultiMapArbitraryMaps()
"; ";
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
connection.ExecuteAsync(createSql).Wait(); await connection.ExecuteAsync(createSql);
try try
{ {
var sql = @" const string sql = @"
select select
rb.Id, rb.Name, rb.Id, rb.Name,
u1.*, u2.*, u3.*, u4.*, u5.*, u6.*, u7.*, u8.*, u9.* u1.*, u2.*, u3.*, u4.*, u5.*, u6.*, u7.*, u8.*, u9.*
...@@ -716,7 +760,7 @@ public void TestMultiMapArbitraryMaps() ...@@ -716,7 +760,7 @@ public void TestMultiMapArbitraryMaps()
return board; return board;
}; };
var data = connection.QueryAsync<ReviewBoard>(sql, types, mapper).Result.ToList(); var data = (await connection.QueryAsync<ReviewBoard>(sql, types, mapper)).ToList();
var p = data.First(); var p = data.First();
p.Id.IsEqualTo(1); p.Id.IsEqualTo(1);
...@@ -748,33 +792,35 @@ public void TestMultiMapArbitraryMaps() ...@@ -748,33 +792,35 @@ public void TestMultiMapArbitraryMaps()
} }
} }
public void Issue157_ClosedReaderAsync() [Fact]
public async Task Issue157_ClosedReaderAsync()
{ {
using(var conn = Program.GetOpenConnection()) using(var conn = Program.GetOpenConnection())
{ {
var args = new { x = 42 }; var args = new { x = 42 };
const string sql = @"select 123 as [A], 'abc' as [B] where @x=42"; const string sql = @"select 123 as [A], 'abc' as [B] where @x=42";
var row = conn.QueryAsync<SomeType>(new CommandDefinition( var row = (await conn.QueryAsync<SomeType>(new CommandDefinition(
sql, args, flags:CommandFlags.None)).Result.Single(); sql, args, flags:CommandFlags.None))).Single();
row.IsNotNull(); row.IsNotNull();
row.A.IsEqualTo(123); row.A.IsEqualTo(123);
row.B.IsEqualTo("abc"); row.B.IsEqualTo("abc");
args = new { x = 5 }; args = new { x = 5 };
conn.QueryAsync<SomeType>(new CommandDefinition( (await conn.QueryAsync<SomeType>(new CommandDefinition(
sql, args, flags: CommandFlags.None)).Result.Any().IsFalse(); sql, args, flags: CommandFlags.None))).Any().IsFalse();
} }
} }
public void TestAtEscaping() [Fact]
public async Task TestAtEscaping()
{ {
using (var connection = Program.GetOpenConnection()) using (var connection = Program.GetOpenConnection())
{ {
var id = connection.QueryAsync<int>(@" var id = (await connection.QueryAsync<int>(@"
declare @@Name int declare @@Name int
select @@Name = @Id+1 select @@Name = @Id+1
select @@Name select @@Name
", new Product { Id = 1 }).Result.Single(); ", new Product { Id = 1 })).Single();
id.IsEqualTo(2); id.IsEqualTo(2);
} }
......
Dapper.DNX.Tests/Tests.cs
View file @ 26515d1a
...@@ -67,7 +67,7 @@ namespace SqlMapper ...@@ -67,7 +67,7 @@ namespace SqlMapper
{ {
public partial class Tests : IDisposable public partial class Tests : IDisposable
{ {
SqlConnection connection; readonly SqlConnection connection;
public Tests() public Tests()
{ {
......
Dapper.DNX.Tests/project.json
View file @ 26515d1a
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"frameworks": { "frameworks": {
"net45": { "net45": {
"compilationOptions": { "compilationOptions": {
"define": [ ], "define": [ "ASYNC" ],
"warningsAsErrors": true "warningsAsErrors": true
}, },
"frameworkAssemblies": { "frameworkAssemblies": {
...@@ -55,6 +55,9 @@ ...@@ -55,6 +55,9 @@
} }
}, },
"dnx451": { "dnx451": {
"compilationOptions": {
"define": [ "ASYNC" ]
},
"dependencies": { "dependencies": {
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.runner.dnx": "2.1.0-rc1-build204" "xunit.runner.dnx": "2.1.0-rc1-build204"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment