Commit ed78dd6a authored by mgravell's avatar mgravell

make sure System.Data and Microsoft.Data tests can't squabble; record which...

make sure System.Data and Microsoft.Data tests can't squabble; record which Microsoft.Data tests *will never work*
parent 354e63da
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("ConstructorTests")]
public sealed class SystemSqlClientConstructorTests : ConstructorTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientConstructorTests : ConstructorTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("ConstructorTests")]
public sealed class MicrosoftSqlClientConstructorTests : ConstructorTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientConstructorTests : ConstructorTests<MicrosoftSqlClientProvider> { }
#endif #endif
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("DataReaderTests")]
public sealed class SystemSqlClientDataReaderTests : DataReaderTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientDataReaderTests : DataReaderTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("DataReaderTests")]
public sealed class MicrosoftSqlClientDataReaderTests : DataReaderTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientDataReaderTests : DataReaderTests<MicrosoftSqlClientProvider> { }
#endif #endif
......
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("DecimalTests")]
public sealed class SystemSqlClientDecimalTests : DecimalTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientDecimalTests : DecimalTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("DecimalTests")]
public sealed class MicrosoftSqlClientDecimalTests : DecimalTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientDecimalTests : DecimalTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class DecimalTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class DecimalTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("EnumTests")]
public sealed class SystemSqlClientEnumTests : EnumTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientEnumTests : EnumTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("EnumTests")]
public sealed class MicrosoftSqlClientEnumTests : EnumTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientEnumTests : EnumTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class EnumTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class EnumTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("LiteralTests")]
public sealed class SystemSqlClientLiteralTests : LiteralTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientLiteralTests : LiteralTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("LiteralTests")]
public sealed class MicrosoftSqlClientLiteralTests : LiteralTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientLiteralTests : LiteralTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class LiteralTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class LiteralTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -39,8 +39,10 @@ public GenericUriParser(GenericUriParserOptions options) ...@@ -39,8 +39,10 @@ public GenericUriParser(GenericUriParserOptions options)
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("MiscTests")]
public sealed class SystemSqlClientMiscTests : MiscTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientMiscTests : MiscTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("MiscTests")]
public sealed class MicrosoftSqlClientMiscTests : MiscTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientMiscTests : MiscTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class MiscTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class MiscTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -6,8 +6,10 @@ ...@@ -6,8 +6,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("MultiMapTests")]
public sealed class SystemSqlClientMultiMapTests : MultiMapTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientMultiMapTests : MultiMapTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("MultiMapTests")]
public sealed class MicrosoftSqlClientMultiMapTests : MultiMapTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientMultiMapTests : MultiMapTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class MultiMapTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class MultiMapTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -718,6 +718,8 @@ private class HazSqlGeo ...@@ -718,6 +718,8 @@ private class HazSqlGeo
[Fact] [Fact]
public void DBGeography_SO24405645_SO24402424() public void DBGeography_SO24405645_SO24402424()
{ {
if (IsMsDataClient) return; // not supported
EntityFramework.Handlers.Register(); EntityFramework.Handlers.Register();
connection.Execute("create table #Geo (id int, geo geography, geometry geometry)"); connection.Execute("create table #Geo (id int, geo geography, geometry geometry)");
...@@ -739,6 +741,8 @@ public void DBGeography_SO24405645_SO24402424() ...@@ -739,6 +741,8 @@ public void DBGeography_SO24405645_SO24402424()
[Fact] [Fact]
public void SqlGeography_SO25538154() public void SqlGeography_SO25538154()
{ {
if (IsMsDataClient) return; // not supported
SqlMapper.ResetTypeHandlers(); SqlMapper.ResetTypeHandlers();
connection.Execute("create table #SqlGeo (id int, geo geography, geometry geometry)"); connection.Execute("create table #SqlGeo (id int, geo geography, geometry geometry)");
...@@ -777,6 +781,8 @@ public void NullableSqlGeometry() ...@@ -777,6 +781,8 @@ public void NullableSqlGeometry()
[Fact] [Fact]
public void SqlHierarchyId_SO18888911() public void SqlHierarchyId_SO18888911()
{ {
if (IsMsDataClient) return; // not supported
SqlMapper.ResetTypeHandlers(); SqlMapper.ResetTypeHandlers();
var row = connection.Query<HazSqlHierarchy>("select 3 as [Id], hierarchyid::Parse('/1/2/3/') as [Path]").Single(); var row = connection.Query<HazSqlHierarchy>("select 3 as [Id], hierarchyid::Parse('/1/2/3/') as [Path]").Single();
Assert.Equal(3, row.Id); Assert.Equal(3, row.Id);
......
...@@ -6,8 +6,10 @@ ...@@ -6,8 +6,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("ProcedureTests")]
public sealed class SystemSqlClientProcedureTests : ProcedureTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientProcedureTests : ProcedureTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("ProcedureTests")]
public sealed class MicrosoftSqlClientProcedureTests : ProcedureTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientProcedureTests : ProcedureTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class ProcedureTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class ProcedureTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -22,6 +22,8 @@ public EntityFrameworkTests() ...@@ -22,6 +22,8 @@ public EntityFrameworkTests()
[Fact] [Fact]
public void Issue570_DbGeo_HasValues() public void Issue570_DbGeo_HasValues()
{ {
if (IsMsDataClient) return; // not supported
EntityFramework.Handlers.Register(); EntityFramework.Handlers.Register();
const string redmond = "POINT (-122.1215 47.6740)"; const string redmond = "POINT (-122.1215 47.6740)";
DbGeography point = DbGeography.PointFromText(redmond, DbGeography.DefaultCoordinateSystemId); DbGeography point = DbGeography.PointFromText(redmond, DbGeography.DefaultCoordinateSystemId);
...@@ -37,6 +39,8 @@ public void Issue570_DbGeo_HasValues() ...@@ -37,6 +39,8 @@ public void Issue570_DbGeo_HasValues()
[Fact] [Fact]
public void Issue22_ExecuteScalar_EntityFramework() public void Issue22_ExecuteScalar_EntityFramework()
{ {
if (IsMsDataClient) return; // not supported
var geo = DbGeography.LineFromText("LINESTRING(-122.360 47.656, -122.343 47.656 )", 4326); var geo = DbGeography.LineFromText("LINESTRING(-122.360 47.656, -122.343 47.656 )", 4326);
var geo2 = connection.ExecuteScalar<DbGeography>("select @geo", new { geo }); var geo2 = connection.ExecuteScalar<DbGeography>("select @geo", new { geo });
Assert.NotNull(geo2); Assert.NotNull(geo2);
......
...@@ -6,8 +6,10 @@ ...@@ -6,8 +6,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("QueryMultipleTests")]
public sealed class SystemSqlClientQueryMultipleTests : QueryMultipleTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientQueryMultipleTests : QueryMultipleTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("QueryMultipleTests")]
public sealed class MicrosoftSqlClientQueryMultipleTests : QueryMultipleTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientQueryMultipleTests : QueryMultipleTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class QueryMultipleTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class QueryMultipleTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -81,6 +81,8 @@ public sealed class MicrosoftSqlClientProvider : SqlServerDatabaseProvider ...@@ -81,6 +81,8 @@ public sealed class MicrosoftSqlClientProvider : SqlServerDatabaseProvider
public abstract class TestBase<TProvider> : IDisposable where TProvider : DatabaseProvider public abstract class TestBase<TProvider> : IDisposable where TProvider : DatabaseProvider
{ {
protected bool IsMsDataClient => connection is Microsoft.Data.SqlClient.SqlConnection;
protected DbConnection GetOpenConnection() => Provider.GetOpenConnection(); protected DbConnection GetOpenConnection() => Provider.GetOpenConnection();
protected DbConnection GetClosedConnection() => Provider.GetClosedConnection(); protected DbConnection GetClosedConnection() => Provider.GetClosedConnection();
protected DbConnection _connection; protected DbConnection _connection;
......
...@@ -7,8 +7,10 @@ ...@@ -7,8 +7,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("TransactionTests")]
public sealed class SystemSqlClientTransactionTests : TransactionTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientTransactionTests : TransactionTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("TransactionTests")]
public sealed class MicrosoftSqlClientTransactionTests : TransactionTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientTransactionTests : TransactionTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class TransactionTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class TransactionTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("TupleTests")]
public sealed class SystemSqlClientTupleTests : TupleTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientTupleTests : TupleTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("TupleTests")]
public sealed class MicrosoftSqlClientTupleTests : TupleTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientTupleTests : TupleTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class TupleTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class TupleTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
namespace Dapper.Tests namespace Dapper.Tests
{ {
[Collection("XmlTests")]
public sealed class SystemSqlClientXmlTests : XmlTests<SystemSqlClientProvider> { } public sealed class SystemSqlClientXmlTests : XmlTests<SystemSqlClientProvider> { }
#if MSSQLCLIENT #if MSSQLCLIENT
[Collection("XmlTests")]
public sealed class MicrosoftSqlClientXmlTests : XmlTests<MicrosoftSqlClientProvider> { } public sealed class MicrosoftSqlClientXmlTests : XmlTests<MicrosoftSqlClientProvider> { }
#endif #endif
public abstract class XmlTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider public abstract class XmlTests<TProvider> : TestBase<TProvider> where TProvider : DatabaseProvider
......
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