Skip to content

Commit b3d7f9b

Browse files
cincuranetcincuranet
committed
More granular tests.
1 parent e62a358 commit b3d7f9b

3 files changed

Lines changed: 38 additions & 17 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
FIREBIRD_SELECTION: [FB25, FB30, FB40]
16-
TEST_SUITE: [Tests-FirebirdClient-Default, Tests-FirebirdClient-Embedded, Tests-EFCore, Tests-EF6]
16+
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]
1717
steps:
1818
- name: Checkout
1919
uses: actions/checkout@v2

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
//$Authors = Jiri Cincura (jiri@cincura.net)
1717

18+
using System;
1819
using System.Collections;
1920
using FirebirdSql.Data.FirebirdClient;
2021
using NUnit.Framework;
@@ -26,22 +27,24 @@ class FbServerTypeTestFixtureSource
2627
{
2728
public static IEnumerable Default()
2829
{
29-
yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, false, FbWireCrypt.Disabled);
30-
yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, false, FbWireCrypt.Required);
31-
yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, true, FbWireCrypt.Disabled);
32-
yield return CreateTestFixtureData(nameof(FbServerType.Default), FbServerType.Default, true, FbWireCrypt.Required);
30+
yield return CreateTestFixtureData(FbServerType.Default, false, FbWireCrypt.Disabled);
31+
yield return CreateTestFixtureData(FbServerType.Default, false, FbWireCrypt.Required);
32+
yield return CreateTestFixtureData(FbServerType.Default, true, FbWireCrypt.Disabled);
33+
yield return CreateTestFixtureData(FbServerType.Default, true, FbWireCrypt.Required);
3334

3435
}
3536

3637
public static IEnumerable Embedded()
3738
{
38-
yield return CreateTestFixtureData(nameof(FbServerType.Embedded), FbServerType.Embedded, default(bool), default(FbWireCrypt));
39+
yield return CreateTestFixtureData(FbServerType.Embedded, false, FbWireCrypt.Disabled);
3940
}
4041

41-
static TestFixtureData CreateTestFixtureData(string category, params object[] args)
42+
static TestFixtureData CreateTestFixtureData(FbServerType serverType, bool compression, FbWireCrypt wireCrypt)
4243
{
43-
var result = new TestFixtureData(args);
44-
result.Properties.Set(PropertyNames.Category, $"Server{category}");
44+
var result = new TestFixtureData(serverType, compression, wireCrypt);
45+
result.Properties.Set(nameof(FbTestsBase.ServerType), serverType.ToString());
46+
result.Properties.Set(nameof(FbTestsBase.Compression), compression.ToString());
47+
result.Properties.Set(nameof(FbTestsBase.WireCrypt), wireCrypt.ToString());
4548
return result;
4649
}
4750
}

‎Provider/tests.ps1‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,25 +87,37 @@ function Cleanup() {
8787
}
8888

8989
function Tests-All() {
90-
Tests-FirebirdClient-Default
90+
Tests-FirebirdClient-Default-C-R
91+
Tests-FirebirdClient-Default-NC-R
92+
Tests-FirebirdClient-Default-C-D
93+
Tests-FirebirdClient-Default-NC-D
9194
Tests-FirebirdClient-Embedded
9295
Tests-EF6
9396
Tests-EFCore
97+
Tests-EFCore-Functional
9498
}
9599

96-
function Tests-FirebirdClient-Default() {
97-
Tests-FirebirdClient 'Default'
100+
function Tests-FirebirdClient-Default-C-R() {
101+
Tests-FirebirdClient 'Default' $True 'Required'
102+
}
103+
function Tests-FirebirdClient-Default-NC-R() {
104+
Tests-FirebirdClient 'Default' $False 'Required'
105+
}
106+
function Tests-FirebirdClient-Default-C-D() {
107+
Tests-FirebirdClient 'Default' $True 'Disabled'
108+
}
109+
function Tests-FirebirdClient-Default-NC-D() {
110+
Tests-FirebirdClient 'Default' $False 'Disabled'
98111
}
99112
function Tests-FirebirdClient-Embedded() {
100-
Tests-FirebirdClient 'Embedded'
113+
Tests-FirebirdClient 'Embedded' $False 'Disabled'
101114
}
102-
function Tests-FirebirdClient($serverType) {
115+
function Tests-FirebirdClient($serverType, $compression, $wireCrypt) {
103116
cd $testsProviderDir
104-
.\FirebirdSql.Data.FirebirdClient.Tests.exe --labels=All "--where=Category==Server$serverType || Category==NoServer"
117+
.\FirebirdSql.Data.FirebirdClient.Tests.exe --labels=All "--where=(ServerType==$serverType && Compression==$compression && WireCrypt==$wireCrypt) || Category==NoServer"
105118
Check-ExitCode
106119
}
107120

108-
109121
function Tests-EF6() {
110122
cd "$baseDir\src\EntityFramework.Firebird.Tests\bin\$Configuration\$(Get-UsedTargetFramework)"
111123
.\EntityFramework.Firebird.Tests.exe --labels=All
@@ -117,10 +129,16 @@ function Tests-EFCore() {
117129
if ($FirebirdSelection -eq 'FB25') {
118130
return
119131
}
120-
132+
121133
cd "$baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird.Tests\bin\$Configuration\$(Get-UsedTargetFramework)"
122134
.\FirebirdSql.EntityFrameworkCore.Firebird.Tests.exe --labels=All
123135
Check-ExitCode
136+
}
137+
function Tests-EFCore-Functional() {
138+
# nothing for 2.5
139+
if ($FirebirdSelection -eq 'FB25') {
140+
return
141+
}
124142

125143
cd "$baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests"
126144
dotnet test --no-build -c $Configuration

0 commit comments

Comments
 (0)