importing unit tests

Sources/Importing/BaseDataTransaction+Importing.swift

@@ -208,7 +208,7 @@ public extension BaseDataTransaction {
                 mapping = try cs_autoreleasepool { try preProcess(mapping: mapping) }
                 
                 var objects = Dictionary<T.UniqueIDType, T>()
-                for object in self.fetchAll(From(T), Where(T.uniqueIDKeyPath, isMemberOf: mapping.keys)) ?? [] {
+                for object in self.fetchAll(From(T), Where(T.uniqueIDKeyPath, isMemberOf: sortedIDs)) ?? [] {
                     
                     try cs_autoreleasepool {
                         

Sources/Internal/CoreStoreFetchedResultsController.swift

@@ -67,7 +67,7 @@ internal final class CoreStoreFetchedResultsController: NSFetchedResultsControll
             
             guard let from = (fetchRequest.entity.flatMap { $0.managedObjectClassName }).flatMap(NSClassFromString).flatMap(From.init) else {
                 
-                fatalError("Attempted to create an \(cs_typeName(NSFetchedResultsController)) without a \(cs_typeName(From)) clause or an \(cs_typeName(NSEntityDescription)).")
+                CoreStore.abort("Attempted to create an \(cs_typeName(NSFetchedResultsController)) without a \(cs_typeName(From)) clause or an \(cs_typeName(NSEntityDescription)).")
             }
             
             self.reapplyAffectedStores = { fetchRequest, context in

Sources/Internal/NSManagedObjectModel+Setup.swift

@@ -38,7 +38,7 @@ internal extension NSManagedObjectModel {
         
         guard let modelFilePath = bundle.pathForResource(modelName, ofType: "momd") else {
             
-            fatalError("Could not find \"\(modelName).momd\" from the bundle. \(bundle)")
+            CoreStore.abort("Could not find \"\(modelName).momd\" from the bundle. \(bundle)")
         }
         
         let modelFileURL = NSURL(fileURLWithPath: modelFilePath)
@@ -47,7 +47,7 @@ internal extension NSManagedObjectModel {
         guard let versionInfo = NSDictionary(contentsOfURL: versionInfoPlistURL),
             let versionHashes = versionInfo["NSManagedObjectModel_VersionHashes"] as? [String: AnyObject] else {
                 
-                fatalError("Could not load \(cs_typeName(NSManagedObjectModel)) metadata from path \"\(versionInfoPlistURL)\".")
+                CoreStore.abort("Could not load \(cs_typeName(NSManagedObjectModel)) metadata from path \"\(versionInfoPlistURL)\".")
         }
         
         let modelVersions = Set(versionHashes.keys)
@@ -77,7 +77,7 @@ internal extension NSManagedObjectModel {
         }
         else {
             
-            fatalError("No model files were found in URL \"\(modelFileURL)\".")
+            CoreStore.abort("No model files were found in URL \"\(modelFileURL)\".")
         }
         
         var modelVersionFileURL: NSURL?
@@ -106,7 +106,7 @@ internal extension NSManagedObjectModel {
                 return rootModel
         }
         
-        fatalError("Could not create an \(cs_typeName(NSManagedObjectModel)) from the model at URL \"\(modelFileURL)\".")
+        CoreStore.abort("Could not create an \(cs_typeName(NSManagedObjectModel)) from the model at URL \"\(modelFileURL)\".")
     }
     
     @nonobjc

Sources/Logging/CoreStore+Logging.swift

@@ -70,4 +70,16 @@ public extension CoreStore {
             functionName: functionName
         )
     }
+    
+    @noreturn
+    internal static func abort(message: String, fileName: StaticString = #file, lineNumber: Int = #line, functionName: StaticString = #function) {
+        
+        self.logger.abort(
+            message,
+            fileName: fileName,
+            lineNumber: lineNumber,
+            functionName: functionName
+        )
+        Swift.fatalError(message, file: fileName, line: UInt(lineNumber))
+    }
 }

Sources/Logging/CoreStoreLogger.swift

@@ -80,6 +80,17 @@ public protocol CoreStoreLogger {
      */
     func assert(@autoclosure condition: () -> Bool, @autoclosure message: () -> String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
     
+    /**
+     Handles fatal errors made throughout the `CoreStore` framework. The app wil terminate after this method is called.
+     - Important: Implementers may guarantee that the function doesn't return, either by calling another `@noreturn` function such as `fatalError()` or `abort()`, or by raising an exception. If the implementation does not terminate the app, CoreStore will call an internal `fatalError()` to do so.
+     
+     - parameter message: the fatal error message
+     - parameter fileName: the source file name
+     - parameter lineNumber: the source line number
+     - parameter functionName: the source function name
+     */
+    func abort(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    
     
     // MARK: Deprecated
     
@@ -100,4 +111,9 @@ extension CoreStoreLogger {
     
         self.log(error: error.bridgeToSwift, message: message, fileName: fileName, lineNumber: lineNumber, functionName: functionName)
     }
+    
+    public func abort(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        Swift.fatalError(message, file: fileName, line: UInt(lineNumber))
+    }
 }

Sources/Logging/DefaultLogger.swift

@@ -111,7 +111,22 @@ public final class DefaultLogger: CoreStoreLogger {
                 return
             }
             Swift.print("❗ [CoreStore: Assertion Failure] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message())\n")
-            Swift.fatalError()
+            Swift.fatalError(file: fileName, line: UInt(lineNumber))
         #endif
     }
+    
+    /**
+     Handles fatal errors made throughout the `CoreStore` framework.
+     - Important: This method should be marked `@noreturn` and implementers should guarantee that the function doesn't, either by calling another `@noreturn` function such as `fatalError()` or `abort()`, or by raising an exception.
+     
+     - parameter message: the fatal error message
+     - parameter fileName: the source file name
+     - parameter lineNumber: the source line number
+     - parameter functionName: the source function name
+     */
+    public func abort(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        Swift.print("❗ [CoreStore: Fatal Error] \((fileName.stringValue as NSString).lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
+        Swift.fatalError(file: fileName, line: UInt(lineNumber))
+    }
 }

Sources/Transactions/BaseDataTransaction.swift

@@ -76,10 +76,10 @@ public /*abstract*/ class BaseDataTransaction {
                 return object
                 
             case (nil, true):
-                fatalError("Attempted to create an entity of type \(cs_typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
+                CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
                 
             default:
-                fatalError("Attempted to create an entity of type \(cs_typeName(entityClass)), but a destination persistent store containing the entity type could not be found.")
+                CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)), but a destination persistent store containing the entity type could not be found.")
             }
         }
         else {
@@ -97,16 +97,16 @@ public /*abstract*/ class BaseDataTransaction {
                 return object
                 
             case (nil, true):
-                fatalError("Attempted to create an entity of type \(cs_typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
+                CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) with ambiguous destination persistent store, but the configuration name was not specified.")
                 
             default:
                 if let configuration = into.configuration {
                     
-                    fatalError("Attempted to create an entity of type \(cs_typeName(entityClass)) into the configuration \"\(configuration)\", which it doesn't belong to.")
+                    CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) into the configuration \"\(configuration)\", which it doesn't belong to.")
                 }
                 else {
                     
-                    fatalError("Attempted to create an entity of type \(cs_typeName(entityClass)) into the default configuration, which it doesn't belong to.")
+                    CoreStore.abort("Attempted to create an entity of type \(cs_typeName(entityClass)) into the default configuration, which it doesn't belong to.")
                 }
             }
         }