Set timeout in NetworkSession.

Author: tapashmajumder

swift-sdk/Internal/NetworkSession.swift

@@ -14,12 +14,29 @@ extension URLSessionDataTask: DataTaskProtocol {}
 
 protocol NetworkSessionProtocol {
     typealias CompletionHandler = (Data?, URLResponse?, Error?) -> Void
+    var timeout: TimeInterval { get set }
     func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler)
     func makeDataRequest(with url: URL, completionHandler: @escaping CompletionHandler)
     func createDataTask(with url: URL, completionHandler: @escaping CompletionHandler) -> DataTaskProtocol
 }
 
+extension NetworkSessionProtocol {
+    var timeout: TimeInterval {
+        get { 60.0 }
+        set {}
+    }
+}
+
 extension URLSession: NetworkSessionProtocol {
+    var timeout: TimeInterval {
+        get {
+            configuration.timeoutIntervalForRequest
+        }
+        set {
+            configuration.timeoutIntervalForRequest = newValue
+        }
+    }
+    
     func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler) {
         let task = dataTask(with: request) { data, response, error in
             completionHandler(data, response, error)
@@ -50,6 +67,15 @@ protocol RedirectNetworkSessionProvider {
 }
 
 class RedirectNetworkSession: NSObject, NetworkSessionProtocol {
+    var timeout: TimeInterval {
+        get {
+            networkSession.timeout
+        }
+        set {
+            networkSession.timeout = newValue
+        }
+    }
+    
     func makeRequest(_ request: URLRequest, completionHandler: @escaping CompletionHandler) {
         networkSession.makeRequest(request, completionHandler: completionHandler)
     }

tests/common/CommonExtensions.swift

@@ -143,6 +143,8 @@ class MockDependencyContainer: DependencyContainerProtocol {
 }
 
 struct MockRedirectNetworkSession: NetworkSessionProtocol {
+    var timeout: TimeInterval = 60.0
+    
     init(networkSession: NetworkSessionProtocol, redirectDelegate: RedirectNetworkSessionDelegate) {
         self.networkSession = Self.createRedirectNetworkSession(fromNetworkSession: networkSession, redirectDelegate: redirectDelegate)
     }

tests/common/CommonMocks.swift

@@ -203,6 +203,8 @@ class MockNetworkSession: NetworkSessionProtocol {
 
     var responseCallback: ((URL) -> MockResponse?)?
 
+    var timeout: TimeInterval = 60.0
+    
     var requests = [URLRequest]()
     var callback: ((Data?, URLResponse?, Error?) -> Void)?
     var requestCallback: ((URLRequest) -> Void)?
@@ -263,8 +265,16 @@ class MockNetworkSession: NetworkSessionProtocol {
                 block()
             }
         } else {
-            DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
-                block()
+            if delay < timeout {
+                DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+                    block()
+                }
+            } else {
+                DispatchQueue.main.asyncAfter(deadline: .now() + timeout) {
+                    let error = NetworkError(reason: "The request timed out.")
+                    completionHandler(nil, nil, error)
+                    self.callback?(nil, nil, error)
+                }
             }
         }
     }
@@ -312,7 +322,7 @@ class MockNetworkSession: NetworkSessionProtocol {
     static func json(fromData data: Data) -> [AnyHashable: Any] {
         try! JSONSerialization.jsonObject(with: data, options: []) as! [AnyHashable: Any]
     }
-
+    
     private static let defaultStatus = 200
     private static let defaultData = [:].toJsonData()
     private static let defaultHttpVersion = "HTTP/1.1"

tests/unit-tests/IterableAPIResponseTests.swift

@@ -2,7 +2,6 @@
 //  Copyright © 2018 Iterable. All rights reserved.
 //
 
-import OHHTTPStubs
 import XCTest
 
 @testable import IterableSDK
@@ -159,18 +158,12 @@ class IterableAPIResponseTests: XCTestCase {
         let responseTime = 2.0
         let timeout = 0.1
 
-        HTTPStubs.stubRequests(passingTest: { (_) -> Bool in
-            true
-        }) { (_) -> HTTPStubsResponse in
-            let response = HTTPStubsResponse(data: try! JSONSerialization.data(withJSONObject: [:], options: []),
-                                             statusCode: 200,
-                                             headers: nil)
-            response.requestTime = 0.0
-            response.responseTime = responseTime
-            return response
+        let networkSession = MockNetworkSession() { _ in
+            MockNetworkSession.MockResponse(statusCode: 200,
+                                            data: [:].toJsonData(),
+                                            delay: responseTime)
         }
-        
-        let networkSession = URLSession(configuration: URLSessionConfiguration.default)
+        networkSession.timeout = timeout
 
         let iterableRequest = IterableRequest.post(PostRequest(path: "", args: nil, body: [:]))
 
@@ -185,6 +178,7 @@ class IterableAPIResponseTests: XCTestCase {
 
         wait(for: [xpectation], timeout: testExpectationTimeout)
     }
+
 
     private func verifyIterableHeaders(_ urlRequest: URLRequest) {
         XCTAssertEqual(urlRequest.value(forHTTPHeaderField: JsonKey.Header.sdkPlatform), JsonValue.iOS)