More granular tests.

Author: cincuranet

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         FIREBIRD_SELECTION: [FB25, FB30, FB40]
-        TEST_SUITE: [Tests-FirebirdClient-Default, Tests-FirebirdClient-Embedded, Tests-EFCore, Tests-EF6]
+        TEST_SUITE: [Tests-FirebirdClient-Default-C-R, Tests-FirebirdClient-Default-NC-R, Tests-FirebirdClient-Default-C-D, Tests-FirebirdClient-Default-NC-D, Tests-FirebirdClient-Embedded, Tests-EFCore, Tests-EFCore-Functional, Tests-EF6]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

Provider/src/FirebirdSql.Data.TestsBase/FbServerTypeTestFixtureSource.cs

@@ -15,6 +15,7 @@
 
 //$Authors = Jiri Cincura (jiri@cincura.net)
 
+using System;
 using System.Collections;
 using FirebirdSql.Data.FirebirdClient;
 using NUnit.Framework;
@@ -26,22 +27,24 @@ class FbServerTypeTestFixtureSource
 	{
 		public static IEnumerable Default()
 		{
-			yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, false, FbWireCrypt.Disabled);
-			yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, false, FbWireCrypt.Required);
-			yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, true, FbWireCrypt.Disabled);
-			yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, true, FbWireCrypt.Required);
+			yield return CreateTestFixtureData(FbServerType.Default, false, FbWireCrypt.Disabled);
+			yield return CreateTestFixtureData(FbServerType.Default, false, FbWireCrypt.Required);
+			yield return CreateTestFixtureData(FbServerType.Default, true, FbWireCrypt.Disabled);
+			yield return CreateTestFixtureData(FbServerType.Default, true, FbWireCrypt.Required);
 
 		}
 
 		public static IEnumerable Embedded()
 		{
-			yield return CreateTestFixtureData(nameof(FbServerType.Embedded), FbServerType.Embedded, default(bool), default(FbWireCrypt));
+			yield return CreateTestFixtureData(FbServerType.Embedded, false, FbWireCrypt.Disabled);
 		}
 
-		static TestFixtureData CreateTestFixtureData(string category, params object[] args)
+		static TestFixtureData CreateTestFixtureData(FbServerType serverType, bool compression, FbWireCrypt wireCrypt)
 		{
-			var result = new TestFixtureData(args);
-			result.Properties.Set(PropertyNames.Category, $"Server{category}");
+			var result = new TestFixtureData(serverType, compression, wireCrypt);
+			result.Properties.Set(nameof(FbTestsBase.ServerType), serverType.ToString());
+			result.Properties.Set(nameof(FbTestsBase.Compression), compression.ToString());
+			result.Properties.Set(nameof(FbTestsBase.WireCrypt), wireCrypt.ToString());
 			return result;
 		}
 	}

Provider/tests.ps1

@@ -87,25 +87,37 @@ function Cleanup() {
 }
 
 function Tests-All() {
-	Tests-FirebirdClient-Default
+	Tests-FirebirdClient-Default-C-R
+	Tests-FirebirdClient-Default-NC-R
+	Tests-FirebirdClient-Default-C-D
+	Tests-FirebirdClient-Default-NC-D
 	Tests-FirebirdClient-Embedded
 	Tests-EF6
 	Tests-EFCore
+	Tests-EFCore-Functional
 }
 
-function Tests-FirebirdClient-Default() {
-	Tests-FirebirdClient 'Default'
+function Tests-FirebirdClient-Default-C-R() {
+	Tests-FirebirdClient 'Default' $True 'Required'
+}
+function Tests-FirebirdClient-Default-NC-R() {
+	Tests-FirebirdClient 'Default' $False 'Required'
+}
+function Tests-FirebirdClient-Default-C-D() {
+	Tests-FirebirdClient 'Default' $True 'Disabled'
+}
+function Tests-FirebirdClient-Default-NC-D() {
+	Tests-FirebirdClient 'Default' $False 'Disabled'
 }
 function Tests-FirebirdClient-Embedded() {
-	Tests-FirebirdClient 'Embedded'
+	Tests-FirebirdClient 'Embedded' $False 'Disabled'
 }
-function Tests-FirebirdClient($serverType) {
+function Tests-FirebirdClient($serverType, $compression, $wireCrypt) {
 	cd $testsProviderDir
-	.\FirebirdSql.Data.FirebirdClient.Tests.exe --labels=All "--where=Category==Server$serverType || Category==NoServer"
+	.\FirebirdSql.Data.FirebirdClient.Tests.exe --labels=All "--where=(ServerType==$serverType && Compression==$compression && WireCrypt==$wireCrypt) || Category==NoServer"
 	Check-ExitCode
 }
 
-
 function Tests-EF6() {
 	cd "$baseDir\src\EntityFramework.Firebird.Tests\bin\$Configuration\$(Get-UsedTargetFramework)"
 	.\EntityFramework.Firebird.Tests.exe --labels=All
@@ -117,10 +129,16 @@ function Tests-EFCore() {
 	if ($FirebirdSelection -eq 'FB25') {
 		return
 	}
- 
+
 	cd "$baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird.Tests\bin\$Configuration\$(Get-UsedTargetFramework)"
 	.\FirebirdSql.EntityFrameworkCore.Firebird.Tests.exe --labels=All
 	Check-ExitCode
+}
+function Tests-EFCore-Functional() {
+	# nothing for 2.5
+	if ($FirebirdSelection -eq 'FB25') {
+		return
+	}
 
 	cd "$baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests"
 	dotnet test --no-build -c $Configuration