Skip to content

Commit fa04289

Browse files
ngbrownngbrown
committed
NH-4008 - Centralize all driver detection for tests.
1 parent 34abf44 commit fa04289

File tree

89 files changed

+257
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+257
-236
lines changed

‎src/NHibernate.Test/Async/DriverTest/OdbcDriverFixture.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
//------------------------------------------------------------------------------
99

1010

11-
using System;
1211
using System.Collections;
1312
using NHibernate.Dialect;
14-
using NHibernate.Driver;
1513
using NHibernate.Engine;
1614
using NUnit.Framework;
1715

@@ -32,7 +30,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
3230

3331
protected override bool AppliesTo(ISessionFactoryImplementor factory)
3432
{
35-
return factory.ConnectionProvider.Driver is OdbcDriver;
33+
return factory.ConnectionProvider.Driver.IsOdbcDriver();
3634
}
3735

3836
protected override void OnTearDown()

‎src/NHibernate.Test/Async/DriverTest/SqlClientDriverFixture.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using System.Collections;
1313
using System.Data;
1414
using NHibernate.Dialect;
15-
using NHibernate.Driver;
1615
using NHibernate.Engine;
1716
using NHibernate.SqlTypes;
1817
using NUnit.Framework;
@@ -36,7 +35,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
3635

3736
protected override bool AppliesTo(ISessionFactoryImplementor factory)
3837
{
39-
return factory.ConnectionProvider.Driver is SqlClientDriver;
38+
return factory.ConnectionProvider.Driver.IsSqlClientDriver();
4039
}
4140

4241
protected override void OnTearDown()

‎src/NHibernate.Test/Async/ExceptionsTest/SQLExceptionConversionTest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using System.Data;
1414
using System.Data.Common;
1515
using NHibernate.Dialect;
16-
using NHibernate.Driver;
1716
using NHibernate.Engine;
1817
using NHibernate.Exceptions;
1918
using NHibernate.Util;
@@ -43,7 +42,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
4342
protected override bool AppliesTo(ISessionFactoryImplementor factory)
4443
{
4544
var driver = factory.ConnectionProvider.Driver;
46-
return !(driver is OracleDataClientDriver) && !(driver is OracleManagedDataClientDriver) && !(driver is OracleLiteDataClientDriver) && !(driver is OdbcDriver) && !(driver is OleDbDriver);
45+
return !(driver.IsOracleDataClientDriver()) && !(driver.IsOracleManagedDataClientDriver()) && !(driver.IsOracleLiteDataClientDriver()) && !(driver.IsOdbcDriver()) && !(driver.IsOleDbDriver());
4746
}
4847

4948
protected override void Configure(Cfg.Configuration configuration)

‎src/NHibernate.Test/Async/Futures/FallbackFixture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ protected override void Configure(Configuration configuration)
4646
base.Configure(configuration);
4747
using (var cp = ConnectionProviderFactory.NewConnectionProvider(cfg.Properties))
4848
{
49-
if (cp.Driver is SqlClientDriver)
49+
if (cp.Driver.IsSqlClientDriver())
5050
{
5151
configuration.Properties[Environment.ConnectionDriver] =
5252
typeof(TestDriverThatDoesntSupportQueryBatching).AssemblyQualifiedName;

‎src/NHibernate.Test/Async/Hql/Ast/LimitClauseFixture.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
using System.Linq;
1212
using NHibernate.Cfg;
13-
using NHibernate.Driver;
1413
using NHibernate.Hql.Ast.ANTLR;
1514
using NHibernate.Util;
1615
using NUnit.Framework;
@@ -25,7 +24,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
2524
{
2625
return dialect.SupportsVariableLimit
2726
&& !(Dialect is Dialect.MsSql2000Dialect && // don't know why, but these tests don't work on SQL Server using ODBC
28-
typeof(OdbcDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))));
27+
ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver)).IsOdbcDriver());
2928
}
3029

3130
protected override void OnSetUp()

