Change static function on JSONObject to an initialiser

crazytonyli · crazytonyli · commit a12d51dc5efa · 2022-05-11T08:39:11.000+12:00
diff --git a/WordPress/WordPressTest/ActivityContentFactoryTests.swift b/WordPress/WordPressTest/ActivityContentFactoryTests.swift
@@ -11,7 +11,7 @@ final class ActivityContentFactoryTests: XCTestCase {
     }
 
     private func mockBlock() throws -> JSONObject {
-        return try .loadJSONFile(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
@@ -28,39 +28,39 @@ class ActivityLogTestData {
     }
 
     func getCommentEventDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-comment.json")
+        return try JSONObject(fromFileNamed: "activity-log-comment.json")
     }
 
     func getPostEventDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-post.json")
+        return try JSONObject(fromFileNamed: "activity-log-post.json")
     }
 
     func getPingbackDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-pingback-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-pingback-content.json")
     }
 
     func getPostContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-post-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-post-content.json")
     }
 
     func getCommentContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-comment-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-comment-content.json")
     }
 
     func getThemeContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-theme-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-theme-content.json")
     }
 
     func getSettingsContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-settings-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-settings-content.json")
     }
 
     func getSiteContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "activity-log-site-content.json")
+        return try JSONObject(fromFileNamed: "activity-log-site-content.json")
     }
 
     func getPluginContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(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
@@ -134,15 +134,15 @@ final class FormattableCommentContentTests: XCTestCase {
     }
 
     private func mockDictionary() throws -> JSONObject {
-        return try .loadJSONFile(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 .loadJSONFile(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
@@ -60,7 +60,7 @@ final class FormattableContentGroupTests: XCTestCase {
     }
 
     private func mockActivity() throws -> JSONObject {
-        return try .loadJSONFile(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 .loadJSONFile(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 .loadJSONFile(named: "notifications-user-content-meta.json")
+        return try JSONObject(fromFileNamed: "notifications-user-content-meta.json")
     }
 
     private func mockedActions() -> [FormattableContentAction] {
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.loadJSONFile(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
@@ -41,27 +41,27 @@ final class NotificationContentRangeFactoryTests: XCTestCase {
     }
 
     private func mockCommentRange() throws -> JSONObject {
-        return try .loadJSONFile(named: "notifications-comment-range.json")
+        return try JSONObject(fromFileNamed: "notifications-comment-range.json")
     }
 
     private func mockIconRange() throws -> JSONObject {
-        return try .loadJSONFile(named: "notifications-icon-range.json")
+        return try JSONObject(fromFileNamed: "notifications-icon-range.json")
     }
 
     private func mockPostRange() throws -> JSONObject {
-        return try .loadJSONFile(named: "notifications-post-range.json")
+        return try JSONObject(fromFileNamed: "notifications-post-range.json")
     }
 
     private func mockSiteRange() throws -> JSONObject {
-        return try .loadJSONFile(named: "notifications-site-range.json")
+        return try JSONObject(fromFileNamed: "notifications-site-range.json")
     }
 
     private func mockUserRange() throws -> JSONObject {
-        return try .loadJSONFile(named: "notifications-user-range.json")
+        return try JSONObject(fromFileNamed: "notifications-user-range.json")
     }
 
     private func mockBlockQuoteRange() throws -> JSONObject {
-        return try .loadJSONFile(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
@@ -88,11 +88,11 @@ final class NotificationTextContentTests: XCTestCase {
     }
 
     private func mockDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "notifications-text-content.json")
+        return try JSONObject(fromFileNamed: "notifications-text-content.json")
     }
 
     private func mockButtonContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(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.loadJSONFile(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 .loadJSONFile(named: "notifications-text-content.json")
+        return try JSONObject(fromFileNamed: "notifications-text-content.json")
     }
 
     private func mockCommentContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(named: "notifications-comment-content.json")
+        return try JSONObject(fromFileNamed: "notifications-comment-content.json")
     }
 
     private func mockUserContentDictionary() throws -> JSONObject {
-        return try .loadJSONFile(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 JSONObject.loadJSONFile(named: "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 JSONObject.loadJSONFile(named: "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 JSONObject.loadJSONFile(named: "notes-action-unsupported")
+        let message = try JSONObject(fromFileNamed: "notes-action-unsupported")
         let action = PinghubClient.Action.from(message: message)
         XCTAssertNil(action)
     }
diff --git a/WordPress/WordPressTest/TestUtilities/JSONObject.swift b/WordPress/WordPressTest/TestUtilities/JSONObject.swift
@@ -5,11 +5,10 @@ typealias JSONObject = Dictionary<String, AnyObject>
 
 extension JSONObject {
 
-    /// Loads the specified json file and returns a dictionary representing it.
+    /// Creat a dictionary represented by the specified json file.
     ///
     /// - Parameter fileName: The name of the json file to load. The "json" file extension can be omitted.
-    /// - Returns: A dictionary representing the contents of the json file.
-    static func loadJSONFile(named fileName: String) throws -> JSONObject {
+    init(fromFileNamed fileName: String) throws {
         let type = (fileName as NSString).pathExtension
         if type != "" && type != "json" {
             throw NSError(
@@ -37,7 +36,7 @@ extension JSONObject {
         }
         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
`@@ -11,7 +11,7 @@ final class ActivityContentFactoryTests: XCTestCase {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`private func mockBlock() throws -> JSONObject {`
`14`		`- return try .loadJSONFile(named: "activity-log-activity-content.json")`
	`14`	`+ return try JSONObject(fromFileNamed: "activity-log-activity-content.json")`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,39 +28,39 @@ class ActivityLogTestData {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`func getCommentEventDictionary() throws -> JSONObject {`
`31`		`- return try .loadJSONFile(named: "activity-log-comment.json")`
	`31`	`+ return try JSONObject(fromFileNamed: "activity-log-comment.json")`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`func getPostEventDictionary() throws -> JSONObject {`
`35`		`- return try .loadJSONFile(named: "activity-log-post.json")`
	`35`	`+ return try JSONObject(fromFileNamed: "activity-log-post.json")`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func getPingbackDictionary() throws -> JSONObject {`
`39`		`- return try .loadJSONFile(named: "activity-log-pingback-content.json")`
	`39`	`+ return try JSONObject(fromFileNamed: "activity-log-pingback-content.json")`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`func getPostContentDictionary() throws -> JSONObject {`
`43`		`- return try .loadJSONFile(named: "activity-log-post-content.json")`
	`43`	`+ return try JSONObject(fromFileNamed: "activity-log-post-content.json")`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func getCommentContentDictionary() throws -> JSONObject {`
`47`		`- return try .loadJSONFile(named: "activity-log-comment-content.json")`
	`47`	`+ return try JSONObject(fromFileNamed: "activity-log-comment-content.json")`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func getThemeContentDictionary() throws -> JSONObject {`
`51`		`- return try .loadJSONFile(named: "activity-log-theme-content.json")`
	`51`	`+ return try JSONObject(fromFileNamed: "activity-log-theme-content.json")`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`func getSettingsContentDictionary() throws -> JSONObject {`
`55`		`- return try .loadJSONFile(named: "activity-log-settings-content.json")`
	`55`	`+ return try JSONObject(fromFileNamed: "activity-log-settings-content.json")`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`func getSiteContentDictionary() throws -> JSONObject {`
`59`		`- return try .loadJSONFile(named: "activity-log-site-content.json")`
	`59`	`+ return try JSONObject(fromFileNamed: "activity-log-site-content.json")`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func getPluginContentDictionary() throws -> JSONObject {`
`63`		`- return try .loadJSONFile(named: "activity-log-plugin-content.json")`
	`63`	`+ return try JSONObject(fromFileNamed: "activity-log-plugin-content.json")`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func getCommentRangeDictionary() throws -> JSONObject {`
Original file line number	Diff line number	Diff line change
`@@ -134,15 +134,15 @@ final class FormattableCommentContentTests: XCTestCase {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`private func mockDictionary() throws -> JSONObject {`
`137`		`- return try .loadJSONFile(named: "notifications-comment-content.json")`
	`137`	`+ return try JSONObject(fromFileNamed: "notifications-comment-content.json")`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`private func loadLikeNotification() throws -> WordPress.Notification {`
`141`	`141`	`return try utility.loadLikeNotification()`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`private func loadMeta() throws -> JSONObject {`
`145`		`- return try .loadJSONFile(named: "notifications-comment-meta.json")`
	`145`	`+ return try JSONObject(fromFileNamed: "notifications-comment-meta.json")`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`private func mockedActions() -> [FormattableContentAction] {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ final class FormattableContentGroupTests: XCTestCase {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private func mockActivity() throws -> JSONObject {`
`63`		`- return try .loadJSONFile(named: "activity-log-activity-content.json")`
	`63`	`+ return try JSONObject(fromFileNamed: "activity-log-activity-content.json")`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`}`
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 .loadJSONFile(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 .loadJSONFile(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
`@@ -41,27 +41,27 @@ final class NotificationContentRangeFactoryTests: XCTestCase {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`private func mockCommentRange() throws -> JSONObject {`
`44`		`- return try .loadJSONFile(named: "notifications-comment-range.json")`
	`44`	`+ return try JSONObject(fromFileNamed: "notifications-comment-range.json")`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`private func mockIconRange() throws -> JSONObject {`
`48`		`- return try .loadJSONFile(named: "notifications-icon-range.json")`
	`48`	`+ return try JSONObject(fromFileNamed: "notifications-icon-range.json")`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private func mockPostRange() throws -> JSONObject {`
`52`		`- return try .loadJSONFile(named: "notifications-post-range.json")`
	`52`	`+ return try JSONObject(fromFileNamed: "notifications-post-range.json")`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private func mockSiteRange() throws -> JSONObject {`
`56`		`- return try .loadJSONFile(named: "notifications-site-range.json")`
	`56`	`+ return try JSONObject(fromFileNamed: "notifications-site-range.json")`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`private func mockUserRange() throws -> JSONObject {`
`60`		`- return try .loadJSONFile(named: "notifications-user-range.json")`
	`60`	`+ return try JSONObject(fromFileNamed: "notifications-user-range.json")`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private func mockBlockQuoteRange() throws -> JSONObject {`
`64`		`- return try .loadJSONFile(named: "notifications-blockquote-range.json")`
	`64`	`+ return try JSONObject(fromFileNamed: "notifications-blockquote-range.json")`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,11 @@ final class NotificationTextContentTests: XCTestCase {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`private func mockDictionary() throws -> JSONObject {`
`91`		`- return try .loadJSONFile(named: "notifications-text-content.json")`
	`91`	`+ return try JSONObject(fromFileNamed: "notifications-text-content.json")`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`private func mockButtonContentDictionary() throws -> JSONObject {`
`95`		`- return try .loadJSONFile(named: "notifications-button-text-content.json")`
	`95`	`+ return try JSONObject(fromFileNamed: "notifications-button-text-content.json")`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`private func loadLikeNotification() throws -> WordPress.Notification {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class NotificationUtility {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func mockCommentContent() throws -> FormattableCommentContent {`
`48`		`- let dictionary = try JSONObject.loadJSONFile(named: "notifications-replied-comment.json")`
	`48`	`+ let dictionary = try JSONObject(fromFileNamed: "notifications-replied-comment.json")`
`49`	`49`	`let body = dictionary["body"]`
`50`	`50`	`let blocks = NotificationContentFactory.content(from: body as! [[String: AnyObject]], actionsParser: NotificationActionParser(), parent: WordPress.Notification(context: contextManager.mainContext))`
`51`	`51`	`return blocks.filter { $0.kind == .comment }.first! as! FormattableCommentContent`
Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,15 @@ final class NotificationsContentFactoryTests: XCTestCase {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`private func mockTextContentDictionary() throws -> JSONObject {`
`27`		`- return try .loadJSONFile(named: "notifications-text-content.json")`
	`27`	`+ return try JSONObject(fromFileNamed: "notifications-text-content.json")`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`private func mockCommentContentDictionary() throws -> JSONObject {`
`31`		`- return try .loadJSONFile(named: "notifications-comment-content.json")`
	`31`	`+ return try JSONObject(fromFileNamed: "notifications-comment-content.json")`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`private func mockUserContentDictionary() throws -> JSONObject {`
`35`		`- return try .loadJSONFile(named: "notifications-user-content.json")`
	`35`	`+ return try JSONObject(fromFileNamed: "notifications-user-content.json")`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func loadLikeNotification() throws -> WordPress.Notification {`