fix: add @unchecked Sendable to all test classes for Swift 6 compatibility

vkuttyp · Copilot · vkuttyp · commit 2bda17def7f3 · 2026-02-28T01:42:47.000+03:00
Swift 6 strict concurrency requires XCTestCase subclasses that capture self in @sendable closures to conform to Sendable. Mark all test classes as @unchecked Sendable (safe for test-only code). Also fix testSelectFloat() type-checker timeout by rewriting chained ?? as explicit if-let branches, and simplify CI matrix to Swift 6.0 only (Swift 5.9 toolchain not available for ubuntu-24.04 runners). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,11 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-15, ubuntu-24.04]
-        swift: ["5.9", "6.0"]
-        exclude:
-          # macOS 15 ships with Swift 6 (Xcode 16); skip redundant 5.10 run
-          - os: macos-15
-            swift: "5.10"
+        swift: ["6.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/Tests/MSSQLNioTests/MSSQLAdvancedFeatureTests.swift b/Tests/MSSQLNioTests/MSSQLAdvancedFeatureTests.swift
@@ -4,7 +4,7 @@ import SQLNioCore
 
 // ── Tests for TEXT/NTEXT/IMAGE, SQLDataTable, bulkInsert, checkReachability ──
 
-final class MSSQLAdvancedFeatureTests: XCTestCase {
+final class MSSQLAdvancedFeatureTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws {
         try skipUnlessIntegration()
diff --git a/Tests/MSSQLNioTests/MSSQLDataTypeTests.swift b/Tests/MSSQLNioTests/MSSQLDataTypeTests.swift
@@ -23,7 +23,7 @@ import SQLNioCore
 //   NVARCHAR (0xE7) → .string   VARCHAR  (0xA7) → .string
 //   UUID     (0x24) → .uuid
 
-final class MSSQLDataTypeTests: XCTestCase {
+final class MSSQLDataTypeTests: XCTestCase, @unchecked Sendable {
 
     // ── Helpers ──────────────────────────────────────────────────────────────
 
diff --git a/Tests/MSSQLNioTests/MSSQLErrorTests.swift b/Tests/MSSQLNioTests/MSSQLErrorTests.swift
@@ -4,7 +4,7 @@ import SQLNioCore
 
 // ── Error handling integration tests ─────────────────────────────────────────
 
-final class MSSQLErrorTests: XCTestCase {
+final class MSSQLErrorTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws {
         try skipUnlessIntegration()
diff --git a/Tests/MSSQLNioTests/MSSQLNewFeatureTests.swift b/Tests/MSSQLNioTests/MSSQLNewFeatureTests.swift
@@ -9,7 +9,7 @@ import SQLNioCore
 //   • Decimal precision (MONEY / DECIMAL / NUMERIC)
 //   • INFO/PRINT message surfacing
 
-final class MSSQLNewFeatureTests: XCTestCase {
+final class MSSQLNewFeatureTests: XCTestCase, @unchecked Sendable {
 
     // ── Decimal / MONEY precision ─────────────────────────────────────────────
 
diff --git a/Tests/MSSQLNioTests/MSSQLNioTests.swift b/Tests/MSSQLNioTests/MSSQLNioTests.swift
@@ -3,7 +3,7 @@ import NIOCore
 import NIOEmbedded
 @testable import MSSQLNio
 
-final class TDSPacketTests: XCTestCase {
+final class TDSPacketTests: XCTestCase, @unchecked Sendable {
 
     func testHeaderRoundtrip() throws {
         var allocator = ByteBufferAllocator()
@@ -45,7 +45,7 @@ final class TDSPacketTests: XCTestCase {
     }
 }
 
-final class TDSDecoderTests: XCTestCase {
+final class TDSDecoderTests: XCTestCase, @unchecked Sendable {
 
     func testDecodeColMetadata() throws {
         // Build a minimal COLMETADATA token
diff --git a/Tests/MSSQLNioTests/MSSQLQueryTests.swift b/Tests/MSSQLNioTests/MSSQLQueryTests.swift
@@ -4,7 +4,7 @@ import SQLNioCore
 
 // ── Query scenario integration tests ─────────────────────────────────────────
 
-final class MSSQLQueryTests: XCTestCase {
+final class MSSQLQueryTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws {
         try skipUnlessIntegration()
@@ -337,7 +337,7 @@ final class MSSQLQueryTests: XCTestCase {
 
 // MARK: - Backup & Restore Tests
 
-final class MSSQLBackupTests: XCTestCase {
+final class MSSQLBackupTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessIntegration() }
 
diff --git a/Tests/MSSQLNioTests/MSSQLStoredProcTests.swift b/Tests/MSSQLNioTests/MSSQLStoredProcTests.swift
@@ -4,7 +4,7 @@ import SQLNioCore
 
 // ── Stored procedure integration tests ───────────────────────────────────────
 
-final class MSSQLStoredProcTests: XCTestCase {
+final class MSSQLStoredProcTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws {
         try skipUnlessIntegration()
diff --git a/Tests/MSSQLNioTests/NTLMTests.swift b/Tests/MSSQLNioTests/NTLMTests.swift
@@ -15,7 +15,7 @@ import XCTest
 //   MSSQL_NTLM_HOST=winserver MSSQL_NTLM_USER=testuser MSSQL_NTLM_PASS=secret
 //   MSSQL_NTLM_DOMAIN=CONTOSO swift test --filter NTLMTests.testNTLMConnection
 
-final class NTLMTests: XCTestCase {
+final class NTLMTests: XCTestCase, @unchecked Sendable {
 
     // MARK: - MD4 tests (RFC 1320 §A.5 test vectors)
 
diff --git a/Tests/MSSQLNioTests/SQLClientCompatTests.swift b/Tests/MSSQLNioTests/SQLClientCompatTests.swift
@@ -14,7 +14,7 @@ import SQLNioCore
 
 // MARK: - Basic Query Tests
 
-final class SQLClientCompatBasicTests: XCTestCase {
+final class SQLClientCompatBasicTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessIntegration() }
 
@@ -237,7 +237,7 @@ final class SQLClientCompatBasicTests: XCTestCase {
 
 // MARK: - Transaction Tests
 
-final class SQLClientCompatTransactionTests: XCTestCase {
+final class SQLClientCompatTransactionTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessIntegration() }
 
@@ -298,7 +298,7 @@ final class SQLClientCompatTransactionTests: XCTestCase {
 
 // MARK: - Stored Procedure / RPC Tests
 
-final class SQLClientCompatProcTests: XCTestCase {
+final class SQLClientCompatProcTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessIntegration() }
 
@@ -447,7 +447,7 @@ final class SQLClientCompatProcTests: XCTestCase {
 
 // MARK: - Bulk Insert Tests
 
-final class SQLClientCompatBulkTests: XCTestCase {
+final class SQLClientCompatBulkTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessIntegration() }
 
@@ -503,7 +503,7 @@ final class SQLClientCompatBulkTests: XCTestCase {
 
 // MARK: - Connection Pool Tests
 
-final class SQLClientCompatPoolTests: XCTestCase {
+final class SQLClientCompatPoolTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessIntegration() }
 
diff --git a/Tests/MySQLNioTests/MySQLIntegrationTests.swift b/Tests/MySQLNioTests/MySQLIntegrationTests.swift
@@ -86,7 +86,7 @@ private extension SQLValue {
 
 // MARK: - Connection Tests
 
-final class MySQLConnectionTests: XCTestCase {
+final class MySQLConnectionTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -135,7 +135,7 @@ final class MySQLConnectionTests: XCTestCase {
 
 // MARK: - Basic Query Tests
 
-final class MySQLBasicQueryTests: XCTestCase {
+final class MySQLBasicQueryTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -199,11 +199,12 @@ final class MySQLBasicQueryTests: XCTestCase {
             try await MySQLTestDatabase.withConnection { conn in
                 let rows = try await conn.query("SELECT 3.14 AS pi", [])
                 let piVal = rows[0]["pi"]
-                let pi = piVal.asDouble()
-                    ?? piVal.asFloat().map { Double($0) }
-                    ?? piVal.asDecimal().map { NSDecimalNumber(decimal: $0).doubleValue }
-                    ?? piVal.asString().flatMap { Double($0) }
-                    ?? 0
+                let pi: Double
+                if let d = piVal.asDouble() { pi = d }
+                else if let f = piVal.asFloat() { pi = Double(f) }
+                else if let dec = piVal.asDecimal() { pi = NSDecimalNumber(decimal: dec).doubleValue }
+                else if let s = piVal.asString(), let d = Double(s) { pi = d }
+                else { pi = 0 }
                 XCTAssertEqual(pi, 3.14, accuracy: 0.01)
             }
         }
@@ -258,7 +259,7 @@ final class MySQLBasicQueryTests: XCTestCase {
 
 // MARK: - Parameterized Query Tests
 
-final class MySQLParameterizedTests: XCTestCase {
+final class MySQLParameterizedTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -327,7 +328,7 @@ final class MySQLParameterizedTests: XCTestCase {
 
 // MARK: - Data Type Tests
 
-final class MySQLDataTypeTests: XCTestCase {
+final class MySQLDataTypeTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -486,7 +487,7 @@ final class MySQLDataTypeTests: XCTestCase {
 
 // MARK: - Table Query Tests
 
-final class MySQLTableQueryTests: XCTestCase {
+final class MySQLTableQueryTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -626,7 +627,7 @@ final class MySQLTableQueryTests: XCTestCase {
 
 // MARK: - DML Tests (INSERT / UPDATE / DELETE)
 
-final class MySQLDMLTests: XCTestCase {
+final class MySQLDMLTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -746,7 +747,7 @@ final class MySQLDMLTests: XCTestCase {
 
 // MARK: - Transaction Tests (raw SQL)
 
-final class MySQLTransactionTests: XCTestCase {
+final class MySQLTransactionTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -809,7 +810,7 @@ final class MySQLTransactionTests: XCTestCase {
 
 // MARK: - Error Handling Tests
 
-final class MySQLErrorTests: XCTestCase {
+final class MySQLErrorTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -883,7 +884,7 @@ final class MySQLErrorTests: XCTestCase {
 
 // MARK: - Stored Procedure Tests
 
-final class MySQLProcedureTests: XCTestCase {
+final class MySQLProcedureTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -967,7 +968,7 @@ final class MySQLProcedureTests: XCTestCase {
 
 // MARK: - Decodable Tests
 
-final class MySQLDecodableTests: XCTestCase {
+final class MySQLDecodableTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -1012,7 +1013,7 @@ final class MySQLDecodableTests: XCTestCase {
 
 // MARK: - Concurrent Query Tests
 
-final class MySQLConcurrencyTests: XCTestCase {
+final class MySQLConcurrencyTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -1051,7 +1052,7 @@ final class MySQLConcurrencyTests: XCTestCase {
 
 // MARK: - Advanced Query Tests
 
-final class MySQLAdvancedQueryTests: XCTestCase {
+final class MySQLAdvancedQueryTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -1154,7 +1155,7 @@ final class MySQLAdvancedQueryTests: XCTestCase {
 
 // MARK: - Transaction API Tests
 
-final class MySQLTransactionAPITests: XCTestCase {
+final class MySQLTransactionAPITests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -1227,7 +1228,7 @@ final class MySQLTransactionAPITests: XCTestCase {
 
 // MARK: - Multiple Result Sets Tests
 
-final class MySQLQueryMultiTests: XCTestCase {
+final class MySQLQueryMultiTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -1385,7 +1386,7 @@ final class MySQLPoolTests: XCTestCase, @unchecked Sendable {
 
 // MARK: - Bulk Insert Tests
 
-final class MySQLBulkInsertTests: XCTestCase {
+final class MySQLBulkInsertTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -1443,7 +1444,7 @@ final class MySQLBulkInsertTests: XCTestCase {
 
 // MARK: - DataTable Tests
 
-final class MySQLDataTableTests: XCTestCase {
+final class MySQLDataTableTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws { try skipUnlessMySQL() }
 
@@ -1476,7 +1477,7 @@ final class MySQLDataTableTests: XCTestCase {
 
 // MARK: - Backup & Restore Tests
 
-final class MySQLBackupTests: XCTestCase {
+final class MySQLBackupTests: XCTestCase, @unchecked Sendable {
 
     override func setUp() async throws {
         try XCTSkipUnless(MySQLTestDatabase.isAvailable,
diff --git a/Tests/MySQLNioTests/MySQLNioTests.swift b/Tests/MySQLNioTests/MySQLNioTests.swift
@@ -2,7 +2,7 @@ import XCTest
 import NIOCore
 @testable import MySQLNio
 
-final class MySQLFramingTests: XCTestCase {
+final class MySQLFramingTests: XCTestCase, @unchecked Sendable {
 
     func testPacketBuildAndRead() {
         let allocator = ByteBufferAllocator()
@@ -36,7 +36,7 @@ final class MySQLFramingTests: XCTestCase {
     }
 }
 
-final class MySQLDecoderTests: XCTestCase {
+final class MySQLDecoderTests: XCTestCase, @unchecked Sendable {
 
     func testNativePasswordHash() {
         // The hash should be 20 bytes
diff --git a/Tests/PostgresNioTests/PostgresIntegrationTests.swift b/Tests/PostgresNioTests/PostgresIntegrationTests.swift
diff --git a/Tests/PostgresNioTests/PostgresNioTests.swift b/Tests/PostgresNioTests/PostgresNioTests.swift
diff --git a/Tests/SQLNioCoreTests/SQLNioCoreTests.swift b/Tests/SQLNioCoreTests/SQLNioCoreTests.swift
diff --git a/Tests/SQLiteNioTests/SQLiteNioTests.swift b/Tests/SQLiteNioTests/SQLiteNioTests.swift

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import NIOCore`
`3`	`3`	`import NIOEmbedded`
`4`	`4`	`@testable import MSSQLNio`
`5`	`5`
`6`		`-final class TDSPacketTests: XCTestCase {`
	`6`	`+final class TDSPacketTests: XCTestCase, @unchecked Sendable {`
`7`	`7`
`8`	`8`	`func testHeaderRoundtrip() throws {`
`9`	`9`	`var allocator = ByteBufferAllocator()`
`@@ -45,7 +45,7 @@ final class TDSPacketTests: XCTestCase {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`-final class TDSDecoderTests: XCTestCase {`
	`48`	`+final class TDSDecoderTests: XCTestCase, @unchecked Sendable {`
`49`	`49`
`50`	`50`	`func testDecodeColMetadata() throws {`
`51`	`51`	`// Build a minimal COLMETADATA token`