cleans up NetworkServiceMock

Author: lightsprint09

DBNetworkStack.xcodeproj/project.pbxproj

@@ -168,8 +168,8 @@
 			children = (
 				C6A5DED81D76A05300BC38B1 /* Helpers */,
 				C6A5DED21D760C9E00BC38B1 /* Mocks */,
-				C6E5A4D51E2FBDDD00F966DB /* NetworkServiceTests */,
-				C6E5A4D61E2FBE0000F966DB /* RessourceTests */,
+				C6E5A4D51E2FBDDD00F966DB /* NetworkService */,
+				C6E5A4D61E2FBE0000F966DB /* Ressource */,
 				C6F7E30E1E49DC4900FA625F /* NetworkTaskMockTests.swift */,
 				C699E0761D917501006FE7C6 /* NetworkErrorTest.swift */,
 				7C653BC81E09325500199993 /* NetworkResponseProcessorTest.swift */,
@@ -254,26 +254,26 @@
 			name = NetworkAccess;
 			sourceTree = "<group>";
 		};
-		C6E5A4D51E2FBDDD00F966DB /* NetworkServiceTests */ = {
+		C6E5A4D51E2FBDDD00F966DB /* NetworkService */ = {
 			isa = PBXGroup;
 			children = (
 				C61E77881E49A57A00D55BB2 /* NetworkServiceMockTest.swift */,
 				C61E778A1E49B53700D55BB2 /* RetryNetworkserviceTest.swift */,
 				C60BE6A01D6B3807006B0364 /* NetworkServiceTest.swift */,
 				C6C395951E0422AF00413AD2 /* ModifyRequestNetworkService.swift */,
 			);
-			name = NetworkServiceTests;
+			name = NetworkService;
 			sourceTree = "<group>";
 		};
-		C6E5A4D61E2FBE0000F966DB /* RessourceTests */ = {
+		C6E5A4D61E2FBE0000F966DB /* Ressource */ = {
 			isa = PBXGroup;
 			children = (
 				C65AA9A321187234007529BF /* ContainerNetworkTaskTest.swift */,
 				C69188681EE688F700BAD320 /* DecodableResoureTest.swift */,
 				C60425121D7803CA00FD3B38 /* ResourceTest.swift */,
 				C66C7B971FE96EA8009B8C78 /* ResourceInspectTest.swift */,
 			);
-			name = RessourceTests;
+			name = Ressource;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -352,6 +352,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				Base,
 			);
 			mainGroup = C60BE6511D6B2BF3006B0364;

Source/NetworkServiceMock.swift

@@ -26,16 +26,9 @@ import Dispatch
 
 struct NetworkServiceMockCallback {
     let onErrorCallback: ((NetworkError) -> Void)?
-    let onSuccess: ((Data, HTTPURLResponse) -> Void)?
     let onTypedSuccess: ((Any, HTTPURLResponse) -> Void)?
 
     init<Result>(resource: Resource<Result>, onCompletionWithResponse: @escaping (Result, HTTPURLResponse) -> Void, onError: @escaping (NetworkError) -> Void) {
-        onSuccess = { data, response in
-            guard let result = try? resource.parse(data) else {
-                fatalError("Could not parse data into matching result type")
-            }
-            onCompletionWithResponse(result, response)
-        }
         onTypedSuccess = { anyResult, response in
             guard let typedResult = anyResult as? Result else {
                 fatalError("Extected type of \(Result.self) but got \(anyResult.self)")
@@ -104,10 +97,20 @@ struct NetworkServiceMockCallback {
  - seealso: `NetworkService`
  */
 public final class NetworkServiceMock: NetworkService {
+    
     /// Count of all started requests
-    public var requestCount: Int = 0
+    public var requestCount: Int {
+        return lastRequests.count
+    }
+    
     /// Last executed request
-    public var lastRequest: URLRequest?
+    public var lastRequest: URLRequest? {
+        return lastRequests.last
+    }
+    
+    /// All executed requests.
+    public private(set) var lastRequests: [URLRequest] = []
+    
     /// Set this to hava a custom networktask returned by the mock
     public var nextNetworkTask: NetworkTask?
 
@@ -144,9 +147,7 @@ public final class NetworkServiceMock: NetworkService {
     @discardableResult
     public func request<Result>(queue: DispatchQueue, resource: Resource<Result>, onCompletionWithResponse: @escaping (Result, HTTPURLResponse) -> Void,
                                 onError: @escaping (NetworkError) -> Void) -> NetworkTask {
-        
-        lastRequest = resource.request
-        requestCount += 1
+        lastRequests.append(resource.request)
         callbacks.append(NetworkServiceMockCallback(
             resource: resource,
             onCompletionWithResponse: onCompletionWithResponse,
@@ -164,15 +165,6 @@ public final class NetworkServiceMock: NetworkService {
         callbacks.removeFirst().onErrorCallback?(error)
     }
 
-    /// Will return a successful request, by using the given data as a server response.
-    ///
-    /// - Parameters:
-    ///   - data: the mock response from the server.
-    ///   - httpResponse: the mock `HTTPURLResponse` from the server. `HTTPURLResponse()` by default
-    public func returnSuccess(with data: Data, httpResponse: HTTPURLResponse = HTTPURLResponse()) {
-        callbacks.removeFirst().onSuccess?(data, httpResponse)
-    }
-    
     /// Will return a successful request, by using the given type `T` as serialized result of a request.
     ///
     /// **Warning:** This will crash if type `T` does not match your expected ResponseType of your current request

Tests/DBNetworkStackTests/NetworkServiceMockTest.swift

@@ -43,6 +43,15 @@ class NetworkServiceMockTest: XCTestCase {
         XCTAssertEqual(networkServiceMock.requestCount, 2)
     }
 
+    func testLastRequests() {
+        //When
+        networkServiceMock.request(resource, onCompletion: { _ in }, onError: { _ in })
+        networkServiceMock.request(resource, onCompletion: { _ in }, onError: { _ in })
+        
+        //Then
+        XCTAssertEqual(networkServiceMock.lastRequests, [resource.request, resource.request])
+    }
+    
     func testReturnSuccessWithData() {
         //Given
         var capturedResult: Int?