Sql driver switch: re-enabling a test.

And rewritting driver tests for them to be more robust.

Author: fredericDelaporte

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

@@ -10,7 +10,9 @@
 
 using System.Linq;
 using NHibernate.Cfg;
+using NHibernate.Driver;
 using NHibernate.Hql.Ast.ANTLR;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Hql.Ast
@@ -22,7 +24,8 @@ public class LimitClauseFixtureAsync : BaseFixture
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			return dialect.SupportsVariableLimit
-				&& !(Dialect is Dialect.MsSql2000Dialect &&  cfg.Properties[Environment.ConnectionDriver] == typeof(Driver.OdbcDriver).FullName); // don't know why, but these tests don't work on SQL Server using ODBC
+				&& !(Dialect is Dialect.MsSql2000Dialect && // don't know why, but these tests don't work on SQL Server using ODBC
+					typeof(OdbcDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver)))); 
 		}
 
 		protected override void OnSetUp()
@@ -186,4 +189,4 @@ public async Task TakeWithParameterAsync()
 			s.Close();
 		}
 	}
-}
+}

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

@@ -12,6 +12,7 @@
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1144
@@ -36,7 +37,7 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public async Task CanSaveInSingleBatchAsync()
 		{
-			if (configuration.Properties[Environment.ConnectionDriver].Contains(typeof (OracleDataClientDriver).Name) == false)
+			if (!typeof(OracleDataClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 			{
 				Assert.Ignore("Only applicable for Oracle Data Client driver");
 			}
@@ -85,4 +86,4 @@ public async Task CanSaveInSingleBatchAsync()
 			Assert.IsTrue(executedBatch);
 		}
 	}
-}
+}

src/NHibernate.Test/Async/NHSpecificTest/NH3202/Fixture.cs

@@ -13,6 +13,7 @@
 using NHibernate.Cfg;
 using NHibernate.Dialect;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH3202
@@ -26,7 +27,7 @@ protected override void Configure(Configuration configuration)
 			if (!(Dialect is MsSql2008Dialect))
 				Assert.Ignore("Test is for MS SQL Server dialect only (custom dialect).");
 
-			if (!Environment.ConnectionDriver.Contains("SqlClientDriver"))
+			if (!typeof(SqlClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 				Assert.Ignore("Test is for MS SQL Server driver only (custom driver is used).");
 
 			cfg.SetProperty(Environment.Dialect, typeof(OffsetStartsAtOneTestDialect).AssemblyQualifiedName);

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

@@ -1,6 +1,8 @@
 using System.Linq;
 using NHibernate.Cfg;
+using NHibernate.Driver;
 using NHibernate.Hql.Ast.ANTLR;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.Hql.Ast
@@ -11,7 +13,8 @@ public class LimitClauseFixture : BaseFixture
 		protected override bool AppliesTo(Dialect.Dialect dialect)
 		{
 			return dialect.SupportsVariableLimit
-				&& !(Dialect is Dialect.MsSql2000Dialect &&  cfg.Properties[Environment.ConnectionDriver] == typeof(Driver.OdbcDriver).FullName); // don't know why, but these tests don't work on SQL Server using ODBC
+				&& !(Dialect is Dialect.MsSql2000Dialect && // don't know why, but these tests don't work on SQL Server using ODBC
+					typeof(OdbcDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver)))); 
 		}
 
 		protected override void OnSetUp()
@@ -175,4 +178,4 @@ public void TakeWithParameter()
 			s.Close();
 		}
 	}
-}
+}

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

@@ -2,6 +2,7 @@
 using NHibernate.AdoNet;
 using NHibernate.Cfg;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH1144
@@ -25,7 +26,7 @@ protected override void Configure(Configuration configuration)
 		[Test]
 		public void CanSaveInSingleBatch()
 		{
-			if (configuration.Properties[Environment.ConnectionDriver].Contains(typeof (OracleDataClientDriver).Name) == false)
+			if (!typeof(OracleDataClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 			{
 				Assert.Ignore("Only applicable for Oracle Data Client driver");
 			}
@@ -74,4 +75,4 @@ public void CanSaveInSingleBatch()
 			Assert.IsTrue(executedBatch);
 		}
 	}
-}
+}

src/NHibernate.Test/NHSpecificTest/NH3202/Fixture.cs

@@ -3,6 +3,7 @@
 using NHibernate.Cfg;
 using NHibernate.Dialect;
 using NHibernate.Driver;
+using NHibernate.Util;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH3202
@@ -15,7 +16,7 @@ protected override void Configure(Configuration configuration)
 			if (!(Dialect is MsSql2008Dialect))
 				Assert.Ignore("Test is for MS SQL Server dialect only (custom dialect).");
 
-			if (!Environment.ConnectionDriver.Contains("SqlClientDriver"))
+			if (!typeof(SqlClientDriver).IsAssignableFrom(ReflectHelper.ClassForName(cfg.GetProperty(Environment.ConnectionDriver))))
 				Assert.Ignore("Test is for MS SQL Server driver only (custom driver is used).");
 
 			cfg.SetProperty(Environment.Dialect, typeof(OffsetStartsAtOneTestDialect).AssemblyQualifiedName);