Change test for FB5 (and refactoring).

cincuranet · cincuranet · commit 1a83f9c7a6e4 · 2022-08-16T10:24:55.000+02:00
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbBatchCommandTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbBatchCommandTests.cs
@@ -41,7 +41,7 @@ public override async Task SetUp()
 	{
 		await base.SetUp();
 
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 
 		_shouldTearDown = true;
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbBooleanSupportTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbBooleanSupportTests.cs
@@ -39,7 +39,7 @@ public override async Task SetUp()
 	{
 		await base.SetUp();
 
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		_shouldTearDown = true;
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbCommandTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbCommandTests.cs
@@ -485,6 +485,9 @@ public async Task ReadOnlyTransactionTest()
 	[Test]
 	public async Task ReturningClauseParameterTest()
 	{
+		if (!EnsureServerVersionAtMost(new Version(5, 0, 0, 0)))
+			return;
+
 		const int ColumnValue = 1234;
 		await using (var cmd = Connection.CreateCommand())
 		{
@@ -585,7 +588,7 @@ public async Task GetCommandPlanTest()
 	[Test]
 	public async Task GetCommandExplainedPlanTest()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		await using (var cmd = Connection.CreateCommand())
@@ -614,7 +617,7 @@ public async Task GetCommandPlanNoPlanTest()
 	[Test]
 	public async Task GetCommandExplainedPlanNoPlanTest()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		await using (var cmd = Connection.CreateCommand())
@@ -689,7 +692,7 @@ public async Task ExecuteNonQueryReturnsMinusOneOnNonInsertUpdateDelete()
 	[Test]
 	public async Task CommandCancellationDirectTest()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		await using (var cmd = Connection.CreateCommand())
@@ -711,7 +714,7 @@ async Task Execute()
 	[Test]
 	public async Task CommandCancellationCancellationTokenTest()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		using (var cts = new CancellationTokenSource())
@@ -736,7 +739,7 @@ async Task Execute(CancellationToken cancellationToken)
 	[Test]
 	public async Task CommandUsableAfterCancellationTest()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		using (var cts = new CancellationTokenSource())
@@ -776,7 +779,7 @@ async Task Execute(CancellationToken cancellationToken)
 	[Test]
 	public async Task ExecuteNonQueryOnAlreadyCancelledToken()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		using (var cts = new CancellationTokenSource())
@@ -819,7 +822,7 @@ public async Task PassTimeOnly()
 	[Test]
 	public async Task CommandTimeoutTest()
 	{
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 
 		await using (var cmd = Connection.CreateCommand())
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbConnectionTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbConnectionTests.cs
@@ -397,7 +397,7 @@ public async Task CreateDropDatabaseUsingTrustedAuth()
 	[TestCase(true)]
 	public async Task UseCompression(bool compression)
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 		if (!EnsureServerType(FbServerType.Default))
 			return;
@@ -424,7 +424,7 @@ public async Task UseCompression(bool compression)
 	[TestCase(FbWireCrypt.Required)]
 	public async Task UseWireCrypt(FbWireCrypt wireCrypt)
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 		if (!EnsureServerType(FbServerType.Default))
 			return;
@@ -495,7 +495,7 @@ public async Task DoNotGoBackToPoolAfterBroken()
 	[Test]
 	public async Task CaseSensitiveLogin()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		var csb = BuildConnectionStringBuilder(ServerType, Compression, WireCrypt);
@@ -622,7 +622,7 @@ public async Task ConnectionTimeoutUsingCancellationToken()
 	[Test]
 	public async Task SrpWithLeadingZeros()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		await using (var cmd = Connection.CreateCommand())
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbDataReaderTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbDataReaderTests.cs
@@ -457,7 +457,7 @@ public async Task DNET749_CommandBehaviorCloseConnectionStackOverflow()
 	[Test]
 	public async Task ReadCancellation()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		using (var cts = new CancellationTokenSource())
@@ -500,7 +500,7 @@ public async Task ReadCancellation()
 	[Test]
 	public async Task ReadOnAlreadyCancelledToken()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		using (var cts = new CancellationTokenSource())
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbDecFloat16SupportTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbDecFloat16SupportTests.cs
@@ -37,7 +37,7 @@ public override async Task SetUp()
 	{
 		await base.SetUp();
 
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 	}
 
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbDecFloat34SupportTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbDecFloat34SupportTests.cs
@@ -37,7 +37,7 @@ public override async Task SetUp()
 	{
 		await base.SetUp();
 
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 	}
 
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbInt128SupportTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbInt128SupportTests.cs
@@ -37,7 +37,7 @@ public override async Task SetUp()
 	{
 		await base.SetUp();
 
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 	}
 
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbLongNumericsSupportTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbLongNumericsSupportTests.cs
@@ -36,7 +36,7 @@ public override async Task SetUp()
 	{
 		await base.SetUp();
 
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 	}
 
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbServicesTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbServicesTests.cs
@@ -86,7 +86,7 @@ Task RestorePart()
 	[TestCase(false)]
 	public async Task StreamingBackupRestoreTest(bool verbose)
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		Task BackupPart(MemoryStream buffer)
@@ -194,7 +194,7 @@ public async Task ShutdownOnlineTest()
 	[Test]
 	public async Task ShutdownOnline2Test()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		var configurationSvc = new FbConfiguration();
@@ -273,7 +273,7 @@ public void ServerPropertiesTest()
 	[Test]
 	public async Task NBackupBackupRestoreTest()
 	{
-		if (!EnsureServerVersion(new Version(2, 5, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(2, 5, 0, 0)))
 			return;
 
 		const int Levels = 2;
@@ -352,7 +352,7 @@ async Task Stop()
 	[Test]
 	public async Task NoLingerTest()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		var configurationSvc = new FbConfiguration();
@@ -379,7 +379,7 @@ Task Test()
 	[Test]
 	public async Task Validation2Test()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		var validationSvc = new FbValidation2();
@@ -396,7 +396,7 @@ public async Task Validation2Test()
 	[Test]
 	public async Task NFixupTest()
 	{
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 
 		var deltaFile = Path.GetTempFileName();
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbTimeZonesSupportTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbTimeZonesSupportTests.cs
@@ -36,7 +36,7 @@ public override async Task SetUp()
 	{
 		await base.SetUp();
 
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 	}
 
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FbTransactionTests.cs b/src/FirebirdSql.Data.FirebirdClient.Tests/FbTransactionTests.cs
@@ -111,7 +111,7 @@ public async Task AbortTransaction()
 	[Test]
 	public async Task ReadCommittedReadConsistency()
 	{
-		if (!EnsureServerVersion(new Version(4, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))
 			return;
 
 		await using (var transaction = await Connection.BeginTransactionAsync(new FbTransactionOptions() { TransactionBehavior = FbTransactionBehavior.ReadConsistency }))
diff --git a/src/FirebirdSql.Data.TestsBase/FbTestsBase.cs b/src/FirebirdSql.Data.TestsBase/FbTestsBase.cs
@@ -234,13 +234,20 @@ protected async Task<int> GetActiveConnections()
 		}
 	}
 
-	protected bool EnsureServerVersion(Version serverVersion)
+	protected bool EnsureServerVersionAtLeast(Version serverVersion)
 	{
 		if (FbTestsSetup.ServerVersionAtLeast(ServerVersion, serverVersion))
 			return true;
 		Assert.Inconclusive("Not supported on this version.");
 		return false;
 	}
+	protected bool EnsureServerVersionAtMost(Version serverVersion)
+	{
+		if (FbTestsSetup.ServerVersionAtMost(ServerVersion, serverVersion))
+			return true;
+		Assert.Inconclusive("Not supported on this version.");
+		return false;
+	}
 
 	protected bool EnsureServerType(FbServerType serverType)
 	{
diff --git a/src/FirebirdSql.Data.TestsBase/FbTestsSetup.cs b/src/FirebirdSql.Data.TestsBase/FbTestsSetup.cs
@@ -77,6 +77,7 @@ public async Task TearDown()
 	}
 
 	public static bool ServerVersionAtLeast(Version serverVersion, Version minimum) => serverVersion >= minimum;
+	public static bool ServerVersionAtMost(Version serverVersion, Version maximum) => serverVersion < maximum;
 
 	private static async Task CreateTables(FbConnection connection, Version serverVersion)
 	{
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEnd/InsertTests.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/EndToEnd/InsertTests.cs
@@ -83,7 +83,7 @@ class IdentityInsertEntity
 	[Test]
 	public async Task IdentityInsert()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		var id = ServerVersion >= new Version(4, 0, 0, 0) ? 26 : 27;
@@ -164,7 +164,7 @@ class DefaultValuesInsertEntity
 	[Test]
 	public async Task DefaultValuesInsert()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		var id = ServerVersion >= new Version(4, 0, 0, 0) ? 26 : 27;
@@ -211,7 +211,7 @@ class TwoComputedInsertEntity
 	[Test]
 	public async Task TwoComputedInsert()
 	{
-		if (!EnsureServerVersion(new Version(3, 0, 0, 0)))
+		if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))
 			return;
 
 		await using (var db = await GetDbContext<TwoComputedInsertContext>())

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public override async Task SetUp()`
`41`	`41`	`{`
`42`	`42`	`await base.SetUp();`
`43`	`43`
`44`		`- if (!EnsureServerVersion(new Version(4, 0, 0, 0)))`
	`44`	`+ if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))`
`45`	`45`	`return;`
`46`	`46`
`47`	`47`	`_shouldTearDown = true;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public override async Task SetUp()`
`39`	`39`	`{`
`40`	`40`	`await base.SetUp();`
`41`	`41`
`42`		`- if (!EnsureServerVersion(new Version(3, 0, 0, 0)))`
	`42`	`+ if (!EnsureServerVersionAtLeast(new Version(3, 0, 0, 0)))`
`43`	`43`	`return;`
`44`	`44`
`45`	`45`	`_shouldTearDown = true;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public override async Task SetUp()`
`37`	`37`	`{`
`38`	`38`	`await base.SetUp();`
`39`	`39`
`40`		`- if (!EnsureServerVersion(new Version(4, 0, 0, 0)))`
	`40`	`+ if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))`
`41`	`41`	`return;`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public override async Task SetUp()`
`36`	`36`	`{`
`37`	`37`	`await base.SetUp();`
`38`	`38`
`39`		`- if (!EnsureServerVersion(new Version(4, 0, 0, 0)))`
	`39`	`+ if (!EnsureServerVersionAtLeast(new Version(4, 0, 0, 0)))`
`40`	`40`	`return;`
`41`	`41`	`}`
`42`	`42`