Extract models creation logic from CoreDataStack doubles (#18478)

mokagio · web-flow · commit d51d3f7d864e · 2022-05-04T14:10:43.000+10:00
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -924,6 +924,7 @@
 		46F584B82624E6380010A723 /* BlockEditorSettings+GutenbergEditorSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46F584B72624E6380010A723 /* BlockEditorSettings+GutenbergEditorSettings.swift */; };
 		46F584B92624E6380010A723 /* BlockEditorSettings+GutenbergEditorSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46F584B72624E6380010A723 /* BlockEditorSettings+GutenbergEditorSettings.swift */; };
 		46F58501262605930010A723 /* BlockEditorSettingsServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46F58500262605930010A723 /* BlockEditorSettingsServiceTests.swift */; };
+		4A17C1A4281A823E0001FFE5 /* NSManagedObject+Fixture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A17C1A3281A823E0001FFE5 /* NSManagedObject+Fixture.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 */; };
 		4D520D4F22972BC9002F5924 /* acknowledgements.html in Resources */ = {isa = PBXBuildFile; fileRef = 4D520D4E22972BC9002F5924 /* acknowledgements.html */; };
@@ -983,7 +984,7 @@
 		598DD1711B97985700146967 /* ThemeBrowserCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 598DD1701B97985700146967 /* ThemeBrowserCell.swift */; };
 		59A3CADD1CD2FF0C009BFA1B /* BasePageListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 59A3CADC1CD2FF0C009BFA1B /* BasePageListCell.m */; };
 		59A9AB351B4C33A500A433DC /* ThemeService.m in Sources */ = {isa = PBXBuildFile; fileRef = 59A9AB341B4C33A500A433DC /* ThemeService.m */; };
-		59B48B621B99E132008EBB84 /* JSONLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59B48B611B99E132008EBB84 /* JSONLoader.swift */; };
+		59B48B621B99E132008EBB84 /* JSONObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59B48B611B99E132008EBB84 /* JSONObject.swift */; };
 		59DCA5211CC68AF3000F245F /* PageListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59DCA5201CC68AF3000F245F /* PageListViewController.swift */; };
 		59DD94341AC479ED0032DD6B /* WPLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = 59DD94331AC479ED0032DD6B /* WPLogger.m */; };
 		59E1D46E1CEF77B500126697 /* Page.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59E1D46C1CEF77B500126697 /* Page.swift */; };
