Remove some more unnecessary conditional imports

Author: marcprux

Tests/GRDBTests/DatabaseAggregateTests.swift

@@ -382,9 +382,11 @@ class DatabaseAggregateTests: GRDBTestCase {
                 XCTFail("Expected DatabaseError")
             } catch let error as DatabaseError {
                 XCTAssertEqual(error.resultCode, .SQLITE_ERROR)
+                #if canImport(ObjectiveC) // non-Darwin platforms bridge NSError differently and do not set the message the same
                 XCTAssertTrue(error.message!.contains("CustomErrorDomain"))
                 XCTAssertTrue(error.message!.contains("123"))
                 XCTAssertTrue(error.message!.contains("custom error message"))
+                #endif
             }
         }
     }
@@ -470,9 +472,11 @@ class DatabaseAggregateTests: GRDBTestCase {
                 XCTFail("Expected DatabaseError")
             } catch let error as DatabaseError {
                 XCTAssertEqual(error.resultCode, .SQLITE_ERROR)
+                #if canImport(ObjectiveC) // non-Darwin platforms bridge NSError differently and do not set the message the same
                 XCTAssertTrue(error.message!.contains("CustomErrorDomain"))
                 XCTAssertTrue(error.message!.contains("123"))
                 XCTAssertTrue(error.message!.contains("custom error message"))
+                #endif
             }
         }
     }

Tests/GRDBTests/DatabaseErrorTests.swift

@@ -216,6 +216,9 @@ class DatabaseErrorTests: GRDBTestCase {
     }
 
     func testNSErrorBridging() throws {
+        #if !canImport(ObjectiveC)
+        throw XCTSkip("NSError bridging works differently on non-Darwin platforms")
+        #else
         let dbQueue = try makeDatabaseQueue()
         try dbQueue.inDatabase { db in
             try db.create(table: "parents") { $0.column("id", .integer).primaryKey() }
@@ -229,5 +232,6 @@ class DatabaseErrorTests: GRDBTestCase {
                 XCTAssertNotNil(error.localizedFailureReason)
             }
         }
+        #endif
     }
 }

Tests/GRDBTests/DatabaseFunctionTests.swift

@@ -336,9 +336,11 @@ class DatabaseFunctionTests: GRDBTestCase {
                 XCTFail("Expected DatabaseError")
             } catch let error as DatabaseError {
                 XCTAssertEqual(error.resultCode, .SQLITE_ERROR)
+                #if canImport(ObjectiveC) // non-Darwin platforms bridge NSError differently and do not set the message the same
                 XCTAssertTrue(error.message!.contains("CustomErrorDomain"))
                 XCTAssertTrue(error.message!.contains("123"))
                 XCTAssertTrue(error.message!.contains("custom error message"))
+                #endif
             }
         }
     }

Tests/GRDBTests/QueryInterfaceExpressionsTests.swift

@@ -1,8 +1,5 @@
 import XCTest
 @testable import GRDB
-#if GRDBCIPHER
-import SQLCipher
-#endif
 
 private struct Col {
     static let id = Column("id")

Tests/GRDBTests/SingletonRecordTest.swift

@@ -1,8 +1,5 @@
 import XCTest
 import GRDB
-#if GRDBCIPHER
-import SQLCipher
-#endif
 
 private struct AppConfiguration: Codable {
     // Support for the single row guarantee

Tests/GRDBTests/TableRecordDeleteTests.swift

@@ -1,8 +1,5 @@
 import XCTest
 import GRDB
-#if GRDBCIPHER
-import SQLCipher
-#endif
 
 private struct Hacker : TableRecord {
     static let databaseTableName = "hackers"

Tests/GRDBTests/TableRecordUpdateTests.swift

@@ -1,8 +1,5 @@
 import XCTest
 import GRDB
-#if GRDBCIPHER
-import SQLCipher
-#endif
 
 private struct Player: Codable, PersistableRecord, FetchableRecord, Hashable {
     var id: Int64