Make loading test JSON files throwing error

Author: crazytonyli

WordPress/WordPressTest/NSManagedObject+Fixture.swift

@@ -8,8 +8,8 @@ extension NSManagedObject {
     ///   - 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)
+    static func fixture(fromFile fileName: String, insertInto context: NSManagedObjectContext) throws -> Self {
+        let jsonObject = try JSONObject.loadFile(named: fileName)
         let model = Self.init(context: context)
         for (key, value) in jsonObject {
             model.setValue(value, forKey: key)

WordPress/WordPressTest/TestUtilities/JSONObject.swift

@@ -1,4 +1,5 @@
 import Foundation
+import XCTest
 
 typealias JSONObject = Dictionary<String, AnyObject>
 
@@ -8,8 +9,8 @@ extension JSONObject {
     ///
     /// - 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) -> JSONObject {
-        return loadFile(
+    static func loadFile(named fileName: String) throws -> JSONObject {
+        return try loadFile(
             (fileName as NSString).deletingPathExtension,
             type: (fileName as NSString).pathExtension
         )
@@ -21,20 +22,11 @@ extension JSONObject {
     ///   - 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) -> JSONObject {
-        guard let url = Bundle(for: BundlerFinder.self).url(forResource: name, withExtension: type) else {
-            fatalError("File not found in the test bundle: \(name).\(type)")
-        }
-        guard let data = try? Data(contentsOf: url) else {
-            fatalError("Can't read content of file: \(name).\(type)")
-        }
-        guard let parseResult = try? JSONSerialization.jsonObject(with: data, options: [.mutableContainers, .mutableLeaves]) else {
-            fatalError("Can't parse file as JSON: \(name).\(type)")
-        }
-        guard let result = parseResult as? JSONObject else {
-            fatalError("File content isn't a JSON object: \(name).\(type)")
-        }
-        return result
+    static func loadFile(_ name: String, type: String) throws -> JSONObject {
+        let url = try XCTUnwrap(Bundle(for: BundlerFinder.self).url(forResource: name, withExtension: type))
+        let data = try Data(contentsOf: url)
+        let parseResult = try JSONSerialization.jsonObject(with: data, options: [.mutableContainers, .mutableLeaves])
+        return try XCTUnwrap(parseResult as? JSONObject)
     }
 
 }