‎src/NHibernate.Test/Async/Insertordering/InsertOrderingFixture.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
using NHibernate.AdoNet;
1919
using NHibernate.Cfg;
2020
using NHibernate.Dialect;
21-
using NHibernate.Driver;
2221
using NHibernate.Engine;
2322
using NHibernate.SqlCommand;
2423
using NHibernate.SqlTypes;
@@ -52,7 +51,7 @@ protected override bool AppliesTo(Dialect.Dialect dialect)
5251
protected override bool AppliesTo(ISessionFactoryImplementor factory)
5352
{
5453
// Custom batcher does not support oledb driver.
55-
return factory.ConnectionProvider.Driver is SqlClientDriver;
54+
return factory.ConnectionProvider.Driver.IsSqlClientDriver();
5655
}
5756

5857
protected override void Configure(Configuration configuration)

‎src/NHibernate.Test/Async/Linq/ByMethod/GroupByTests.cs‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using System.Text.RegularExpressions;
1616
using NHibernate.Dialect;
1717
using NHibernate.DomainModel.Northwind.Entities;
18-
using NHibernate.Driver;
1918
using NHibernate.Linq;
2019
using NUnit.Framework;
2120

@@ -562,7 +561,7 @@ public async Task GroupByComputedValueAsync()
562561
{
563562
if (!TestDialect.SupportsComplexExpressionInGroupBy)
564563
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
565-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
564+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
566565
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
567566

568567
var orderGroups = await (db.Orders.GroupBy(o => o.Customer.CustomerId == null ? 0 : 1).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -574,7 +573,7 @@ public async Task GroupByComputedValueInAnonymousTypeAsync()
574573
{
575574
if (!TestDialect.SupportsComplexExpressionInGroupBy)
576575
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
577-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
576+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
578577
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
579578

580579
var orderGroups = await (db.Orders.GroupBy(o => new { Key = o.Customer.CustomerId == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -586,7 +585,7 @@ public async Task GroupByComputedValueInObjectArrayAsync()
586585
{
587586
if (!TestDialect.SupportsComplexExpressionInGroupBy)
588587
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
589-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
588+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
590589
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
591590

592591
var orderGroups = await (db.Orders.GroupBy(o => new[] { o.Customer.CustomerId == null ? 0 : 1, }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -715,7 +714,7 @@ public async Task GroupByComputedValueWithJoinOnObjectAsync()
715714
{
716715
if (!TestDialect.SupportsComplexExpressionInGroupBy)
717716
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
718-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
717+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
719718
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
720719

721720
var orderGroups = await (db.OrderLines.GroupBy(o => o.Order.Customer == null ? 0 : 1).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -727,7 +726,7 @@ public async Task GroupByComputedValueWithJoinOnIdAsync()
727726
{
728727
if (!TestDialect.SupportsComplexExpressionInGroupBy)
729728
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
730-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
729+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
731730
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
732731

733732
var orderGroups = await (db.OrderLines.GroupBy(o => o.Order.Customer.CustomerId == null ? 0 : 1).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -739,7 +738,7 @@ public async Task GroupByComputedValueInAnonymousTypeWithJoinOnObjectAsync()
739738
{
740739
if (!TestDialect.SupportsComplexExpressionInGroupBy)
741740
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
742-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
741+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
743742
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
744743

745744
var orderGroups = await (db.OrderLines.GroupBy(o => new { Key = o.Order.Customer == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -751,7 +750,7 @@ public async Task GroupByComputedValueInAnonymousTypeWithJoinOnIdAsync()
751750
{
752751
if (!TestDialect.SupportsComplexExpressionInGroupBy)
753752
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
754-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
753+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
755754
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
756755

757756
var orderGroups = await (db.OrderLines.GroupBy(o => new { Key = o.Order.Customer.CustomerId == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -763,7 +762,7 @@ public async Task GroupByComputedValueInObjectArrayWithJoinOnObjectAsync()
763762
{
764763
if (!TestDialect.SupportsComplexExpressionInGroupBy)
765764
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
766-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
765+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
767766
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
768767

769768
var orderGroups = await (db.OrderLines.GroupBy(o => new[] { o.Order.Customer == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -775,7 +774,7 @@ public async Task GroupByComputedValueInObjectArrayWithJoinOnIdAsync()
775774
{
776775
if (!TestDialect.SupportsComplexExpressionInGroupBy)
777776
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
778-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
777+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
779778
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
780779

781780
var orderGroups = await (db.OrderLines.GroupBy(o => new[] { o.Order.Customer.CustomerId == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -787,7 +786,7 @@ public async Task GroupByComputedValueInObjectArrayWithJoinInRightSideOfCaseAsyn
787786
{
788787
if (!TestDialect.SupportsComplexExpressionInGroupBy)
789788
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
790-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
789+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
791790
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
792791

793792
var orderGroups = await (db.OrderLines.GroupBy(o => new[] { o.Order.Customer.CustomerId == null ? "unknown" : o.Order.Customer.CompanyName }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -799,7 +798,7 @@ public async Task GroupByComputedValueFromNestedArraySelectAsync()
799798
{
800799
if (!TestDialect.SupportsComplexExpressionInGroupBy)
801800
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
802-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
801+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
803802
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
804803

805804
var orderGroups = await (db.OrderLines.Select(o => new object[] { o }).GroupBy(x => new object[] { ((OrderLine)x[0]).Order.Customer == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());
@@ -811,7 +810,7 @@ public async Task GroupByComputedValueFromNestedObjectSelectAsync()
811810
{
812811
if (!TestDialect.SupportsComplexExpressionInGroupBy)
813812
Assert.Ignore(Dialect.GetType().Name + " does not support complex group by expressions");
814-
if (Sfi.ConnectionProvider.Driver is OdbcDriver)
813+
if (Sfi.ConnectionProvider.Driver.IsOdbcDriver())
815814
Assert.Ignore("SQL Server seems unable to match complex group by and select list arguments when running over ODBC.");
816815

817816
var orderGroups = await (db.OrderLines.Select(o => new { OrderLine = (object)o }).GroupBy(x => new object[] { ((OrderLine)x.OrderLine).Order.Customer == null ? 0 : 1 }).Select(g => new { Key = g.Key, Count = g.Count() }).ToListAsync());

‎src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetFixture.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using System.IO;
1515
using System.Runtime.Serialization.Formatters.Binary;
1616
using System.Xml.Serialization;
17-
using NHibernate.Driver;
1817
using NHibernate.Type;
1918
using NUnit.Framework;
2019

@@ -33,7 +32,7 @@ protected override IList Mappings
3332
protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
3433
{
3534
// Cannot handle DbType.DateTimeOffset via ODBC.
36-
if (factory.ConnectionProvider.Driver is OdbcDriver)
35+
if (factory.ConnectionProvider.Driver.IsOdbcDriver())
3736
return false;
3837

3938
return base.AppliesTo(factory);

‎src/NHibernate.Test/Async/NHSpecificTest/Dates/DateTimeOffsetQueryFixture.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
using System.Collections;
1313
using System.Data;
1414
using System.Linq;
15-
using NHibernate.Driver;
1615
using NHibernate.Type;
1716
using NUnit.Framework;
1817
using Environment = NHibernate.Cfg.Environment;
@@ -32,7 +31,7 @@ protected override IList Mappings
3231
protected override bool AppliesTo(Engine.ISessionFactoryImplementor factory)
3332
{
3433
// Cannot handle DbType.DateTimeOffset via ODBC.
35-
if (factory.ConnectionProvider.Driver is OdbcDriver)
34+
if (factory.ConnectionProvider.Driver.IsOdbcDriver())
3635
return false;
3736

3837
return base.AppliesTo(factory);

‎src/NHibernate.Test/Async/NHSpecificTest/NH1144/Fixture.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using log4net.Core;
1212
using NHibernate.AdoNet;
1313
using NHibernate.Cfg;
14-
using NHibernate.Driver;
1514
using NHibernate.Util;
1615
using NUnit.Framework;
1716

@@ -37,7 +36,7 @@ protected override void Configure(Configuration configuration)
3736
[Test]
3837
public async Task CanSaveInSingleBatchAsync()
3938
{
40-
if (!typeof(OracleDataClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
39+
if (!ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver)).IsOracleDataClientDriver())
4140
{
4241
Assert.Ignore("Only applicable for Oracle Data Client driver");
4342
}

0 commit comments

Comments
 (0)