starred/CoreStore
1
0
Fork 0
mirror of https://github.com/JohnEstropia/CoreStore.git synced 2026-03-30 14:21:49 +02:00
Code Issues 95 Packages Projects Releases 10 Wiki Activity

Merge branch 'prototype/mainContextToPSC' into corestore4_develop

Browse Source
This commit is contained in:
John Estropia
2017-03-27 14:08:07 +09:00
parent 818abfc1a1 7ee027f44d
commit b97f6d6a0a
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreStoreTests/FetchTests.swift
View File

@@ -394,7 +394,7 @@ final class FetchTests: BaseTestDataTestCase {
] ]
let object = stack.fetchOne(from, fetchClauses) let object = stack.fetchOne(from, fetchClauses)
XCTAssertNotNil(object) XCTAssertNotNil(object)
XCTAssertEqual(object?.testNumber, 3) // configuration XCTAssertEqual(object?.testNumber, 3) // configuration ambiguous
let objectID = stack.fetchObjectID(from, fetchClauses) let objectID = stack.fetchObjectID(from, fetchClauses)
XCTAssertNotNil(objectID) XCTAssertNotNil(objectID)

3
CoreStoreTests/SetupTests.swift
View File

@@ -44,7 +44,8 @@ class SetupTests: BaseTestDataTestCase {
XCTAssertNil(stack.rootSavingContext.parent) XCTAssertNil(stack.rootSavingContext.parent)
XCTAssertFalse(stack.rootSavingContext.isDataStackContext) XCTAssertFalse(stack.rootSavingContext.isDataStackContext)
XCTAssertFalse(stack.rootSavingContext.isTransactionContext) XCTAssertFalse(stack.rootSavingContext.isTransactionContext)
XCTAssertEqual(stack.mainContext.parent, stack.rootSavingContext) XCTAssertNil(stack.mainContext.parent)
XCTAssertEqual(stack.mainContext.persistentStoreCoordinator, stack.coordinator)
XCTAssertTrue(stack.mainContext.isDataStackContext) XCTAssertTrue(stack.mainContext.isDataStackContext)
XCTAssertFalse(stack.mainContext.isTransactionContext) XCTAssertFalse(stack.mainContext.isTransactionContext)
XCTAssertEqual(stack.model, model) XCTAssertEqual(stack.model, model)

2
Sources/Internal/NSManagedObjectContext+Setup.swift
View File

@@ -99,7 +99,7 @@ internal extension NSManagedObjectContext {
internal static func mainContextForRootContext(_ rootContext: NSManagedObjectContext) -> NSManagedObjectContext { internal static func mainContextForRootContext(_ rootContext: NSManagedObjectContext) -> NSManagedObjectContext {
let context = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType) let context = NSManagedObjectContext(concurrencyType: .mainQueueConcurrencyType)
context.parent = rootContext context.persistentStoreCoordinator = rootContext.persistentStoreCoordinator!
context.mergePolicy = NSRollbackMergePolicy context.mergePolicy = NSRollbackMergePolicy
context.undoManager = nil context.undoManager = nil
context.setupForCoreStoreWithContextName("com.corestore.maincontext") context.setupForCoreStoreWithContextName("com.corestore.maincontext")

1
Sources/Setup/DataStack.swift
View File

@@ -74,6 +74,7 @@ public final class DataStack: Equatable {
self.migrationChain = migrationChain self.migrationChain = migrationChain
self.rootSavingContext.parentStack = self self.rootSavingContext.parentStack = self
self.mainContext.parentStack = self
self.mainContext.isDataStackContext = true self.mainContext.isDataStackContext = true
} }