Clear pool after DropSchema

Author: bahusoid

src/NHibernate.Test/TestCase.cs

@@ -71,6 +71,7 @@ protected virtual string MappingsAssembly
 		[OneTimeSetUp]
 		public void TestFixtureSetUp()
 		{
+			
 			try
 			{
 				Configure();
@@ -292,7 +293,18 @@ protected virtual void AddMappings(Configuration configuration)
 
 		protected virtual void CreateSchema()
 		{
-			if (Sfi?.ConnectionProvider.Driver is FirebirdClientDriver fbDriver)
+			using (var optionalConnection = OpenConnectionForSchemaExport())
+				SchemaExport.Create(OutputDdl, true, optionalConnection);
+		}
+
+		protected virtual void DropSchema()
+		{
+			DropSchema(OutputDdl, SchemaExport, Sfi, OpenConnectionForSchemaExport);
+		}
+
+		private static void FbCleanUp(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
@@ -302,20 +314,13 @@ protected virtual void CreateSchema()
 				// Moved from NH1908 test case, contributed by Amro El-Fakharany.
 				fbDriver.ClearPool(null);
 			}
-			
-			using (var optionalConnection = OpenConnectionForSchemaExport())
-				SchemaExport.Create(OutputDdl, true, optionalConnection);
-		}
-
-		protected virtual void DropSchema()
-		{
-			DropSchema(OutputDdl, SchemaExport, Sfi, OpenConnectionForSchemaExport);
 		}
 
 		public static void DropSchema(bool useStdOut, SchemaExport export, ISessionFactoryImplementor sfi, Func<DbConnection> getConnection = null)
 		{
 			using(var optionalConnection = getConnection?.Invoke())
 				export.Drop(useStdOut, true, optionalConnection);
+			FbCleanUp(sfi);
 		}
 
 		/// <summary>

src/NHibernate/Driver/FirebirdClientDriver.cs

@@ -160,8 +160,8 @@ public void ClearPool(string connectionString)
 				using (var clearConnection = CreateConnection())
 				{
 					var connectionType = clearConnection.GetType();
-					_clearPool = connectionType.GetMethod("ClearPool") ?? throw new InvalidOperationException("Unable to resolve ClearPool method.");
-					_clearAllPools = connectionType.GetMethod("ClearAllPools") ?? throw new InvalidOperationException("Unable to resolve ClearAllPools method.");
+					_clearPool = connectionType.GetMethod("ClearPool", new[] { connectionType }) ?? throw new InvalidOperationException("Unable to resolve ClearPool method.");
+					_clearAllPools = connectionType.GetMethod("ClearAllPools", Array.Empty<System.Type>()) ?? throw new InvalidOperationException("Unable to resolve ClearAllPools method.");
 				}
 			}