Implement tests

- Add unit tests
- Add integration tests

Author: ns-vasilev

Package.resolved

@@ -19,6 +19,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/space-code/atomic", .upToNextMajor(from: "1.0.0")),
         .package(url: "https://github.com/space-code/typhoon", .upToNextMajor(from: "1.0.0")),
+        .package(url: "https://github.com/WeTransfer/Mocker", .upToNextMajor(from: "3.0.1")),
     ],
     targets: [
         .target(
@@ -39,7 +40,11 @@ let package = Package(
             name: "NetworkLayerTests",
             dependencies: [
                 "NetworkLayer",
+                .product(name: "Mocker", package: "Mocker"),
                 .product(name: "Typhoon", package: "typhoon"),
+            ],
+            resources: [
+                .copy("Resources"),
             ]
         ),
     ]

Package.swift

@@ -18,6 +18,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/space-code/atomic", .upToNextMajor(from: "1.0.0")),
         .package(url: "https://github.com/space-code/typhoon", .upToNextMajor(from: "1.0.0")),
+        .package(url: "https://github.com/WeTransfer/Mocker", .upToNextMajor(from: "3.0.1")),
     ],
     targets: [
         .target(
@@ -30,13 +31,19 @@ let package = Package(
         ),
         .target(
             name: "NetworkLayerInterfaces",
-            dependencies: []
+            dependencies: [
+                .product(name: "Typhoon", package: "typhoon"),
+            ]
         ),
         .testTarget(
             name: "NetworkLayerTests",
             dependencies: [
                 "NetworkLayer",
+                .product(name: "Mocker", package: "Mocker"),
                 .product(name: "Typhoon", package: "typhoon"),
+            ],
+            resources: [
+                .copy("Resources"),
             ]
         ),
     ]

Package@swift-5.7.swift

@@ -2,9 +2,11 @@
 
 <p align="center">
 <a href="https://github.com/space-code/network-layer/blob/main/LICENSE"><img alt="License" src="https://img.shields.io/github/license/space-code/network-layer?style=flat"></a> 
-<a href="https://developer.apple.com/swift"><img alt="5.7" src="https://img.shields.io/badge/language-Swift5.7-orange.svg"/></a>
+<a href="https://swiftpackageindex.com/space-code/network-layer"><img alt="Swift Compability" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fspace-code%2Fnetwork-layer%2Fbadge%3Ftype%3Dswift-versions"/></a> 
+<a href="https://swiftpackageindex.com/space-code/network-layer"><img alt="Platform Compability" src="https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2Fspace-code%2Fnetwork-layer%2Fbadge%3Ftype%3Dplatforms"/></a> 
 <a href="https://github.com/space-code/network-layer"><img alt="CI" src="https://github.com/space-code/network-layer/actions/workflows/ci.yml/badge.svg?branch=main"></a>
 <a href="https://github.com/apple/swift-package-manager" alt="network-layer on Swift Package Manager" title="network-layer on Swift Package Manager"><img src="https://img.shields.io/badge/Swift%20Package%20Manager-compatible-brightgreen.svg" /></a>
+<a href="https://codecov.io/gh/space-code/network-layer" > <img src="https://codecov.io/gh/space-code/network-layer/graph/badge.svg?token=lWsPUf5nPL"/></a>
 </p>
 
 ## Description
@@ -53,4 +55,4 @@ Please feel free to help out with this project! If you see something that could
 Nikita Vasilev, nv3212@gmail.com
 
 ## License
-network-layer is available under the MIT license. See the LICENSE file for more info.
+network-layer is available under the MIT license. See the LICENSE file for more info.

README.md

@@ -28,7 +28,7 @@ public final class AuthenticatorInterceptor<Authenticator: IAuthenticator>: IAut
 
     // MARK: IAuthentificatorInterceptor
 
-    public func adapt(request: URLRequest, for session: URLSession) async throws {
+    public func adapt(request: inout URLRequest, for session: URLSession) async throws {
         guard let credential else {
             throw AuthenticatorInterceptorError.missingCredential
         }

Sources/NetworkLayer/Classes/Core/Authentification/AuthenticatorInterceptor.swift

@@ -11,6 +11,10 @@ struct RequestParametersEncoder: IRequestParametersEncoder {
             throw URLError(.badURL)
         }
 
+        if parameters.isEmpty {
+            return
+        }
+
         let queries = parameters.map { URLQueryItem(name: $0.key, value: $0.value) }
         var urlComponents = URLComponents(string: url.absoluteString)
 

Sources/NetworkLayer/Classes/Core/Builders/RequestBuilder/RequestParameterEncoder/RequestParametersEncoder.swift

@@ -35,7 +35,6 @@ final class DataRequestHandler: NSObject {
 extension DataRequestHandler: IDataRequestHandler {
     func startDataTask(
         _ task: URLSessionDataTask,
-        session _: URLSession,
         delegate: URLSessionDelegate?
     ) async throws -> Response<Data> {
         try await withTaskCancellationHandler(operation: {

Sources/NetworkLayer/Classes/Core/Services/DataRequestHandler/DataRequestHandler.swift

@@ -51,6 +51,7 @@ actor RequestProcessor {
         self.retryPolicyService = retryPolicyService
         self.delegate = delegate
         self.interceptor = interceptor
+        self.dataRequestHandler.urlSessionDelegate = configuration.sessionDelegate
         session = URLSession(
             configuration: configuration.sessionConfiguration,
             delegate: dataRequestHandler,
@@ -76,19 +77,19 @@ actor RequestProcessor {
         delegate: URLSessionDelegate?,
         configure: ((inout URLRequest) throws -> Void)?
     ) async throws -> Response<Data> {
-        guard let urlRequest = try requestBuilder.build(request, configure) else {
+        guard var urlRequest = try requestBuilder.build(request, configure) else {
             throw NetworkLayerError.badURL
         }
 
-        try await adapt(request, urlRequest: urlRequest, session: session)
+        try await adapt(request, urlRequest: &urlRequest, session: session)
 
         return try await performRequest(strategy: strategy) {
             try await self.delegate?.requestProcessor(self, willSendRequest: urlRequest)
 
             let task = session.dataTask(with: urlRequest)
 
             do {
-                let response = try await dataRequestHandler.startDataTask(task, session: session, delegate: delegate)
+                let response = try await dataRequestHandler.startDataTask(task, delegate: delegate)
 
                 if request.requiresAuthentication {
                     let isRefreshedCredential = try await refresh(
@@ -102,18 +103,34 @@ actor RequestProcessor {
                     }
                 }
 
+                try self.validate(response)
+
                 return response
             } catch {
                 throw error
             }
         }
     }
 
-    private func adapt<T: IRequest>(_ request: T, urlRequest: URLRequest, session: URLSession) async throws {
+    /// Adapts an initial request.
+    ///
+    /// - Parameters:
+    ///   - request: The request model.
+    ///   - urlRequest: The request that needs to be authenticated.
+    ///   - session: The URLSession for which the request is being refreshed.
+    private func adapt<T: IRequest>(_ request: T, urlRequest: inout URLRequest, session: URLSession) async throws {
         guard request.requiresAuthentication else { return }
-        try await interceptor?.adapt(request: urlRequest, for: session)
+        try await interceptor?.adapt(request: &urlRequest, for: session)
     }
 
+    /// Refreshes credential.
+    ///
+    /// - Parameters:
+    ///   - urlRequest: The request that needs to be authenticated.
+    ///   - response: The metadata associated with the response to an HTTP protocol URL load request.
+    ///   - session: The URLSession for which the request is being refreshed.
+    ///
+    /// - Returns: `true` if the request's token is refreshed, false otherwise.
     private func refresh<T>(
         urlRequest: URLRequest,
         response: Response<T>,
@@ -146,6 +163,11 @@ actor RequestProcessor {
             return try await retryPolicyService.retry(strategy: strategy, send)
         }
     }
+
+    private func validate(_ response: Response<Data>) throws {
+        guard let urlResponse = response.response as? HTTPURLResponse else { return }
+        try delegate?.requestProcessor(self, validateResponse: urlResponse, data: response.data, task: response.task)
+    }
 }
 
 // MARK: IRequestProcessor

Sources/NetworkLayer/Classes/Core/Services/RequestProcessor/RequestProcessor.swift

@@ -12,7 +12,7 @@ public protocol IAuthenticatorInterceptor {
     /// - Parameters:
     ///   - request: The URLRequest to be adapted.
     ///   - session: The URLSession for which the request is being adapted.
-    func adapt(request: URLRequest, for session: URLSession) async throws
+    func adapt(request: inout URLRequest, for session: URLSession) async throws
 
     /// Refreshes credential for the request.
     ///

Sources/NetworkLayerInterfaces/Classes/Core/Authenticator/IAuthenticatorInterceptor.swift

@@ -7,17 +7,17 @@ import Foundation
 
 /// A protocol for handling data requests.
 public protocol IDataRequestHandler: URLSessionTaskDelegate & URLSessionDataDelegate {
+    var urlSessionDelegate: URLSessionDelegate? { get set }
+
     /// Starts a data task for handling network requests.
     ///
     /// - Parameters:
     ///   - task: The `URLSessionDataTask` representing the network task to be initiated.
-    ///   - session: The `URLSession` to use for the data task.
     ///   - delegate: An optional `URLSessionDelegate` for handling `URLSession` events and callbacks. Pass `nil` if not needed.
     ///
     /// - Returns: An asynchronous task that will result in a Response object containing data when the request is completed.
     func startDataTask(
         _ task: URLSessionDataTask,
-        session: URLSession,
         delegate: URLSessionDelegate?
     ) async throws -> Response<Data>
 }