Merge pull request #1330 from NikolayJuly/fix-android-tests

nathanfallet · web-flow · commit eb9b2ee9d9b7 · 2025-08-30T08:23:16.000-07:00
Attempt to fix tests build for android
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build and test
 on: [push, pull_request]
 env:
   IOS_SIMULATOR: "iPhone 16"
-  IOS_VERSION: "18.0"
+  IOS_VERSION: "18.4"
 jobs:
   build:
     runs-on: macos-15
diff --git a/Tests/SQLiteTests/Core/ConnectionTests.swift b/Tests/SQLiteTests/Core/ConnectionTests.swift
@@ -374,7 +374,7 @@ class ConnectionTests: SQLiteTestCase {
     }
 
     // https://github.com/stephencelis/SQLite.swift/issues/1071
-    #if !os(Linux)
+    #if !(os(Linux) || os(Android))
     func test_createFunction_withArrayArguments() throws {
         db.createFunction("hello") { $0[0].map { "Hello, \($0)!" } }
 
diff --git a/Tests/SQLiteTests/Schema/SchemaDefinitionsTests.swift b/Tests/SQLiteTests/Schema/SchemaDefinitionsTests.swift
@@ -32,7 +32,7 @@ class ColumnDefinitionTests: XCTestCase {
                           defaultValue: .numericLiteral("123.123"), references: nil))
     ]
 
-    #if !os(Linux)
+    #if !(os(Linux) || os(Android))
     override class var defaultTestSuite: XCTestSuite {
         let suite = XCTestSuite(forTestCaseClass: ColumnDefinitionTests.self)
 
@@ -183,7 +183,7 @@ class IndexDefinitionTests: XCTestCase {
         "CREATE INDEX IF NOT EXISTS \"index_tests\" ON \"tests\" (\"test_column\")")
     ]
 
-    #if !os(Linux)
+    #if !(os(Linux) || os(Android))
     override class var defaultTestSuite: XCTestSuite {
         let suite = XCTestSuite(forTestCaseClass: IndexDefinitionTests.self)
 
diff --git a/Tests/SQLiteTests/Typed/CustomAggregationTests.swift b/Tests/SQLiteTests/Typed/CustomAggregationTests.swift
@@ -14,7 +14,7 @@ import SQLite3
 #endif
 
 // https://github.com/stephencelis/SQLite.swift/issues/1071
-#if !os(Linux)
+#if !(os(Linux) || os(Android))
 
 class CustomAggregationTests: SQLiteTestCase {
     override func setUpWithError() throws {
diff --git a/Tests/SQLiteTests/Typed/CustomFunctionsTests.swift b/Tests/SQLiteTests/Typed/CustomFunctionsTests.swift
@@ -2,7 +2,7 @@ import XCTest
 import SQLite
 
 // https://github.com/stephencelis/SQLite.swift/issues/1071
-#if !os(Linux)
+#if !(os(Linux) || os(Android))
 
 class CustomFunctionNoArgsTests: SQLiteTestCase {
     typealias FunctionNoOptional              = () -> SQLite.Expression<String>

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ class ConnectionTests: SQLiteTestCase {`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`// https://github.com/stephencelis/SQLite.swift/issues/1071`
`377`		`- #if !os(Linux)`
	`377`	`+ #if !(os(Linux) \|\| os(Android))`
`378`	`378`	`func test_createFunction_withArrayArguments() throws {`
`379`	`379`	`db.createFunction("hello") { $0[0].map { "Hello, \($0)!" } }`
`380`	`380`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ColumnDefinitionTests: XCTestCase {`
`32`	`32`	`defaultValue: .numericLiteral("123.123"), references: nil))`
`33`	`33`	`]`
`34`	`34`
`35`		`- #if !os(Linux)`
	`35`	`+ #if !(os(Linux) \|\| os(Android))`
`36`	`36`	`override class var defaultTestSuite: XCTestSuite {`
`37`	`37`	`let suite = XCTestSuite(forTestCaseClass: ColumnDefinitionTests.self)`
`38`	`38`
`@@ -183,7 +183,7 @@ class IndexDefinitionTests: XCTestCase {`
`183`	`183`	`"CREATE INDEX IF NOT EXISTS \"index_tests\" ON \"tests\" (\"test_column\")")`
`184`	`184`	`]`
`185`	`185`
`186`		`- #if !os(Linux)`
	`186`	`+ #if !(os(Linux) \|\| os(Android))`
`187`	`187`	`override class var defaultTestSuite: XCTestSuite {`
`188`	`188`	`let suite = XCTestSuite(forTestCaseClass: IndexDefinitionTests.self)`
`189`	`189`