1. Inherit Error protocol for SendRequestError

2. Better tests for IterableActionRunner.

Author: tapashmajumder

Tests/swift-sdk-swift-tests/IterableActionRunnerTests.swift

@@ -29,14 +29,22 @@ class IterableActionRunnerTests: XCTestCase {
         let action = IterableAction.action(fromDictionary: ["type" : "openUrl", "data" : urlString])!
         let context = IterableActionContext(action: action, source: .push)
         let urlOpener = MockUrlOpener()
-
+        let expectation = XCTestExpectation(description: "call UrlHandler")
+        let urlHandler: UrlHandler = {url in
+            XCTAssertEqual(url.absoluteString, urlString)
+            expectation.fulfill()
+            return false
+        }
+        
         let handled = IterableActionRunner.execute(action: action,
                                      context: context,
-                                     urlHandler: { url in return false},
+                                     urlHandler: urlHandler,
                                      urlOpener: urlOpener)
 
+
+        wait(for: [expectation], timeout: testExpectationTimeout)
         XCTAssertTrue(handled)
-        
+
         if #available(iOS 10.0, *) {
             XCTAssertEqual(urlOpener.ios10OpenedUrl?.absoluteString, urlString)
             XCTAssertNil(urlOpener.preIos10openedUrl)
@@ -51,12 +59,20 @@ class IterableActionRunnerTests: XCTestCase {
         let action = IterableAction.action(fromDictionary: ["type" : "openUrl", "data" : urlString])!
         let context = IterableActionContext(action: action, source: .push)
         let urlOpener = MockUrlOpener()
+        let expectation = XCTestExpectation(description: "call UrlHandler")
+        let urlHandler: UrlHandler = {url in
+            XCTAssertEqual(url.absoluteString, urlString)
+            expectation.fulfill()
+            return true
+        }
 
         let handled = IterableActionRunner.execute(action: action,
                                      context: context,
-                                     urlHandler: { url in return true},
+                                     urlHandler: urlHandler,
                                      urlOpener: urlOpener)
 
+
+        wait(for: [expectation], timeout: testExpectationTimeout)
         XCTAssertTrue(handled)
 
         if #available(iOS 10.0, *) {

swift-sdk/NetworkHelper.swift

@@ -8,11 +8,17 @@ import Foundation
 
 typealias SendRequestValue = [AnyHashable : Any]
 
-struct SendRequestErrorType {
+struct SendRequestError : Error {
     let errorMessage: String?
     let data: Data?
 }
 
+extension SendRequestError : LocalizedError {
+    var localizedDescription: String {
+        return errorMessage ?? ""
+    }
+}
+
 enum Result<Value, ErrorType> {
     case value(Value)
     case error(ErrorType)
@@ -54,15 +60,15 @@ extension URLSession : NetworkSessionProtocol {
 }
 
 struct NetworkHelper {
-    static func sendRequest(_ request: URLRequest, usingSession networkSession: NetworkSessionProtocol) -> Promise<SendRequestValue, SendRequestErrorType>  {
-        let result = Promise<SendRequestValue, SendRequestErrorType>()
+    static func sendRequest(_ request: URLRequest, usingSession networkSession: NetworkSessionProtocol) -> Promise<SendRequestValue, SendRequestError>  {
+        let result = Promise<SendRequestValue, SendRequestError>()
 
         networkSession.makeRequest(request) { (data, response, error) in
             if let error = error {
-                return result.reject(with: SendRequestErrorType(errorMessage: "\(error.localizedDescription)", data: data))
+                return result.reject(with: SendRequestError(errorMessage: "\(error.localizedDescription)", data: data))
             }
             guard let response = response as? HTTPURLResponse else {
-                return result.reject(with: SendRequestErrorType(errorMessage: "No response", data: nil))
+                return result.reject(with: SendRequestError(errorMessage: "No response", data: nil))
             }
 
             let responseCode = response.statusCode
@@ -82,33 +88,33 @@ struct NetworkHelper {
             }
 
             if responseCode == 401 {
-                return result.reject(with: SendRequestErrorType(errorMessage: "Invalid API Key", data: data))
+                return result.reject(with: SendRequestError(errorMessage: "Invalid API Key", data: data))
             } else if responseCode >= 400 {
                 var errorMessage = "Invalid Request"
                 if let jsonDict = json as? [AnyHashable : Any], let msgFromDict = jsonDict["msg"] as? String {
                     errorMessage = msgFromDict
                 } else if responseCode >= 500 {
                     errorMessage = "Internal Server Error"
                 }
-                return result.reject(with: SendRequestErrorType(errorMessage: errorMessage, data: data))
+                return result.reject(with: SendRequestError(errorMessage: errorMessage, data: data))
             } else if responseCode == 200 {
                 if let data = data, data.count > 0 {
                     if let jsonError = jsonError {
                         var reason = "Could not parse json, error: \(jsonError.localizedDescription)"
                         if let stringValue = String(data: data, encoding: .utf8) {
                             reason = "Could not parse json: \(stringValue), error: \(jsonError.localizedDescription)"
                         }
-                        return result.reject(with: SendRequestErrorType(errorMessage: reason, data: data))
+                        return result.reject(with: SendRequestError(errorMessage: reason, data: data))
                     } else if let json = json as? [AnyHashable : Any] {
                         return result.resolve(with: json)
                     } else {
-                        return result.reject(with: SendRequestErrorType(errorMessage: "Response is not a dictionary", data: data))
+                        return result.reject(with: SendRequestError(errorMessage: "Response is not a dictionary", data: data))
                     }
                 } else {
-                    return result.reject(with: SendRequestErrorType(errorMessage: "No data received", data: data))
+                    return result.reject(with: SendRequestError(errorMessage: "No data received", data: data))
                 }
             } else {
-                return result.reject(with: SendRequestErrorType(errorMessage: "Received non-200 response: \(responseCode)", data: data))
+                return result.reject(with: SendRequestError(errorMessage: "Received non-200 response: \(responseCode)", data: data))
             }
         }