Fix FB Tests

Author: bahusoid

appveyor.yml

@@ -25,7 +25,7 @@ before_test:
         # Install Firebird
         New-Item -ItemType Directory -Force $FireBirdPath > $null
         Push-Location $FireBirdPath
-        Invoke-WebRequest 'https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/Firebird-3.0.5.33220-0_x64.zip' -OutFile firebird.zip
+        Invoke-WebRequest 'https://github.com/FirebirdSQL/firebird/releases/download/R3_0_7/Firebird-3.0.7.33374-1_x64.zip' -OutFile firebird.zip
         Unblock-File firebird.zip
         7z x firebird.zip
         New-Item -ItemType Directory -Force Data

src/NHibernate.Test/NHibernate.Test.csproj

@@ -63,7 +63,7 @@
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
-    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="6.3.0" />
+    <PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="8.0.1" />
     <PackageReference Include="Npgsql" Version="4.0.3" />
   </ItemGroup>
   <ItemGroup Condition="$(NhNetFx)">

src/NHibernate.Test/TestCase.cs

@@ -303,6 +303,9 @@ protected virtual void DropSchema()
 
 		public static void DropSchema(bool useStdOut, SchemaExport export, ISessionFactoryImplementor sfi, Func<DbConnection> getConnection = null)
 		{
+			using(var optionalConnection = getConnection?.Invoke())
+				export.Drop(useStdOut, true, optionalConnection);
+
 			if (sfi?.ConnectionProvider.Driver is FirebirdClientDriver fbDriver)
 			{
 				// Firebird will pool each connection created during the test and will marked as used any table
@@ -313,9 +316,6 @@ public static void DropSchema(bool useStdOut, SchemaExport export, ISessionFacto
 				// Moved from NH1908 test case, contributed by Amro El-Fakharany.
 				fbDriver.ClearPool(null);
 			}
-
-			using(var optionalConnection = getConnection?.Invoke())
-				export.Drop(useStdOut, true, optionalConnection);
 		}
 
 		/// <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.");
 				}
 			}