Skip to content

Commit 41ce378

Browse files
jberkeljberkel
committed
Move fixtures to more default Resources 
1 parent 96b014d commit 41ce378

File tree

10 files changed

+39
-30
lines changed

10 files changed

+39
-30
lines changed

‎Package.swift‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ let package = Package(
4040
"Info.plist"
4141
],
4242
resources: [
43-
.copy("fixtures/encrypted-3.x.sqlite"),
44-
.copy("fixtures/encrypted-4.x.sqlite"),
45-
.copy("fixtures/test.sqlite")
43+
.copy("Resources")
4644
]
4745
)
4846
]
@@ -56,10 +54,15 @@ package.targets = [
5654
dependencies: [.product(name: "CSQLite", package: "CSQLite")],
5755
exclude: ["Extensions/FTS4.swift", "Extensions/FTS5.swift"]
5856
),
59-
.testTarget(name: "SQLiteTests", dependencies: ["SQLite"], path: "Tests/SQLiteTests", exclude: [
60-
"FTSIntegrationTests.swift",
61-
"FTS4Tests.swift",
62-
"FTS5Tests.swift"
63-
])
57+
.testTarget(
58+
name: "SQLiteTests",
59+
dependencies: ["SQLite"],
60+
path: "Tests/SQLiteTests", exclude: [
61+
"FTSIntegrationTests.swift",
62+
"FTS4Tests.swift",
63+
"FTS5Tests.swift"
64+
],
65+
resources: [ .copy("Resources") ]
66+
)
6467
]
6568
#endif

‎SQLite.swift.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
3535
ss.library = 'sqlite3'
3636

3737
ss.test_spec 'tests' do |test_spec|
38-
test_spec.resources = 'Tests/SQLiteTests/fixtures/*'
38+
test_spec.resources = 'Tests/SQLiteTests/Resources/*'
3939
test_spec.source_files = 'Tests/SQLiteTests/*.swift'
4040
test_spec.ios.deployment_target = ios_deployment_target
4141
test_spec.tvos.deployment_target = tvos_deployment_target
@@ -55,7 +55,7 @@ Pod::Spec.new do |s|
5555
ss.dependency 'sqlite3'
5656

5757
ss.test_spec 'tests' do |test_spec|
58-
test_spec.resources = 'Tests/SQLiteTests/fixtures/*'
58+
test_spec.resources = 'Tests/SQLiteTests/Resources/*'
5959
test_spec.source_files = 'Tests/SQLiteTests/*.swift'
6060
test_spec.ios.deployment_target = ios_deployment_target
6161
test_spec.tvos.deployment_target = tvos_deployment_target
@@ -73,7 +73,7 @@ Pod::Spec.new do |s|
7373
ss.dependency 'SQLCipher', '>= 4.0.0'
7474

7575
ss.test_spec 'tests' do |test_spec|
76-
test_spec.resources = 'Tests/SQLiteTests/fixtures/*'
76+
test_spec.resources = 'Tests/SQLiteTests/Resources/*'
7777
test_spec.source_files = 'Tests/SQLiteTests/*.swift'
7878
test_spec.ios.deployment_target = ios_deployment_target
7979
test_spec.tvos.deployment_target = tvos_deployment_target

