Allow unit-testing in SPM builds

JohnEstropia · Aug 16, 2022 · 7f4cfaf · 7f4cfaf
1 parent da4ac19
commit 7f4cfaf
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/CoreStoreTests/BaseTestCase.swift b/CoreStoreTests/BaseTestCase.swift
@@ -28,6 +28,17 @@ import XCTest
 @testable
 import CoreStore
 
+#if !SWIFT_PACKAGE
+
+extension Bundle {
+
+    static var module: Bundle {
+        return Bundle(for: BaseTestCase.self)
+    }
+}
+
+#endif
+
 
 // MARK: - BaseTestCase
 
@@ -40,7 +51,7 @@ class BaseTestCase: XCTestCase {
 
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
 

diff --git a/CoreStoreTests/ErrorTests.swift b/CoreStoreTests/ErrorTests.swift
@@ -84,7 +84,7 @@ final class ErrorTests: XCTestCase {
         let schemaHistory = SchemaHistory(
             XcodeDataModelSchema.from(
                 modelName: "Model",
-                bundle: Bundle(for: Self.self)
+                bundle: Bundle.module
             )
         )
         let version = "1.0.0"

diff --git a/CoreStoreTests/SetupTests.swift b/CoreStoreTests/SetupTests.swift
@@ -42,7 +42,7 @@ class SetupTests: BaseTestDataTestCase {
             let schemaHistory = SchemaHistory(
                 XcodeDataModelSchema.from(
                     modelName: "Model",
-                    bundle: Bundle(for: Self.self)
+                    bundle: Bundle.module
                 )
             )
             let stack = DataStack(schemaHistory: schemaHistory)
@@ -68,7 +68,7 @@ class SetupTests: BaseTestDataTestCase {
 
                 DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: Self.self),
+                    bundle: Bundle.module,
                     migrationChain: migrationChain
                 )
             }
@@ -82,7 +82,7 @@ class SetupTests: BaseTestDataTestCase {
 
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
 
@@ -137,7 +137,7 @@ class SetupTests: BaseTestDataTestCase {
 
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
 
@@ -205,7 +205,7 @@ class SetupTests: BaseTestDataTestCase {
 
                 let stack = DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: Self.self)
+                    bundle: Bundle.module
                 )
                 try! stack.addStorageAndWait(sqliteStore)
                 self.prepareTestDataForStack(stack)
@@ -224,7 +224,7 @@ class SetupTests: BaseTestDataTestCase {
             let metadata = try createStore()
             let stack = DataStack(
                 xcodeModelName: "Model",
-                bundle: Bundle(for: Self.self)
+                bundle: Bundle.module
             )
             try sqliteStore.cs_eraseStorageAndWait(
                 metadata: metadata,
@@ -257,7 +257,7 @@ class SetupTests: BaseTestDataTestCase {
 
         let stack = DataStack(
             xcodeModelName: "Model",
-            bundle: Bundle(for: Self.self)
+            bundle: Bundle.module
         )
         do {
 
@@ -325,7 +325,7 @@ class SetupTests: BaseTestDataTestCase {
 
                 let stack = DataStack(
                     xcodeModelName: "Model",
-                    bundle: Bundle(for: Self.self)
+                    bundle: Bundle.module
                 )
                 try! stack.addStorageAndWait(
                     SQLiteStore.legacy(
@@ -351,7 +351,7 @@ class SetupTests: BaseTestDataTestCase {
             let metadata = try createStore()
             let stack = DataStack(
                 xcodeModelName: "Model",
-                bundle: Bundle(for: Self.self)
+                bundle: Bundle.module
             )
             try sqliteStore.cs_eraseStorageAndWait(
                 metadata: metadata,

diff --git a/CoreStoreTests/StorageInterfaceTests.swift b/CoreStoreTests/StorageInterfaceTests.swift
@@ -103,7 +103,7 @@ final class StorageInterfaceTests: XCTestCase {
             .appendingPathExtension("db")
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: Self.self)
+            mappingModelBundle: Bundle.module
         )
 
         let store = SQLiteStore(
@@ -131,7 +131,7 @@ final class StorageInterfaceTests: XCTestCase {
         let fileName = UUID().uuidString + ".db"
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: Self.self)
+            mappingModelBundle: Bundle.module
         )
         let store = SQLiteStore(
             fileName: fileName,
@@ -197,7 +197,7 @@ final class StorageInterfaceTests: XCTestCase {
         let fileName = UUID().uuidString + ".db"
         let mappingProvider = XcodeSchemaMappingProvider(
             from: "V1", to: "V2",
-            mappingModelBundle: Bundle(for: Self.self)
+            mappingModelBundle: Bundle.module
         )
         let store = SQLiteStore.legacy(
             fileName: fileName,

diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.5
+// swift-tools-version:5.7
 //
 //  Package.swift
 //  CoreStore
@@ -45,7 +45,10 @@ let package = Package(
         .testTarget(
             name: "CoreStoreTests",
             dependencies: ["CoreStore"],
-            path: "CoreStoreTests"
+            path: "CoreStoreTests",
+            resources: [
+              .process("Model.xcdatamodeld")
+            ]
         )
     ],
     swiftLanguageVersions: [.v5]