Skip to content

Commit 1a83f9c

Browse files
cincuranetcincuranet
committed
Change test for FB5 (and refactoring).
1 parent 2c420b5 commit 1a83f9c

File tree

15 files changed

+42
-31
lines changed

15 files changed

+42
-31
lines changed

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbBatchCommandTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public override async Task SetUp()
4141
{
4242
await base.SetUp();
4343

44-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
44+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
4545
return;
4646

4747
_shouldTearDown = true;

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbBooleanSupportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public override async Task SetUp()
3939
{
4040
await base.SetUp();
4141

42-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
42+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
4343
return;
4444

4545
_shouldTearDown = true;

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbCommandTests.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,9 @@ public async Task ReadOnlyTransactionTest()
485485
[Test]
486486
public async Task ReturningClauseParameterTest()
487487
{
488+
if (!EnsureServerVersionAtMost(new Version(5, 0, 0, 0)))
489+
return;
490+
488491
const int ColumnValue = 1234;
489492
await using (var cmd = Connection.CreateCommand())
490493
{
@@ -585,7 +588,7 @@ public async Task GetCommandPlanTest()
585588
[Test]
586589
public async Task GetCommandExplainedPlanTest()
587590
{
588-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
591+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
589592
return;
590593

591594
await using (var cmd = Connection.CreateCommand())
@@ -614,7 +617,7 @@ public async Task GetCommandPlanNoPlanTest()
614617
[Test]
615618
public async Task GetCommandExplainedPlanNoPlanTest()
616619
{
617-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
620+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
618621
return;
619622

620623
await using (var cmd = Connection.CreateCommand())
@@ -689,7 +692,7 @@ public async Task ExecuteNonQueryReturnsMinusOneOnNonInsertUpdateDelete()
689692
[Test]
690693
public async Task CommandCancellationDirectTest()
691694
{
692-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
695+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
693696
return;
694697

695698
await using (var cmd = Connection.CreateCommand())
@@ -711,7 +714,7 @@ async Task Execute()
711714
[Test]
712715
public async Task CommandCancellationCancellationTokenTest()
713716
{
714-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
717+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
715718
return;
716719

717720
using (var cts = new CancellationTokenSource())
@@ -736,7 +739,7 @@ async Task Execute(CancellationToken cancellationToken)
736739
[Test]
737740
public async Task CommandUsableAfterCancellationTest()
738741
{
739-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
742+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
740743
return;
741744

742745
using (var cts = new CancellationTokenSource())
@@ -776,7 +779,7 @@ async Task Execute(CancellationToken cancellationToken)
776779
[Test]
777780
public async Task ExecuteNonQueryOnAlreadyCancelledToken()
778781
{
779-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
782+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
780783
return;
781784

782785
using (var cts = new CancellationTokenSource())
@@ -819,7 +822,7 @@ public async Task PassTimeOnly()
819822
[Test]
820823
public async Task CommandTimeoutTest()
821824
{
822-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
825+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
823826
return;
824827

825828
await using (var cmd = Connection.CreateCommand())

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbConnectionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ public async Task CreateDropDatabaseUsingTrustedAuth()
397397
[TestCase(true)]
398398
public async Task UseCompression(bool compression)
399399
{
400-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
400+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
401401
return;
402402
if (!EnsureServerType(FbServerType.Default))
403403
return;
@@ -424,7 +424,7 @@ public async Task UseCompression(bool compression)
424424
[TestCase(FbWireCrypt.Required)]
425425
public async Task UseWireCrypt(FbWireCrypt wireCrypt)
426426
{
427-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
427+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
428428
return;
429429
if (!EnsureServerType(FbServerType.Default))
430430
return;
@@ -495,7 +495,7 @@ public async Task DoNotGoBackToPoolAfterBroken()
495495
[Test]
496496
public async Task CaseSensitiveLogin()
497497
{
498-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
498+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
499499
return;
500500

501501
var csb = BuildConnectionStringBuilder(ServerType, Compression, WireCrypt);
@@ -622,7 +622,7 @@ public async Task ConnectionTimeoutUsingCancellationToken()
622622
[Test]
623623
public async Task SrpWithLeadingZeros()
624624
{
625-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
625+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
626626
return;
627627

628628
await using (var cmd = Connection.CreateCommand())

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbDataReaderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ public async Task DNET749_CommandBehaviorCloseConnectionStackOverflow()
457457
[Test]
458458
public async Task ReadCancellation()
459459
{
460-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
460+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
461461
return;
462462

463463
using (var cts = new CancellationTokenSource())
@@ -500,7 +500,7 @@ public async Task ReadCancellation()
500500
[Test]
501501
public async Task ReadOnAlreadyCancelledToken()
502502
{
503-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
503+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
504504
return;
505505

506506
using (var cts = new CancellationTokenSource())

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbDecFloat16SupportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public override async Task SetUp()
3737
{
3838
await base.SetUp();
3939

40-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
40+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
4141
return;
4242
}
4343

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbDecFloat34SupportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public override async Task SetUp()
3737
{
3838
await base.SetUp();
3939

40-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
40+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
4141
return;
4242
}
4343

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbInt128SupportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public override async Task SetUp()
3737
{
3838
await base.SetUp();
3939

40-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
40+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
4141
return;
4242
}
4343

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbLongNumericsSupportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public override async Task SetUp()
3636
{
3737
await base.SetUp();
3838

39-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
39+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
4040
return;
4141
}
4242

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbServicesTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Task RestorePart()
8686
[TestCase(false)]
8787
public async Task StreamingBackupRestoreTest(bool verbose)
8888
{
89-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
89+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
9090
return;
9191

9292
Task BackupPart(MemoryStream buffer)
@@ -194,7 +194,7 @@ public async Task ShutdownOnlineTest()
194194
[Test]
195195
public async Task ShutdownOnline2Test()
196196
{
197-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
197+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
198198
return;
199199

200200
var configurationSvc = new FbConfiguration();
@@ -273,7 +273,7 @@ public void ServerPropertiesTest()
273273
[Test]
274274
public async Task NBackupBackupRestoreTest()
275275
{
276-
if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
276+
if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
277277
return;
278278

279279
const int Levels = 2;
@@ -352,7 +352,7 @@ async Task Stop()
352352
[Test]
353353
public async Task NoLingerTest()
354354
{
355-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
355+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
356356
return;
357357

358358
var configurationSvc = new FbConfiguration();
@@ -379,7 +379,7 @@ Task Test()
379379
[Test]
380380
public async Task Validation2Test()
381381
{
382-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
382+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
383383
return;
384384

385385
var validationSvc = new FbValidation2();
@@ -396,7 +396,7 @@ public async Task Validation2Test()
396396
[Test]
397397
public async Task NFixupTest()
398398
{
399-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
399+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
400400
return;
401401

402402
var deltaFile = Path.GetTempFileName();

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbTimeZonesSupportTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public override async Task SetUp()
3636
{
3737
await base.SetUp();
3838

39-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
39+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
4040
return;
4141
}
4242

‎src/FirebirdSql.Data.FirebirdClient.Tests/FbTransactionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public async Task AbortTransaction()
111111
[Test]
112112
public async Task ReadCommittedReadConsistency()
113113
{
114-
if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
114+
if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
115115
return;
116116

117117
await using (var transaction = await Connection.BeginTransactionAsync(new FbTransactionOptions() { TransactionBehavior = FbTransactionBehavior.ReadConsistency }))

‎src/FirebirdSql.Data.TestsBase/FbTestsBase.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,20 @@ protected async Task<int> GetActiveConnections()
234234
}
235235
}
236236

237-
protected bool EnsureServerVersion(Version serverVersion)
237+
protected bool EnsureServerVersionAtLeast(Version serverVersion)
238238
{
239239
if (FbTestsSetup.ServerVersionAtLeast(ServerVersion, serverVersion))
240240
return true;
241241
Assert.Inconclusive("Not supported on this version.");
242242
return false;
243243
}
244+
protected bool EnsureServerVersionAtMost(Version serverVersion)
245+
{
246+
if (FbTestsSetup.ServerVersionAtMost(ServerVersion, serverVersion))
247+
return true;
248+
Assert.Inconclusive("Not supported on this version.");
249+
return false;
250+
}
244251

245252
protected bool EnsureServerType(FbServerType serverType)
246253
{

‎src/FirebirdSql.Data.TestsBase/FbTestsSetup.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public async Task TearDown()
7777
}
7878

7979
public static bool ServerVersionAtLeast(Version serverVersion, Version minimum) => serverVersion >= minimum;
80+
public static bool ServerVersionAtMost(Version serverVersion, Version maximum) => serverVersion < maximum;
8081

8182
private static async Task CreateTables(FbConnection connection, Version serverVersion)
8283
{

‎src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEnd/InsertTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class IdentityInsertEntity
8383
[Test]
8484
public async Task IdentityInsert()
8585
{
86-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
86+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
8787
return;
8888

8989
var id = ServerVersion >= new Version(4, 0, 0, 0) ? 26 : 27;
@@ -164,7 +164,7 @@ class DefaultValuesInsertEntity
164164
[Test]
165165
public async Task DefaultValuesInsert()
166166
{
167-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
167+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
168168
return;
169169

170170
var id = ServerVersion >= new Version(4, 0, 0, 0) ? 26 : 27;
@@ -211,7 +211,7 @@ class TwoComputedInsertEntity
211211
[Test]
212212
public async Task TwoComputedInsert()
213213
{
214-
if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
214+
if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
215215
return;
216216

217217
await using (var db = await GetDbContext<TwoComputedInsertContext>())

0 commit comments

Comments
 (0)