‎SQLite.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
19A17490543609FCED53CACC /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1710E73A46D5AC721CDA9 /* Errors.swift */; };
6969
19A174D78559CD30679BCCCB /* FTS5Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1721B8984686B9963B45D /* FTS5Tests.swift */; };
7070
19A1750CEE9B05267995CF3D /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
71-
19A175DFF47B84757E547C62 /* fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 19A17E2695737FAB5D6086E3 /* fixtures */; };
7271
19A176376CB6A94759F7980A /* Connection+Aggregation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A175A9CB446640AE6F2200 /* Connection+Aggregation.swift */; };
7372
19A176406BDE9D9C80CC9FA3 /* QueryIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17BA6B4E282C1315A115C /* QueryIntegrationTests.swift */; };
7473
19A1769C1F3A7542BECF50FF /* DateAndTimeFunctionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1729B75C33F9A0B9A89C1 /* DateAndTimeFunctionTests.swift */; };
@@ -92,10 +91,8 @@
9291
19A17E29278A12BC4F542506 /* DateAndTimeFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17BA55DABB480F9020C8A /* DateAndTimeFunctions.swift */; };
9392
19A17EC0D68BA8C03288ADF7 /* FTS5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1730E4390C775C25677D1 /* FTS5.swift */; };
9493
19A17F1B3F0A3C96B5ED6D64 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17E723300E5ED3771DCB5 /* Result.swift */; };
95-
19A17F3E1F7ACA33BD43E138 /* fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 19A17E2695737FAB5D6086E3 /* fixtures */; };
9694
19A17F60B685636D1F83C2DD /* Fixtures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A17B93B48B5560E6E51791 /* Fixtures.swift */; };
9795
19A17FB80B94E882050AA908 /* FoundationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1794CC4D7827E997E32A7 /* FoundationTests.swift */; };
98-
19A17FDA323BAFDEC627E76F /* fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 19A17E2695737FAB5D6086E3 /* fixtures */; };
9996
19A17FF4A10B44D3937C8CAC /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19A1710E73A46D5AC721CDA9 /* Errors.swift */; };
10097
3717F908221F5D8800B9BD3D /* CustomAggregationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3717F907221F5D7C00B9BD3D /* CustomAggregationTests.swift */; };
10198
3717F909221F5D8900B9BD3D /* CustomAggregationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3717F907221F5D7C00B9BD3D /* CustomAggregationTests.swift */; };
@@ -137,6 +134,9 @@
137134
3DF7B792288449BA005DD8CA /* URIQueryParameter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DF7B790288449BA005DD8CA /* URIQueryParameter.swift */; };
138135
3DF7B793288449BA005DD8CA /* URIQueryParameter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DF7B790288449BA005DD8CA /* URIQueryParameter.swift */; };
139136
3DF7B794288449BA005DD8CA /* URIQueryParameter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DF7B790288449BA005DD8CA /* URIQueryParameter.swift */; };
137+
3DF7B79628846FCC005DD8CA /* Resources in Resources */ = {isa = PBXBuildFile; fileRef = 3DF7B79528846FCC005DD8CA /* Resources */; };
138+
3DF7B79828846FED005DD8CA /* Resources in Resources */ = {isa = PBXBuildFile; fileRef = 3DF7B79528846FCC005DD8CA /* Resources */; };
139+
3DF7B79928847055005DD8CA /* Resources in Resources */ = {isa = PBXBuildFile; fileRef = 3DF7B79528846FCC005DD8CA /* Resources */; };
140140
49EB68C41F7B3CB400D89D40 /* Coding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49EB68C31F7B3CB400D89D40 /* Coding.swift */; };
141141
49EB68C51F7B3CB400D89D40 /* Coding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49EB68C31F7B3CB400D89D40 /* Coding.swift */; };
142142
49EB68C61F7B3CB400D89D40 /* Coding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49EB68C31F7B3CB400D89D40 /* Coding.swift */; };
@@ -267,7 +267,6 @@
267267
19A17B93B48B5560E6E51791 /* Fixtures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fixtures.swift; sourceTree = "<group>"; };
268268
19A17BA55DABB480F9020C8A /* DateAndTimeFunctions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DateAndTimeFunctions.swift; sourceTree = "<group>"; };
269269
19A17BA6B4E282C1315A115C /* QueryIntegrationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QueryIntegrationTests.swift; sourceTree = "<group>"; };
270-
19A17E2695737FAB5D6086E3 /* fixtures */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; path = fixtures; sourceTree = "<group>"; };
271270
19A17E723300E5ED3771DCB5 /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
272271
19A17EA3A313F129011B3FA0 /* Release.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = Release.md; sourceTree = "<group>"; };
273272
3717F907221F5D7C00B9BD3D /* CustomAggregationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAggregationTests.swift; sourceTree = "<group>"; };
@@ -277,6 +276,7 @@
277276
3DF7B78728842972005DD8CA /* Connection+Attach.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Connection+Attach.swift"; sourceTree = "<group>"; };
278277
3DF7B78C28842C23005DD8CA /* ResultTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultTests.swift; sourceTree = "<group>"; };
279278
3DF7B790288449BA005DD8CA /* URIQueryParameter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URIQueryParameter.swift; sourceTree = "<group>"; };
279+
3DF7B79528846FCC005DD8CA /* Resources */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Resources; sourceTree = "<group>"; };
280280
49EB68C31F7B3CB400D89D40 /* Coding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Coding.swift; sourceTree = "<group>"; };
281281
997DF2AD287FC06D00F8DF95 /* Query+with.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Query+with.swift"; sourceTree = "<group>"; };
282282
A121AC451CA35C79005A31D1 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -448,7 +448,7 @@
448448
EE247AE11C3F04ED00AE3E12 /* SQLiteTests */ = {
449449
isa = PBXGroup;
450450
children = (
451-
19A17E2695737FAB5D6086E3 /* fixtures */,
451+
3DF7B79528846FCC005DD8CA /* Resources */,
452452
EE247B1A1C3F137700AE3E12 /* AggregateFunctionsTests.swift */,
453453
EE247B1B1C3F137700AE3E12 /* BlobTests.swift */,
454454
EE247B1D1C3F137700AE3E12 /* ConnectionTests.swift */,
@@ -812,7 +812,7 @@
812812
isa = PBXResourcesBuildPhase;
813813
buildActionMask = 2147483647;
814814
files = (
815-
19A17F3E1F7ACA33BD43E138 /* fixtures in Resources */,
815+
3DF7B79828846FED005DD8CA /* Resources in Resources */,
816816
);
817817
runOnlyForDeploymentPostprocessing = 0;
818818
};
@@ -834,7 +834,7 @@
834834
isa = PBXResourcesBuildPhase;
835835
buildActionMask = 2147483647;
836836
files = (
837-
19A17FDA323BAFDEC627E76F /* fixtures in Resources */,
837+
3DF7B79628846FCC005DD8CA /* Resources in Resources */,
838838
);
839839
runOnlyForDeploymentPostprocessing = 0;
840840
};
@@ -849,7 +849,7 @@
849849
isa = PBXResourcesBuildPhase;
850850
buildActionMask = 2147483647;
851851
files = (
852-
19A175DFF47B84757E547C62 /* fixtures in Resources */,
852+
3DF7B79928847055005DD8CA /* Resources in Resources */,
853853
);
854854
runOnlyForDeploymentPostprocessing = 0;
855855
};

