Add a new ManagedObjectContextFactory backed by persistent container

Author: crazytonyli

WordPress/Classes/Utility/ContainerContextFactory.swift

@@ -0,0 +1,37 @@
+import ObjectiveC
+
+@objc
+class ContainerContextFactory: NSObject, ManagedObjectContextFactory {
+
+    private let container: NSPersistentContainer
+
+    let mainContext: NSManagedObjectContext
+
+    required init(persistentContainer container: NSPersistentContainer) {
+        self.container = container
+        self.mainContext = container.viewContext
+        self.mainContext.automaticallyMergesChangesFromParent = true
+        self.mainContext.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
+    }
+
+    func newDerivedContext() -> NSManagedObjectContext {
+        let context = container.newBackgroundContext()
+        context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
+        return context
+    }
+
+    func save(_ context: NSManagedObjectContext, andWait wait: Bool, withCompletionBlock completionBlock: (() -> Void)?) {
+        let block: () -> Void = {
+            self.internalSave(context)
+            DispatchQueue.main.async {
+                completionBlock?()
+            }
+        }
+        if (wait) {
+            context.performAndWait(block)
+        } else {
+            context.perform(block)
+        }
+    }
+
+}

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -980,6 +980,8 @@
 		4A266B91282B13A70089CF3D /* CoreDataTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A266B90282B13A70089CF3D /* CoreDataTestCase.swift */; };
 		4A50667C28B3216500DD09F4 /* LegacyContextFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A50667B28B3216500DD09F4 /* LegacyContextFactory.m */; };
 		4A50667D28B3216500DD09F4 /* LegacyContextFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A50667B28B3216500DD09F4 /* LegacyContextFactory.m */; };
+		4A50668028B364CA00DD09F4 /* ContainerContextFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A50667F28B364CA00DD09F4 /* ContainerContextFactory.swift */; };
+		4A50668128B364CA00DD09F4 /* ContainerContextFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A50667F28B364CA00DD09F4 /* ContainerContextFactory.swift */; };
 		4AFB8FBF2824999500A2F4B2 /* ContextManagerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AFB8FBE2824999400A2F4B2 /* ContextManagerMock.swift */; };
 		4B2DD0F29CD6AC353C056D41 /* Pods_WordPressUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DCE7542239FBC709B90EA85 /* Pods_WordPressUITests.framework */; };
 		4C8A715EBCE7E73AEE216293 /* Pods_WordPressShareExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F47DB4A8EC2E6844E213A3FA /* Pods_WordPressShareExtension.framework */; };
@@ -5915,6 +5917,7 @@
 		4A50667A28B3216500DD09F4 /* LegacyContextFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LegacyContextFactory.h; sourceTree = "<group>"; };
 		4A50667B28B3216500DD09F4 /* LegacyContextFactory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LegacyContextFactory.m; sourceTree = "<group>"; };
 		4A50667E28B3218800DD09F4 /* ManagedObjectContextFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ManagedObjectContextFactory.h; sourceTree = "<group>"; };
+		4A50667F28B364CA00DD09F4 /* ContainerContextFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContainerContextFactory.swift; sourceTree = "<group>"; };
 		4AFB8FBE2824999400A2F4B2 /* ContextManagerMock.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContextManagerMock.swift; sourceTree = "<group>"; };
 		4D520D4E22972BC9002F5924 /* acknowledgements.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = acknowledgements.html; path = "../Pods/Target Support Files/Pods-Apps-WordPress/acknowledgements.html"; sourceTree = "<group>"; };
 		51A5F017948878F7E26979A0 /* Pods-Apps-WordPress.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Apps-WordPress.release.xcconfig"; path = "../Pods/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress.release.xcconfig"; sourceTree = "<group>"; };
@@ -13856,6 +13859,7 @@
 				4A50667E28B3218800DD09F4 /* ManagedObjectContextFactory.h */,
 				4A50667A28B3216500DD09F4 /* LegacyContextFactory.h */,
 				4A50667B28B3216500DD09F4 /* LegacyContextFactory.m */,
+				4A50667F28B364CA00DD09F4 /* ContainerContextFactory.swift */,
 				E1E5EE36231E47A80018E9E3 /* ContextManager+ErrorHandling.swift */,
 				B5ECA6C91DBAA0020062D7E0 /* CoreDataHelper.swift */,
 				24F3789725E6E62100A27BB7 /* NSManagedObject+Lookup.swift */,
@@ -19204,6 +19208,7 @@
 				17523381246C4F9200870B4A /* HomepageSettingsViewController.swift in Sources */,
 				E62CE58E26B1D14200C9D147 /* AccountService+Cookies.swift in Sources */,
 				C81CCD7F243BF7A600A83E27 /* TenorMediaGroup.swift in Sources */,
+				4A50668028B364CA00DD09F4 /* ContainerContextFactory.swift in Sources */,
 				B0F2EFBF259378E600C7EB6D /* SiteSuggestionService.swift in Sources */,
 				4388FF0020A4E19C00783948 /* NotificationsViewController+PushPrimer.swift in Sources */,
 				98517E5928220411001FFD45 /* BloggingPromptTableViewCell.swift in Sources */,
@@ -22238,6 +22243,7 @@
 				FABB25AE2602FC2C00C8785C /* SearchWrapperView.swift in Sources */,
 				98830A932747043B0061A87C /* BorderedButtonTableViewCell.swift in Sources */,
 				FABB25AF2602FC2C00C8785C /* UserSettings.swift in Sources */,
+				4A50668128B364CA00DD09F4 /* ContainerContextFactory.swift in Sources */,
 				FABB25B02602FC2C00C8785C /* MediaImportService.swift in Sources */,
 				FABB25B12602FC2C00C8785C /* NSAttributedStringKey+Conversion.swift in Sources */,
 				FABB25B22602FC2C00C8785C /* SelectPostViewController.swift in Sources */,

WordPress/WordPressTest/NotificationSyncMediatorTests.swift

@@ -56,9 +56,6 @@ class NotificationSyncMediatorTests: CoreDataTestCase {
         // Make sure the collection is empty, to begin with
         XCTAssert(mainContext.countObjects(ofType: Notification.self) == 0)
 
-        // CoreData Expectations
-        let contextSaved = expectation(forNotification: .NSManagedObjectContextDidSave, object: mainContext)
-
         // Mediator Expectations
         let expect = expectation(description: "Sync")
 
@@ -68,7 +65,7 @@ class NotificationSyncMediatorTests: CoreDataTestCase {
             expect.fulfill()
         }
 
-        wait(for: [contextSaved, expect], timeout: timeout)
+        wait(for: [expect], timeout: timeout)
     }
 
 
@@ -122,9 +119,6 @@ class NotificationSyncMediatorTests: CoreDataTestCase {
         // Make sure the collection is empty, to begin with
         XCTAssert(mainContext.countObjects(ofType: Notification.self) == 0)
 
-        // CoreData Expectations
-        let contextSaved = expectation(forNotification: .NSManagedObjectContextDidSave, object: mainContext)
-
         // Mediator Expectations
         let expect = expectation(description: "Sync")
 
@@ -135,7 +129,7 @@ class NotificationSyncMediatorTests: CoreDataTestCase {
             expect.fulfill()
         }
 
-        wait(for: [contextSaved, expect], timeout: timeout)
+        wait(for: [expect], timeout: timeout)
     }