More regression versions

Author: DarkWanderer

.github/workflows/tests.yml

@@ -123,9 +123,15 @@ jobs:
         - 'yandex/clickhouse-server:20.3'
         - 'yandex/clickhouse-server:20.6'
         - 'yandex/clickhouse-server:20.9'
+        - 'yandex/clickhouse-server:20.12'
         - 'clickhouse/clickhouse-server:21.3'
+        - 'clickhouse/clickhouse-server:21.7'
         - 'clickhouse/clickhouse-server:21.9'
+        - 'clickhouse/clickhouse-server:21.12'
         - 'clickhouse/clickhouse-server:22.3'
+        - 'clickhouse/clickhouse-server:22.6'
+        - 'clickhouse/clickhouse-server:22.9'
+        - 'clickhouse/clickhouse-server:22.12'
     services:
       clickhouse:
         image: ${{ matrix.tag }}

ClickHouse.Client.Tests/Attributes/IgnoreInVersionAttribute.cs

@@ -0,0 +1,49 @@
+using System;
+using NUnit.Framework;
+using NUnit.Framework.Interfaces;
+using NUnit.Framework.Internal;
+
+namespace ClickHouse.Client.Tests.Attributes;
+
+/// <summary>
+/// Ignores test if launched on specific ClickHouse version
+/// </summary>
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = true, Inherited = false)]
+public class IgnoreInVersionAttribute : NUnitAttribute, IApplyToTest
+{
+    int major;
+    int minor;
+    int build;
+    int revision;
+
+    public IgnoreInVersionAttribute(int major, int minor = -1, int build = -1, int revision = -1)
+    {
+        this.major = major;
+        this.minor = minor;
+        this.build = build;
+        this.revision = revision;
+    }
+
+    public void ApplyToTest(Test test)
+    {
+        if (test.RunState == RunState.NotRunnable)
+            return;
+
+        var server = TestUtilities.ServerVersion;
+
+        if (server == null)
+            return; // 'latest' version
+
+        if (major != server.Major)
+            return;
+        if (minor != -1 && minor != server.Minor)
+            return;
+        if (build != -1 && minor != server.Minor)
+            return;
+        if (revision != -1 && revision != server.Revision)
+            return;
+
+        test.RunState = RunState.Ignored;
+        test.MakeTestResult().RecordAssertion(new AssertionResult(AssertionStatus.Inconclusive, $"Test ignored in ClickHouse version {server}", null));
+    }
+}

ClickHouse.Client.Tests/RequiredFeatureAttribute.cs renamed to ClickHouse.Client.Tests/Attributes/RequiredFeatureAttribute.cs

@@ -4,7 +4,7 @@
 using NUnit.Framework.Interfaces;
 using NUnit.Framework.Internal;
 
-namespace ClickHouse.Client.Tests;
+namespace ClickHouse.Client.Tests.Attributes;
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
 public class RequiredFeatureAttribute : NUnitAttribute, IApplyToTest
@@ -19,9 +19,7 @@ public RequiredFeatureAttribute(Feature feature)
     public void ApplyToTest(Test test)
     {
         if (test.RunState == RunState.NotRunnable)
-        {
             return;
-        }
 
         if (!TestUtilities.SupportedFeatures.HasFlag(feature))
         {

ClickHouse.Client.Tests/BulkCopyTests.cs

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using ClickHouse.Client.ADO;
 using ClickHouse.Client.Copy;
+using ClickHouse.Client.Tests.Attributes;
 using ClickHouse.Client.Utility;
 using NUnit.Framework;
 

ClickHouse.Client.Tests/DefaultSettingsTests.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ClickHouse.Client.ADO;
+using ClickHouse.Client.ADO;
 using NUnit.Framework;
 
 namespace ClickHouse.Client.Tests

ClickHouse.Client.Tests/IgnoreInVersionAttributeTests.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ClickHouse.Client.Tests.Attributes;
+using NUnit.Framework;
+
+namespace ClickHouse.Client.Tests;
+
+public class IgnoreInVersionAttributeTests : AbstractConnectionTestFixture
+{
+    [Test]
+    [IgnoreInVersion(21)]
+    public void ShouldNotRunInVersion21() => Assert.That(!connection.ServerVersion.StartsWith("21"));
+
+    [Test]
+    [IgnoreInVersion(22)]
+    public void ShouldNotRunInVersion22() => Assert.That(!connection.ServerVersion.StartsWith("22"));
+
+    [Test]
+    [IgnoreInVersion(21)]
+    [IgnoreInVersion(22)]
+    public void ShouldNotRunInVersion21or22()
+    {
+        Assert.That(!connection.ServerVersion.StartsWith("21"));
+        Assert.That(!connection.ServerVersion.StartsWith("22"));
+    }
+
+    [Test]
+    [IgnoreInVersion(22, 6)]
+    public void ShouldNotRunInVersion22dot6() => Assert.That(!connection.ServerVersion.StartsWith("22.6"));
+}

ClickHouse.Client.Tests/Numerics/ClickHouseDecimalTests.cs

@@ -7,6 +7,7 @@
 using ClickHouse.Client.ADO;
 using ClickHouse.Client.Numerics;
 using ClickHouse.Client.Utility;
+using ClickHouse.Client.Tests.Attributes;
 
 namespace ClickHouse.Client.Tests.Numerics;
 

ClickHouse.Client.Tests/Numerics/ClickHouseOldDecimalSqlTests.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using ClickHouse.Client.ADO;
-using ClickHouse.Client.Numerics;
 using ClickHouse.Client.Types;
 using ClickHouse.Client.Utility;
 using NUnit.Framework;

ClickHouse.Client.Tests/ParameterizedInsertTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using ClickHouse.Client.ADO;
+using ClickHouse.Client.Tests.Attributes;
 using ClickHouse.Client.Utility;
 using NUnit.Framework;
 

ClickHouse.Client.Tests/SessionConnectionTest.cs

@@ -2,14 +2,15 @@
 using System.Data.Common;
 using System.Threading.Tasks;
 using ClickHouse.Client.ADO;
+using ClickHouse.Client.Tests.Attributes;
 using ClickHouse.Client.Utility;
 using NUnit.Framework;
 
 namespace ClickHouse.Client.Tests;
 
 public class SessionConnectionTest
 {
-    private DbConnection CreateConnection(bool useSession, string sessionId = null)
+    private static DbConnection CreateConnection(bool useSession, string sessionId = null)
     {
         var builder = TestUtilities.GetConnectionStringBuilder();
         builder.UseSession = useSession;
@@ -37,7 +38,7 @@ public async Task TempTableShouldBeCreatedSuccessfullyIfSessionIdPassed()
     }
 
     [Test]
-    [Ignore("Broken in v23+")]
+    [Ignore("Broken in v23")]
     public async Task TempTableShouldFailIfSessionDisabled()
     {
         using var connection = CreateConnection(false);
@@ -52,7 +53,7 @@ public async Task TempTableShouldFailIfSessionDisabled()
     }
 
     [Test]
-    [Ignore("Broken in v23+")]
+    [Ignore("Broken in v23")]
     public async Task TempTableShouldFailIfSessionDisabledAndSessionIdPassed()
     {
         using var connection = CreateConnection(false, "ASD");