‎Sources/SQLite/Core/Connection.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public final class Connection {
104104
///
105105
/// - Returns: A new database connection.
106106
public init(_ location: Location = .inMemory, readonly: Bool = false) throws {
107-
let flags = readonly ? SQLITE_OPEN_READONLY : SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE
107+
let flags = readonly ? SQLITE_OPEN_READONLY : (SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE)
108108
try check(sqlite3_open_v2(location.description,
109109
&_handle,
110110
flags | SQLITE_OPEN_FULLMUTEX | SQLITE_OPEN_URI,

‎Tests/SQLiteTests/CipherTests.swift‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import SQLite
44
import SQLCipher
55

66
class CipherTests: XCTestCase {
7-
8-
let db1 = try Connection()
9-
let db2 = try Connection()
7+
var db1: Connection!
8+
var db2: Connection!
109

1110
override func setUpWithError() throws {
12-
// db
11+
db1 = try Connection()
12+
db2 = try Connection()
13+
// db1
1314

1415
try db1.key("hello")
1516

@@ -30,7 +31,7 @@ class CipherTests: XCTestCase {
3031
XCTAssertEqual(1, try db1.scalar("SELECT count(*) FROM foo") as? Int64)
3132
}
3233

33-
func test_key_blob_literal() {
34+
func test_key_blob_literal() throws {
3435
let db = try Connection()
3536
try db.key("x'2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99'")
3637
}
@@ -55,7 +56,7 @@ class CipherTests: XCTestCase {
5556
_ = try? FileManager.default.removeItem(atPath: path)
5657

5758
let connA = try Connection(path)
58-
defer { try FileManager.default.removeItem(atPath: path) }
59+
defer { try? FileManager.default.removeItem(atPath: path) }
5960

6061
try connA.key("hello")
6162
try connA.run("CREATE TABLE foo (bar TEXT)")
@@ -90,7 +91,7 @@ class CipherTests: XCTestCase {
9091

9192
defer {
9293
// ensure file can be cleaned up afterwards
93-
try FileManager.default.setAttributes([FileAttributeKey.immutable: 0], ofItemAtPath: encryptedFile)
94+
try? FileManager.default.setAttributes([FileAttributeKey.immutable: 0], ofItemAtPath: encryptedFile)
9495
}
9596

9697
let conn = try Connection(encryptedFile)

‎Tests/SQLiteTests/ConnectionTests.swift‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,17 @@ class ConnectionTests: SQLiteTestCase {
4747
XCTAssertEqual(url.lastPathComponent, "SQLite.swift Tests.sqlite3")
4848
}
4949

50-
func testLocationWithoutUriParameters() {
50+
func test_init_with_Uri_and_Parameters() throws {
51+
let testDb = fixture("test", withExtension: "sqlite")
52+
_ = try Connection(.uri(testDb, parameters: [.cache(.shared)]))
53+
}
54+
55+
func test_location_without_Uri_parameters() {
5156
let location: Connection.Location = .uri("foo")
5257
XCTAssertEqual(location.description, "foo")
5358
}
5459

55-
func testLocationWithUriParameters() {
60+
func test_location_with_Uri_parameters() {
5661
let location: Connection.Location = .uri("foo", parameters: [.mode(.readOnly), .cache(.private)])
5762
XCTAssertEqual(location.description, "file:foo?mode=ro&cache=private")
5863
}

‎Tests/SQLiteTests/Fixtures.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ func fixture(_ name: String, withExtension: String?) -> String {
77
let testBundle = Bundle(for: SQLiteTestCase.self)
88
#endif
99

10-
for resource in [name, "fixtures/\(name)"] {
10+
for resource in [name, "Resources/\(name)"] {
1111
if let url = testBundle.url(
1212
forResource: resource,
1313
withExtension: withExtension) {

Tests/SQLiteTests/fixtures/encrypted-3.x.sqlite renamed to Tests/SQLiteTests/Resources/encrypted-3.x.sqlite

File renamed without changes.

Tests/SQLiteTests/fixtures/encrypted-4.x.sqlite renamed to Tests/SQLiteTests/Resources/encrypted-4.x.sqlite

File renamed without changes.

Tests/SQLiteTests/fixtures/test.sqlite renamed to Tests/SQLiteTests/Resources/test.sqlite

File renamed without changes.

0 commit comments

Comments
 (0)