@@ -5692,6 +5693,7 @@
 		46F584B72624E6380010A723 /* BlockEditorSettings+GutenbergEditorSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "BlockEditorSettings+GutenbergEditorSettings.swift"; sourceTree = "<group>"; };
 		46F58500262605930010A723 /* BlockEditorSettingsServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockEditorSettingsServiceTests.swift; sourceTree = "<group>"; };
 		46F84612185A8B7E009D0DA5 /* PostContentProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostContentProvider.h; sourceTree = "<group>"; };
+		4A17C1A3281A823E0001FFE5 /* NSManagedObject+Fixture.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Fixture.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>"; };
 		528B9926294302CD0A4EB5C4 /* Pods-WordPressScreenshotGeneration.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressScreenshotGeneration.release-alpha.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressScreenshotGeneration/Pods-WordPressScreenshotGeneration.release-alpha.xcconfig"; sourceTree = "<group>"; };
@@ -5763,7 +5765,7 @@
 		59A9AB331B4C33A500A433DC /* ThemeService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThemeService.h; sourceTree = "<group>"; };
 		59A9AB341B4C33A500A433DC /* ThemeService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThemeService.m; sourceTree = "<group>"; };
 		59A9AB391B4C3ECD00A433DC /* LocalCoreDataServiceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocalCoreDataServiceTests.m; sourceTree = "<group>"; };
-		59B48B611B99E132008EBB84 /* JSONLoader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JSONLoader.swift; path = TestUtilities/JSONLoader.swift; sourceTree = "<group>"; };
+		59B48B611B99E132008EBB84 /* JSONObject.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = JSONObject.swift; path = TestUtilities/JSONObject.swift; sourceTree = "<group>"; };
 		59DCA5201CC68AF3000F245F /* PageListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PageListViewController.swift; sourceTree = "<group>"; };
 		59DD94321AC479ED0032DD6B /* WPLogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPLogger.h; sourceTree = "<group>"; };
 		59DD94331AC479ED0032DD6B /* WPLogger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPLogger.m; sourceTree = "<group>"; };
@@ -10270,7 +10272,7 @@
 		59B48B601B99E0B0008EBB84 /* TestUtilities */ = {
 			isa = PBXGroup;
 			children = (
-				59B48B611B99E132008EBB84 /* JSONLoader.swift */,
+				59B48B611B99E132008EBB84 /* JSONObject.swift */,
 				E157D5DF1C690A6C00F04FB9 /* ImmuTableTestUtils.swift */,
 				570BFD8F2282418A007859A8 /* PostBuilder.swift */,
 				57B71D4D230DB5F200789A68 /* BlogBuilder.swift */,
@@ -14171,6 +14173,7 @@
 			children = (
 				E180BD4D1FB4681E00D0D781 /* MockCookieJar.swift */,
 				E1B642121EFA5113001DC6D7 /* ModelTestHelper.swift */,
+				4A17C1A3281A823E0001FFE5 /* NSManagedObject+Fixture.swift */,
 				93E9050519E6F3D8005513C9 /* ContextManagerMock.h */,
 				93E9050619E6F3D8005513C9 /* ContextManagerMock.m */,
 				8BD6E34B24775164009AE97C /* TestContextManager.h */,
@@ -19769,7 +19772,7 @@
 				175CC17527205BFB00622FB4 /* DomainExpiryDateFormatterTests.swift in Sources */,
 				B5416CFE1C1756B900006DD8 /* PushNotificationsManagerTests.m in Sources */,
 				321955C124BE4EBF00E3F316 /* ReaderSelectInterestsCoordinatorTests.swift in Sources */,
-				59B48B621B99E132008EBB84 /* JSONLoader.swift in Sources */,
+				59B48B621B99E132008EBB84 /* JSONObject.swift in Sources */,
 				3F82310F24564A870086E9B8 /* ReaderTabViewTests.swift in Sources */,
 				C3E42AB027F4D30E00546706 /* MenuItemsViewControllerTests.swift in Sources */,
 				D842EA4021FABB1800210E96 /* SiteSegmentTests.swift in Sources */,
@@ -19884,6 +19887,7 @@
 				8B749E9025AF8D2E00023F03 /* JetpackCapabilitiesServiceTests.swift in Sources */,
 				F1450CF72437E8F800A28BFE /* MediaHostTests.swift in Sources */,
 				436D55F02115CB6800CEAA33 /* RegisterDomainDetailsSectionTests.swift in Sources */,
+				4A17C1A4281A823E0001FFE5 /* NSManagedObject+Fixture.swift in Sources */,
 				E1B921BC1C0ED5A3003EA3CB /* MediaSizeSliderCellTest.swift in Sources */,
 				C314543B262770BE005B216B /* BlogServiceAuthorTests.swift in Sources */,
 				40F50B80221310D400CBBB73 /* FollowersStatsRecordValueTests.swift in Sources */,
diff --git a/WordPress/WordPressTest/ActivityContentFactoryTests.swift b/WordPress/WordPressTest/ActivityContentFactoryTests.swift
@@ -15,6 +15,6 @@ final class ActivityContentFactoryTests: XCTestCase {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 }
diff --git a/WordPress/WordPressTest/ActivityLogTestData.swift b/WordPress/WordPressTest/ActivityLogTestData.swift
@@ -28,7 +28,7 @@ class ActivityLogTestData {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 
     func getCommentEventDictionary() -> [String: AnyObject] {
diff --git a/WordPress/WordPressTest/ContextManagerMock.h b/WordPress/WordPressTest/ContextManagerMock.h
@@ -20,17 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface ContextManagerMock : ContextManager <ManagerMock, CoreDataStack>
 
-
-/**
- *  @brief      Loads the contents of any given JSON file into a new NSManagedObject instance
- *  @details    This helper method is useful for Unit Testing scenarios.
- *
- *  @param      entityName  The name of the entity to be inserted.
- *  @param      filename    The name of the JSON file to be loaded.
- */
-- (NSManagedObject *)loadEntityNamed:(NSString *)entityName withContentsOfFile:(NSString *)filename;
-- (NSDictionary *)objectWithContentOfFile:(NSString *)filename;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/WordPress/WordPressTest/ContextManagerMock.m b/WordPress/WordPressTest/ContextManagerMock.m
@@ -94,39 +94,4 @@ - (NSURL *)storeURL
     return [NSURL fileURLWithPath:[documentsDirectory stringByAppendingPathComponent:@"WordPressTest.sqlite"]];
 }
 
-- (NSManagedObject *)loadEntityNamed:(NSString *)entityName withContentsOfFile:(NSString *)filename
-{
-    NSParameterAssert(entityName);
-
-    NSDictionary *dict = [self objectWithContentOfFile:filename];
-
-    // Insert + Set Values
-    NSManagedObject *object= [NSEntityDescription insertNewObjectForEntityForName:entityName inManagedObjectContext:self.mainContext];
-
-    for (NSString *key in dict.allKeys) {
-        [object setValue:dict[key] forKey:key];
-    }
-
-    return object;
-}
-
-- (NSDictionary *)objectWithContentOfFile:(NSString *)filename
-{
-    NSParameterAssert(filename);
-
-    // Load the Raw JSON
-    NSString *name      = filename.stringByDeletingPathExtension;
-    NSString *extension = filename.pathExtension;
-    NSString *path      = [[NSBundle bundleForClass:[self class]] pathForResource:name ofType:extension];
-    NSData *contents    = [NSData dataWithContentsOfFile:path];
-    NSAssert(contents, @"Mockup data could not be loaded");
-
-    // Parse
-    NSDictionary *dict  = [NSJSONSerialization JSONObjectWithData:contents
-                                                          options:NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves
-                                                            error:nil];
-    NSAssert(dict, @"Mockup data could not be parsed");
-    return dict;
-}
-
 @end
diff --git a/WordPress/WordPressTest/FormattableCommentContentTests.swift b/WordPress/WordPressTest/FormattableCommentContentTests.swift
@@ -138,7 +138,7 @@ final class FormattableCommentContentTests: XCTestCase {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 
     private func loadLikeNotification() -> WordPress.Notification {
diff --git a/WordPress/WordPressTest/FormattableContentGroupTests.swift b/WordPress/WordPressTest/FormattableContentGroupTests.swift
@@ -64,6 +64,6 @@ final class FormattableContentGroupTests: XCTestCase {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 }
diff --git a/WordPress/WordPressTest/FormattableUserContentTests.swift b/WordPress/WordPressTest/FormattableUserContentTests.swift
@@ -134,11 +134,11 @@ final class FormattableUserContentTests: XCTestCase {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 
     private func loadLikeNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-like.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 
     private func loadMeta() -> [String: AnyObject] {
diff --git a/WordPress/WordPressTest/NSManagedObject+Fixture.swift b/WordPress/WordPressTest/NSManagedObject+Fixture.swift
@@ -0,0 +1,20 @@
+import CoreData
+
+extension NSManagedObject {
+
+    /// Loads the contents of any given JSON file into a new `NSManagedObject` instance.
+    ///
+    /// - Parameters:
+    ///   - filename: The name of the JSON file to be loaded
+    ///   - context: The managed object context to use
+    /// - Returns: A new instance with property values of the given JSON file.
+    static func fixture(fromFile fileName: String, insertInto context: NSManagedObjectContext) -> Self {
+        let jsonObject = JSONObject.loadFile(named: fileName)
+        let model = Self.init(context: context)
+        for (key, value) in jsonObject {
+            model.setValue(value, forKey: key)
+        }
+        return model
+    }
+
+}
diff --git a/WordPress/WordPressTest/NotificationContentRangeFactoryTests.swift b/WordPress/WordPressTest/NotificationContentRangeFactoryTests.swift
@@ -65,6 +65,6 @@ final class NotificationContentRangeFactoryTests: XCTestCase {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 }
diff --git a/WordPress/WordPressTest/NotificationSyncMediatorTests.swift b/WordPress/WordPressTest/NotificationSyncMediatorTests.swift
@@ -154,7 +154,7 @@ class NotificationSyncMediatorTests: XCTestCase {
 
         // Inject Dummy Note
         let path = "notifications-like.json"
-        let note = manager.loadEntityNamed(Notification.entityName(), withContentsOfFile: path) as! WordPress.Notification
+        let note = WordPress.Notification.fixture(fromFile: path, insertInto: manager.mainContext)
 
         XCTAssertNotNil(note)
         XCTAssertFalse(note.read)
@@ -186,9 +186,9 @@ class NotificationSyncMediatorTests: XCTestCase {
         let path1 = "notifications-like.json"
         let path2 = "notifications-new-follower.json"
         let path3 = "notifications-unapproved-comment.json"
-        let note1 = manager.loadEntityNamed(Notification.entityName(), withContentsOfFile: path1) as! WordPress.Notification
-        let note2 = manager.loadEntityNamed(Notification.entityName(), withContentsOfFile: path2) as! WordPress.Notification
-        let note3 = manager.loadEntityNamed(Notification.entityName(), withContentsOfFile: path3) as! WordPress.Notification
+        let note1 = WordPress.Notification.fixture(fromFile: path1, insertInto: manager.mainContext)
+        let note2 = WordPress.Notification.fixture(fromFile: path2, insertInto: manager.mainContext)
+        let note3 = WordPress.Notification.fixture(fromFile: path3, insertInto: manager.mainContext)
 
         XCTAssertFalse(note1.read)
         XCTAssertFalse(note3.read)
@@ -224,9 +224,9 @@ class NotificationSyncMediatorTests: XCTestCase {
         let path1 = "notifications-like.json"
         let path2 = "notifications-new-follower.json"
         let path3 = "notifications-unapproved-comment.json"
-        let note1 = manager.loadEntityNamed(Notification.entityName(), withContentsOfFile: path1) as! WordPress.Notification
-        let note2 = manager.loadEntityNamed(Notification.entityName(), withContentsOfFile: path2) as! WordPress.Notification
-        let note3 = manager.loadEntityNamed(Notification.entityName(), withContentsOfFile: path3) as! WordPress.Notification
+        let note1 = WordPress.Notification.fixture(fromFile: path1, insertInto: manager.mainContext)
+        let note2 = WordPress.Notification.fixture(fromFile: path2, insertInto: manager.mainContext)
+        let note3 = WordPress.Notification.fixture(fromFile: path3, insertInto: manager.mainContext)
 
         XCTAssertFalse(note1.read)
         XCTAssertFalse(note3.read)
diff --git a/WordPress/WordPressTest/NotificationTextContentTests.swift b/WordPress/WordPressTest/NotificationTextContentTests.swift
@@ -96,11 +96,11 @@ final class NotificationTextContentTests: XCTestCase {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 
     private func loadLikeNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-like.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 
     private func mockedActions() -> [FormattableContentAction] {
diff --git a/WordPress/WordPressTest/NotificationUtility.swift b/WordPress/WordPressTest/NotificationUtility.swift
@@ -21,31 +21,31 @@ class NotificationUtility {
     }
 
     func loadBadgeNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-badge.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-badge.json", insertInto: contextManager.mainContext)
     }
 
     func loadLikeNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-like.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 
     func loadFollowerNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-new-follower.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-new-follower.json", insertInto: contextManager.mainContext)
     }
 
     func loadCommentNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-replied-comment.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-replied-comment.json", insertInto: contextManager.mainContext)
     }
 
     func loadUnapprovedCommentNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-unapproved-comment.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-unapproved-comment.json", insertInto: contextManager.mainContext)
     }
 
     func loadPingbackNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-pingback.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-pingback.json", insertInto: contextManager.mainContext)
     }
 
     func mockCommentContent() -> FormattableCommentContent {
-        let dictionary = contextManager.object(withContentOfFile: "notifications-replied-comment.json") as! [String: AnyObject]
+        let dictionary = JSONObject.loadFile(named: "notifications-replied-comment.json")
         let body = dictionary["body"]
         let blocks = NotificationContentFactory.content(from: body as! [[String: AnyObject]], actionsParser: NotificationActionParser(), parent: WordPress.Notification(context: contextManager.mainContext))
         return blocks.filter { $0.kind == .comment }.first! as! FormattableCommentContent
diff --git a/WordPress/WordPressTest/NotificationsContentFactoryTests.swift b/WordPress/WordPressTest/NotificationsContentFactoryTests.swift
@@ -36,10 +36,10 @@ final class NotificationsContentFactoryTests: XCTestCase {
     }
 
     private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {
-        return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]
+        return JSONObject.loadFile(named: fileName)
     }
 
     func loadLikeNotification() -> WordPress.Notification {
-        return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-like.json") as! WordPress.Notification
+        return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 }
diff --git a/WordPress/WordPressTest/PinghubTests.swift b/WordPress/WordPressTest/PinghubTests.swift
@@ -106,7 +106,7 @@ class PingHubTests: XCTestCase {
 
 private extension PingHubTests {
     func loadJSONMessage(name: String) -> [String: AnyObject]? {
-        return JSONLoader().loadFile(name, type: "json")
+        return JSONObject.loadFile(name, type: "json")
     }
 }
 
diff --git a/WordPress/WordPressTest/TestContextManager.h b/WordPress/WordPressTest/TestContextManager.h
diff --git a/WordPress/WordPressTest/TestContextManager.m b/WordPress/WordPressTest/TestContextManager.m
diff --git a/WordPress/WordPressTest/TestUtilities/JSONLoader.swift b/WordPress/WordPressTest/TestUtilities/JSONLoader.swift
diff --git a/WordPress/WordPressTest/TestUtilities/JSONObject.swift b/WordPress/WordPressTest/TestUtilities/JSONObject.swift

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ final class ActivityContentFactoryTests: XCTestCase {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {`
`18`		`- return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]`
	`18`	`+ return JSONObject.loadFile(named: fileName)`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class ActivityLogTestData {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {`
`31`		`- return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]`
	`31`	`+ return JSONObject.loadFile(named: fileName)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func getCommentEventDictionary() -> [String: AnyObject] {`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ final class FormattableCommentContentTests: XCTestCase {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {`
`141`		`- return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]`
	`141`	`+ return JSONObject.loadFile(named: fileName)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private func loadLikeNotification() -> WordPress.Notification {`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ final class FormattableContentGroupTests: XCTestCase {`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {`
`67`		`- return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]`
	`67`	`+ return JSONObject.loadFile(named: fileName)`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,11 +134,11 @@ final class FormattableUserContentTests: XCTestCase {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {`
`137`		`- return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]`
	`137`	`+ return JSONObject.loadFile(named: fileName)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private func loadLikeNotification() -> WordPress.Notification {`
`141`		`- return contextManager.loadEntityNamed(entityName, withContentsOfFile: "notifications-like.json") as! WordPress.Notification`
	`141`	`+ return .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private func loadMeta() -> [String: AnyObject] {`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,6 @@ final class NotificationContentRangeFactoryTests: XCTestCase {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`private func getDictionaryFromFile(named fileName: String) -> [String: AnyObject] {`
`68`		`- return contextManager.object(withContentOfFile: fileName) as! [String: AnyObject]`
	`68`	`+ return JSONObject.loadFile(named: fileName)`
`69`	`69`	`}`
`70`	`70`	`}`