Rename JSONObject.loadFile(named:) to JSONObject(fromFileNamed:)` (#18529)

mokagio · web-flow · commit 45ab1dfe5dc6 · 2022-05-16T15:34:26.000+10:00
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -933,6 +933,7 @@
 		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 */; };
+		4A266B8F282B05210089CF3D /* JSONObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A266B8E282B05210089CF3D /* JSONObjectTests.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 */; };
@@ -5729,6 +5730,7 @@
 		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>"; };
+		4A266B8E282B05210089CF3D /* JSONObjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONObjectTests.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>"; };
@@ -11427,6 +11429,7 @@
 				FAE8EE9B273AD0A800A65307 /* QuickStartSettingsTests.swift */,
 				179501CC27A01D4100882787 /* PublicizeAuthorizationURLComponentsTests.swift */,
 				80EF92922810FA5A0064A971 /* QuickStartFactoryTests.swift */,
+				4A266B8E282B05210089CF3D /* JSONObjectTests.swift */,
 			);
 			name = Utility;
 			sourceTree = "<group>";
@@ -19721,6 +19724,7 @@
 				C3DA0EE02807062600DA3250 /* SiteCreationNameTracksEventTests.swift in Sources */,
 				73C8F06621BEF76B00DDDF7E /* SiteAssemblyViewTests.swift in Sources */,
 				73178C2821BEE09300E37C9A /* SiteCreationDataCoordinatorTests.swift in Sources */,
+				4A266B8F282B05210089CF3D /* JSONObjectTests.swift in Sources */,
 				D81C2F6020F891C4002AE1F1 /* TrashCommentActionTests.swift in Sources */,
 				570BFD8D22823DE5007859A8 /* PostActionSheetTests.swift in Sources */,
 				FA4ADADA1C509FE400F858D7 /* SiteManagementServiceTests.swift in Sources */,
diff --git a/WordPress/WordPressTest/ActivityContentFactoryTests.swift b/WordPress/WordPressTest/ActivityContentFactoryTests.swift
@@ -9,7 +9,7 @@ final class ActivityContentFactoryTests: XCTestCase {
     }
 
     private func mockBlock() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-activity-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-activity-content.json")
     }
 
 }
diff --git a/WordPress/WordPressTest/ActivityLogTestData.swift b/WordPress/WordPressTest/ActivityLogTestData.swift
@@ -26,39 +26,39 @@ class ActivityLogTestData {
     }
 
     func getCommentEventDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-comment.json")
+        return try JSONObject(fromFileNamed: "activity-log-comment.json")
     }
 
     func getPostEventDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-post.json")
+        return try JSONObject(fromFileNamed: "activity-log-post.json")
     }
 
     func getPingbackDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-pingback-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-pingback-content.json")
     }
 
     func getPostContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-post-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-post-content.json")
     }
 
     func getCommentContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-comment-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-comment-content.json")
     }
 
     func getThemeContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-theme-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-theme-content.json")
     }
 
     func getSettingsContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-settings-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-settings-content.json")
     }
 
     func getSiteContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-site-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-site-content.json")
     }
 
     func getPluginContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-plugin-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-plugin-content.json")
     }
 
     func getCommentRangeDictionary() throws -> JSONObject {
diff --git a/WordPress/WordPressTest/FormattableCommentContentTests.swift b/WordPress/WordPressTest/FormattableCommentContentTests.swift
@@ -133,15 +133,15 @@ final class FormattableCommentContentTests: XCTestCase {
     }
 
     private func mockDictionary() throws -> JSONObject {
-        return try .loadFile(named: "notifications-comment-content.json")
+        return try JSONObject(fromFileNamed: "notifications-comment-content.json")
     }
 
     private func loadLikeNotification() throws -> WordPress.Notification {
         return try utility.loadLikeNotification()
     }
 
     private func loadMeta() throws -> JSONObject {
-        return try .loadFile(named: "notifications-comment-meta.json")
+        return try JSONObject(fromFileNamed: "notifications-comment-meta.json")
     }
 
     private func mockedActions() -> [FormattableContentAction] {
diff --git a/WordPress/WordPressTest/FormattableContentGroupTests.swift b/WordPress/WordPressTest/FormattableContentGroupTests.swift
@@ -59,7 +59,7 @@ final class FormattableContentGroupTests: XCTestCase {
     }
 
     private func mockActivity() throws -> JSONObject {
-        return try .loadFile(named: "activity-log-activity-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-activity-content.json")
     }
 
 }
diff --git a/WordPress/WordPressTest/FormattableUserContentTests.swift b/WordPress/WordPressTest/FormattableUserContentTests.swift
@@ -130,15 +130,15 @@ final class FormattableUserContentTests: XCTestCase {
     }
 
     private func mockDictionary() throws -> JSONObject {
-        return try .loadFile(named: "notifications-user-content.json")
+        return try JSONObject(fromFileNamed: "notifications-user-content.json")
     }
 
     private func loadLikeNotification() throws -> WordPress.Notification {
         return try .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)
     }
 
     private func loadMeta() throws -> JSONObject {
-        return try .loadFile(named: "notifications-user-content-meta.json")
+        return try JSONObject(fromFileNamed: "notifications-user-content-meta.json")
     }
 
     private func mockedActions() -> [FormattableContentAction] {
diff --git a/WordPress/WordPressTest/JSONObjectTests.swift b/WordPress/WordPressTest/JSONObjectTests.swift
@@ -0,0 +1,17 @@
+import XCTest
+
+class JSONObjectTests: XCTestCase {
+    func testParsingFileWithUnexpectedFileExtension() throws {
+        try XCTAssertThrowsError(JSONObject(fromFileNamed: "notifications.josn"))
+    }
+
+    func testParsingNonexistentFiles() throws {
+        try XCTAssertThrowsError(JSONObject(fromFileNamed: "a-file-that-does-not-exist"))
+        try XCTAssertThrowsError(JSONObject(fromFileNamed: "a-file-that-does-not-exist.json"))
+    }
+
+    func testAllowedFileNames() throws {
+        try XCTAssertNoThrow(JSONObject(fromFileNamed: "authtoken"))
+        try XCTAssertNoThrow(JSONObject(fromFileNamed: "authtoken.json"))
+    }
+}
diff --git a/WordPress/WordPressTest/NSManagedObject+Fixture.swift b/WordPress/WordPressTest/NSManagedObject+Fixture.swift
@@ -9,7 +9,7 @@ extension NSManagedObject {
     ///   - 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) throws -> Self {
-        let jsonObject = try JSONObject.loadFile(named: fileName)
+        let jsonObject = try JSONObject(fromFileNamed: fileName)
         let model = Self.init(context: context)
         for (key, value) in jsonObject {
             model.setValue(value, forKey: key)
diff --git a/WordPress/WordPressTest/NotificationContentRangeFactoryTests.swift b/WordPress/WordPressTest/NotificationContentRangeFactoryTests.swift
@@ -40,27 +40,27 @@ final class NotificationContentRangeFactoryTests: XCTestCase {
     }
 
     private func mockCommentRange() throws -> JSONObject {
-        return try .loadFile(named: "notifications-comment-range.json")
+        return try JSONObject(fromFileNamed: "notifications-comment-range.json")
     }
 
     private func mockIconRange() throws -> JSONObject {
-        return try .loadFile(named: "notifications-icon-range.json")
+        return try JSONObject(fromFileNamed: "notifications-icon-range.json")
     }
 
     private func mockPostRange() throws -> JSONObject {
-        return try .loadFile(named: "notifications-post-range.json")
+        return try JSONObject(fromFileNamed: "notifications-post-range.json")
     }
 
     private func mockSiteRange() throws -> JSONObject {
-        return try .loadFile(named: "notifications-site-range.json")
+        return try JSONObject(fromFileNamed: "notifications-site-range.json")
     }
 
     private func mockUserRange() throws -> JSONObject {
-        return try .loadFile(named: "notifications-user-range.json")
+        return try JSONObject(fromFileNamed: "notifications-user-range.json")
     }
 
     private func mockBlockQuoteRange() throws -> JSONObject {
-        return try .loadFile(named: "notifications-blockquote-range.json")
+        return try JSONObject(fromFileNamed: "notifications-blockquote-range.json")
     }
 
 }
diff --git a/WordPress/WordPressTest/NotificationTextContentTests.swift b/WordPress/WordPressTest/NotificationTextContentTests.swift
@@ -89,11 +89,11 @@ final class NotificationTextContentTests: XCTestCase {
     }
 
     private func mockDictionary() throws -> JSONObject {
-        return try .loadFile(named: "notifications-text-content.json")
+        return try JSONObject(fromFileNamed: "notifications-text-content.json")
     }
 
     private func mockButtonContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "notifications-button-text-content.json")
+        return try JSONObject(fromFileNamed: "notifications-button-text-content.json")
     }
 
     private func loadLikeNotification() throws -> WordPress.Notification {
diff --git a/WordPress/WordPressTest/NotificationUtility.swift b/WordPress/WordPressTest/NotificationUtility.swift
@@ -45,7 +45,7 @@ class NotificationUtility {
     }
 
     func mockCommentContent() throws -> FormattableCommentContent {
-        let dictionary = try JSONObject.loadFile(named: "notifications-replied-comment.json")
+        let dictionary = try JSONObject(fromFileNamed: "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
@@ -24,15 +24,15 @@ final class NotificationsContentFactoryTests: XCTestCase {
     }
 
     private func mockTextContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "notifications-text-content.json")
+        return try JSONObject(fromFileNamed: "notifications-text-content.json")
     }
 
     private func mockCommentContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "notifications-comment-content.json")
+        return try JSONObject(fromFileNamed: "notifications-comment-content.json")
     }
 
     private func mockUserContentDictionary() throws -> JSONObject {
-        return try .loadFile(named: "notifications-user-content.json")
+        return try JSONObject(fromFileNamed: "notifications-user-content.json")
     }
 
     func loadLikeNotification() throws -> WordPress.Notification {
diff --git a/WordPress/WordPressTest/PinghubTests.swift b/WordPress/WordPressTest/PinghubTests.swift
@@ -14,7 +14,7 @@ class PingHubTests: XCTestCase {
     }
 
     func testActionPush() throws {
-        let message = try loadJSONMessage(name: "notes-action-push")!
+        let message = try JSONObject(fromFileNamed: "notes-action-push")
         let action = PinghubClient.Action.from(message: message)
 
         guard case .some(.push(let noteID, let userID, _, _)) = action else {
@@ -26,7 +26,7 @@ class PingHubTests: XCTestCase {
     }
 
     func testActionDelete() throws {
-        let message = try loadJSONMessage(name: "notes-action-delete")!
+        let message = try JSONObject(fromFileNamed: "notes-action-delete")
         let action = PinghubClient.Action.from(message: message)
 
         guard case .some(.delete(let noteID)) = action else {
@@ -37,7 +37,7 @@ class PingHubTests: XCTestCase {
     }
 
     func testActionUnsupported() throws {
-        let message = try loadJSONMessage(name: "notes-action-unsupported")!
+        let message = try JSONObject(fromFileNamed: "notes-action-unsupported")
         let action = PinghubClient.Action.from(message: message)
         XCTAssertNil(action)
     }
@@ -104,12 +104,6 @@ class PingHubTests: XCTestCase {
     }
 }
 
-private extension PingHubTests {
-    func loadJSONMessage(name: String) throws -> [String: AnyObject]? {
-        return try .loadFile(name, type: "json")
-    }
-}
-
 class MockSocket: Socket {
     func connect() {
         onConnect?()
diff --git a/WordPress/WordPressTest/TestUtilities/JSONObject.swift b/WordPress/WordPressTest/TestUtilities/JSONObject.swift
@@ -5,28 +5,38 @@ typealias JSONObject = Dictionary<String, AnyObject>
 
 extension JSONObject {
 
-    /// Loads the specified json file and returns a dictionary representing it.
+    /// Create a dictionary represented by the specified json file.
     ///
-    /// - Parameter fileName: The full name of the json file to load.
-    /// - Returns: A dictionary representing the contents of the json file.
-    static func loadFile(named fileName: String) throws -> JSONObject {
-        return try loadFile(
-            (fileName as NSString).deletingPathExtension,
-            type: (fileName as NSString).pathExtension
-        )
-    }
+    /// - Parameter fileName: The name of the json file to load. The "json" file extension can be omitted.
+    init(fromFileNamed fileName: String) throws {
+        let type = (fileName as NSString).pathExtension
+        if type != "" && type != "json" {
+            throw NSError(
+                domain: "JSONObject",
+                code: 1,
+                userInfo: [
+                    NSLocalizedDescriptionKey: "File extension should be 'json': \(fileName)"
+                ]
+            )
+        }
 
-    /// Loads the specified JSON file and returns a dictionary representing it.
-    ///
-    /// - Parameters:
-    ///   - name: The name of the file
-    ///   - type: The extension of the file
-    /// - Returns: A dictionary representing the contents of the JSON file.
-    static func loadFile(_ name: String, type: String) throws -> JSONObject {
-        let url = try XCTUnwrap(Bundle(for: BundlerFinder.self).url(forResource: name, withExtension: type))
+        let testBundle = Bundle(for: BundlerFinder.self)
+        let candidates = [
+            testBundle.url(forResource: fileName, withExtension: nil),
+            testBundle.url(forResource: fileName, withExtension: "json"),
+        ]
+        guard let url = candidates.compactMap({ $0 }).first else {
+            throw NSError(
+                domain: "JSONObject",
+                code: 2,
+                userInfo: [
+                    NSLocalizedDescriptionKey: "Can't find JSON file named \(fileName) or \(fileName).json"
+                ]
+            )
+        }
         let data = try Data(contentsOf: url)
         let parseResult = try JSONSerialization.jsonObject(with: data, options: [.mutableContainers, .mutableLeaves])
-        return try XCTUnwrap(parseResult as? JSONObject)
+        self = try XCTUnwrap(parseResult as? JSONObject)
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ final class ActivityContentFactoryTests: XCTestCase {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`private func mockBlock() throws -> JSONObject {`
`12`		`- return try .loadFile(named: "activity-log-activity-content.json")`
	`12`	`+ return try JSONObject(fromFileNamed: "activity-log-activity-content.json")`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,39 +26,39 @@ class ActivityLogTestData {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func getCommentEventDictionary() throws -> JSONObject {`
`29`		`- return try .loadFile(named: "activity-log-comment.json")`
	`29`	`+ return try JSONObject(fromFileNamed: "activity-log-comment.json")`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`func getPostEventDictionary() throws -> JSONObject {`
`33`		`- return try .loadFile(named: "activity-log-post.json")`
	`33`	`+ return try JSONObject(fromFileNamed: "activity-log-post.json")`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func getPingbackDictionary() throws -> JSONObject {`
`37`		`- return try .loadFile(named: "activity-log-pingback-content.json")`
	`37`	`+ return try JSONObject(fromFileNamed: "activity-log-pingback-content.json")`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func getPostContentDictionary() throws -> JSONObject {`
`41`		`- return try .loadFile(named: "activity-log-post-content.json")`
	`41`	`+ return try JSONObject(fromFileNamed: "activity-log-post-content.json")`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`func getCommentContentDictionary() throws -> JSONObject {`
`45`		`- return try .loadFile(named: "activity-log-comment-content.json")`
	`45`	`+ return try JSONObject(fromFileNamed: "activity-log-comment-content.json")`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func getThemeContentDictionary() throws -> JSONObject {`
`49`		`- return try .loadFile(named: "activity-log-theme-content.json")`
	`49`	`+ return try JSONObject(fromFileNamed: "activity-log-theme-content.json")`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func getSettingsContentDictionary() throws -> JSONObject {`
`53`		`- return try .loadFile(named: "activity-log-settings-content.json")`
	`53`	`+ return try JSONObject(fromFileNamed: "activity-log-settings-content.json")`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func getSiteContentDictionary() throws -> JSONObject {`
`57`		`- return try .loadFile(named: "activity-log-site-content.json")`
	`57`	`+ return try JSONObject(fromFileNamed: "activity-log-site-content.json")`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`func getPluginContentDictionary() throws -> JSONObject {`
`61`		`- return try .loadFile(named: "activity-log-plugin-content.json")`
	`61`	`+ return try JSONObject(fromFileNamed: "activity-log-plugin-content.json")`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`func getCommentRangeDictionary() throws -> JSONObject {`
Original file line number	Diff line number	Diff line change
`@@ -133,15 +133,15 @@ final class FormattableCommentContentTests: XCTestCase {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`private func mockDictionary() throws -> JSONObject {`
`136`		`- return try .loadFile(named: "notifications-comment-content.json")`
	`136`	`+ return try JSONObject(fromFileNamed: "notifications-comment-content.json")`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`private func loadLikeNotification() throws -> WordPress.Notification {`
`140`	`140`	`return try utility.loadLikeNotification()`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`private func loadMeta() throws -> JSONObject {`
`144`		`- return try .loadFile(named: "notifications-comment-meta.json")`
	`144`	`+ return try JSONObject(fromFileNamed: "notifications-comment-meta.json")`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`private func mockedActions() -> [FormattableContentAction] {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ final class FormattableContentGroupTests: XCTestCase {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`private func mockActivity() throws -> JSONObject {`
`62`		`- return try .loadFile(named: "activity-log-activity-content.json")`
	`62`	`+ return try JSONObject(fromFileNamed: "activity-log-activity-content.json")`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,15 +130,15 @@ final class FormattableUserContentTests: XCTestCase {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private func mockDictionary() throws -> JSONObject {`
`133`		`- return try .loadFile(named: "notifications-user-content.json")`
	`133`	`+ return try JSONObject(fromFileNamed: "notifications-user-content.json")`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`private func loadLikeNotification() throws -> WordPress.Notification {`
`137`	`137`	`return try .fixture(fromFile: "notifications-like.json", insertInto: contextManager.mainContext)`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private func loadMeta() throws -> JSONObject {`
`141`		`- return try .loadFile(named: "notifications-user-content-meta.json")`
	`141`	`+ return try JSONObject(fromFileNamed: "notifications-user-content-meta.json")`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private func mockedActions() -> [FormattableContentAction] {`
Original file line number	Diff line number	Diff line change
`@@ -40,27 +40,27 @@ final class NotificationContentRangeFactoryTests: XCTestCase {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`private func mockCommentRange() throws -> JSONObject {`
`43`		`- return try .loadFile(named: "notifications-comment-range.json")`
	`43`	`+ return try JSONObject(fromFileNamed: "notifications-comment-range.json")`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private func mockIconRange() throws -> JSONObject {`
`47`		`- return try .loadFile(named: "notifications-icon-range.json")`
	`47`	`+ return try JSONObject(fromFileNamed: "notifications-icon-range.json")`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private func mockPostRange() throws -> JSONObject {`
`51`		`- return try .loadFile(named: "notifications-post-range.json")`
	`51`	`+ return try JSONObject(fromFileNamed: "notifications-post-range.json")`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`private func mockSiteRange() throws -> JSONObject {`
`55`		`- return try .loadFile(named: "notifications-site-range.json")`
	`55`	`+ return try JSONObject(fromFileNamed: "notifications-site-range.json")`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private func mockUserRange() throws -> JSONObject {`
`59`		`- return try .loadFile(named: "notifications-user-range.json")`
	`59`	`+ return try JSONObject(fromFileNamed: "notifications-user-range.json")`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private func mockBlockQuoteRange() throws -> JSONObject {`
`63`		`- return try .loadFile(named: "notifications-blockquote-range.json")`
	`63`	`+ return try JSONObject(fromFileNamed: "notifications-blockquote-range.json")`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,11 @@ final class NotificationTextContentTests: XCTestCase {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`private func mockDictionary() throws -> JSONObject {`
`92`		`- return try .loadFile(named: "notifications-text-content.json")`
	`92`	`+ return try JSONObject(fromFileNamed: "notifications-text-content.json")`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`private func mockButtonContentDictionary() throws -> JSONObject {`
`96`		`- return try .loadFile(named: "notifications-button-text-content.json")`
	`96`	`+ return try JSONObject(fromFileNamed: "notifications-button-text-content.json")`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`private func loadLikeNotification() throws -> WordPress.Notification {`