Fix mapping from model mock inputs to JSON input, error JSON structure, and backwards Xcode compatibility

Source/SwiftyDropbox/Shared/Handwritten/MockApiRequest.swift

@@ -82,13 +82,13 @@ extension MockApiRequest {
         case .none:
             mappedInput = .none
         case .success(let model):
-            mappedInput = .success(json: try MockingUtilities.jsonObject(from: model))
+            mappedInput = .success(json: try MockingUtilities.jsonObject(from: model, isError: false))
         case .downloadSuccess(let model, let downloadLocation):
-            mappedInput = .downloadSuccess(json: try MockingUtilities.jsonObject(from: model), downloadLocation: downloadLocation)
+            mappedInput = .downloadSuccess(json: try MockingUtilities.jsonObject(from: model, isError: false), downloadLocation: downloadLocation)
         case .requestError(let model, let code):
-            mappedInput = .requestError(json: try MockingUtilities.jsonObject(from: model), code: code)
+            mappedInput = .requestError(json: try MockingUtilities.jsonObject(from: model, isError: true), code: code)
         case .routeError(let model):
-            mappedInput = .success(json: try MockingUtilities.jsonObject(from: model))
+            mappedInput = .routeError(json: try MockingUtilities.jsonObject(from: model, isError: true))
         }
 
         try _handleMockInput(mappedInput)

Source/SwiftyDropbox/Shared/Handwritten/MockDropboxTransportClient.swift

@@ -20,9 +20,15 @@ enum MockingUtilities {
         return (namespaceObject, mockTransportClient)
     }
 
-    static func jsonObject<T: JSONRepresentable>(from result: T) throws -> [String: Any] {
+    static func jsonObject<T: JSONRepresentable>(from result: T, isError: Bool) throws -> [String: Any] {
         let json = try result.json()
-        let jsonObject = try (SerializeUtil.prepareJSONForSerialization(json) as? [String: Any]).orThrow()
+        var jsonObject = try (SerializeUtil.prepareJSONForSerialization(json) as? [String: Any]).orThrow()
+        if isError {
+            jsonObject = [
+                "error": jsonObject,
+                "error_summary": "error_summary",
+            ]
+        }
         return jsonObject
     }
 }

Source/SwiftyDropboxUnitTests/TestMockingUtilities.swift

@@ -61,15 +61,51 @@ final class TestMockingUtilities: XCTestCase {
 
         let (filesRoutes, mockTransportClient) = MockingUtilities.makeMock(forType: FilesRoutes.self)
         let webService = ExampleWebService(routes: filesRoutes)
+        let expectedError = Files.GetMetadataError.path(.notFound)
 
         webService.getMetadata { _, error in
-            XCTAssertNotNil(error)
+            let error = try! XCTUnwrap(error)
+            if case .routeError = error {
+                // successfully produced a Files.GetMetadataError
+            } else {
+                XCTFail()
+            }
             e.fulfill()
         }
 
-        let error = Files.GetMetadataError.path(.notFound)
         try mockTransportClient.getLastRequest()?.handleMockInput(
-            .routeError(model: error)
+            .routeError(model: expectedError)
+        )
+
+        wait(for: [e], timeout: 1)
+    }
+
+    func testExampleErrorJSON() throws {
+        let e = expectation(description: "webservice closure called")
+
+        let (filesRoutes, mockTransportClient) = MockingUtilities.makeMock(forType: FilesRoutes.self)
+        let webService = ExampleWebService(routes: filesRoutes)
+
+        let expectedErrorJSON: [String: Any] = [
+            "path": [".tag": "not_found"],
+            ".tag":"path"
+        ]
+
+        webService.getMetadata { _, error in
+            let error = try! XCTUnwrap(error)
+            if case .routeError = error {
+                // successfully produced a Files.GetMetadataError
+            } else {
+                XCTFail()
+            }
+            e.fulfill()
+        }
+
+        try mockTransportClient.getLastRequest()?.handleMockInput(
+            .routeError(json: [
+                "error": expectedErrorJSON,
+                "error_summary": "error_summary",
+            ])
         )
 
         wait(for: [e], timeout: 1)

Source/SwiftyDropboxUnitTests/TestRequestWithTokenRefresh.swift

@@ -598,6 +598,7 @@ extension MockFileManager: FileManagerProtocol {
     }
 }
 
+#if compiler(>=6)
 extension ClientError: @retroactive RawRepresentable, @retroactive Equatable {
     public typealias RawValue = String
 
@@ -622,3 +623,29 @@ extension ClientError: @retroactive RawRepresentable, @retroactive Equatable {
         }
     }
 }
+#else
+extension ClientError: RawRepresentable, Equatable {
+    public typealias RawValue = String
+
+    public init?(rawValue: String) {
+        fatalError("unimplemented")
+    }
+
+    public var rawValue: String {
+        switch self {
+        case .oauthError:
+            return "oauthError"
+        case .urlSessionError:
+            return "urlSessionError"
+        case .fileAccessError:
+            return "fileAccessError"
+        case .requestObjectDeallocated:
+            return "requestObjectDeallocated"
+        case .unexpectedState:
+            return "unexpectedState"
+        case .other:
+            return "unknown"
+        }
+    }
+}
+#endif