NH-3905 - Fix test failures for Firebird

Author: hazzik

src/NHibernate.Test/CfgTest/ConfigurationSerializationTests.cs

@@ -3,6 +3,8 @@
 using System.Runtime.Serialization.Formatters.Binary;
 using NHibernate.Cfg;
 using NHibernate.DomainModel;
+using NHibernate.Driver;
+using NHibernate.Engine;
 using NHibernate.Tool.hbm2ddl;
 using NUnit.Framework;
 
@@ -82,7 +84,8 @@ public void Basic_CRUD_should_work()
 				var p = session.Get<Parent>(parentId);
 				Assert.That(p, Is.Null);
 			}
-			export.Drop(true, true);
+
+			TestCase.DropSchema(true, export, (ISessionFactoryImplementor)sf);
 		}
 	}
-}
+}

src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs

@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using NHibernate.Cfg;
 using NHibernate.Connection;
+using NHibernate.Engine;
 using NHibernate.Tool.hbm2ddl;
 using NUnit.Framework;
 
@@ -96,7 +96,8 @@ public void DestroyNorthwindDb()
 			}
 			else
 			{
-				new SchemaExport(configuration).Drop(false, true);
+				using (var sf = configuration.BuildSessionFactory())
+					TestCase.DropSchema(false, new SchemaExport(configuration), (ISessionFactoryImplementor)sf);
 			}
 		}
 
@@ -143,4 +144,4 @@ private void CreateTestData(ISessionFactory sessionFactory)
 			}
 		}
 	}
-}
+}

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

@@ -38,7 +38,7 @@ public void NotIgnorePrecisionScaleInSchemaExport()
 			var script = new StringBuilder();
 			new SchemaExport(cfg).Create(sl => script.AppendLine(sl), true);
 			Assert.That(script.ToString(), Does.Contain(expectedExportString));
-			new SchemaExport(cfg).Drop(false, true);
+			TestCase.DropSchema(false, new SchemaExport(cfg), factory);
 		}
 
 		private Dialect.Dialect GetDialect()

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

@@ -2,7 +2,6 @@
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Dialect;
 using NHibernate.Mapping.ByCode;
-using NHibernate.Tool.hbm2ddl;
 using NUnit.Framework;
 
 namespace NHibernate.Test.NHSpecificTest.NH4004
@@ -45,7 +44,7 @@ protected override bool CheckDatabaseWasCleaned()
 		[Test]
 		public void SequenceShallBeDropped()
 		{
-			new SchemaExport(cfg).Drop(true, true);
+			DropSchema();
 
 			using (var connection = Sfi.ConnectionProvider.GetConnection())
 			{
@@ -58,4 +57,4 @@ public void SequenceShallBeDropped()
 			}
 		}
 	}
-}
+}

src/NHibernate.Test/TestCase.cs

@@ -276,7 +276,12 @@ protected virtual void CreateSchema()
 
 		protected virtual void DropSchema()
 		{
-			if (Sfi?.ConnectionProvider.Driver is FirebirdClientDriver fbDriver)
+			DropSchema(OutputDdl, new SchemaExport(cfg), Sfi);
+		}
+
+		public static void DropSchema(bool useStdOut, SchemaExport export, ISessionFactoryImplementor sfi)
+		{
+			if (sfi?.ConnectionProvider.Driver is FirebirdClientDriver fbDriver)
 			{
 				// Firebird will pool each connection created during the test and will marked as used any table
 				// referenced by queries. It will at best delays those tables drop until connections are actually
@@ -287,7 +292,7 @@ protected virtual void DropSchema()
 				fbDriver.ClearPool(null);
 			}
 
-			new SchemaExport(cfg).Drop(OutputDdl, true);
+			export.Drop(useStdOut, true);
 		}
 
 		protected virtual DebugSessionFactory BuildSessionFactory()

src/NHibernate.Test/Tools/hbm2ddl/SchemaMetadataUpdaterTest/SchemaMetadataUpdaterFixture.cs

@@ -248,7 +248,7 @@ public void CanWorkWithAutoQuoteTableAndColumnsAtStratup()
 				t.Commit();
 			}
 
-			new SchemaExport(configuration).Drop(false, false);
+			TestCase.DropSchema(false, new SchemaExport(configuration), (ISessionFactoryImplementor)sf);
 		}
 
 		[Test]
@@ -285,4 +285,4 @@ public void WhenConfiguredOnlyExplicitAutoQuote()
 			Assert.That(!GetColumnByName(culs, "Name").IsQuoted);
 		}
 	}
-}
+}