minor fixes

Author: codecat15

HttpUtility/HURequest.swift

@@ -8,14 +8,14 @@
 
 import Foundation
 
-protocol Request {
+public protocol Request {
     var url: URL { get set }
     var method: HUHttpMethods {get set}
 }
 
 public struct HURequest : Request {
-    var url: URL
-    var method: HUHttpMethods
+    public var url: URL
+    public var method: HUHttpMethods
     var requestBody: Data? = nil
 
     init(withUrl url: URL, forHttpMethod method: HUHttpMethods, requestBody: Data? = nil) {
@@ -27,8 +27,8 @@ public struct HURequest : Request {
 
 // the HUMedia will be part of next release
 public struct HUMultiPartRequest : Request {
-    var url: URL
-    var method: HUHttpMethods
+    public var url: URL
+    public var method: HUHttpMethods
     var request : Encodable
     //var media : [HUMedia]? = nil
 }

HttpUtility/HttpUtility.swift

@@ -69,7 +69,7 @@ public class HttpUtility
         do {
             return try decoder.decode(responseType, from: data)
         }catch let error {
-            debugPrint("deocding error =>\(error.localizedDescription)")
+            debugPrint("error while decoding JSON response =>\(error.localizedDescription)")
         }
         return nil
     }

HttpUtilityTests/IntegrationTests/HttpUtilityIntegrationTests.swift

@@ -9,32 +9,30 @@
 import XCTest
 @testable import HttpUtility
 
-
-struct MyStruct : Encodable
+struct MultiPartPostRequest : Encodable
 {
     let name, lastName: String
 }
 
 class HttpUtilityIntegrationTests: XCTestCase {
 
-    private typealias Employees = [EmployeeResponse]
     private let _utility = HttpUtility.shared
 
     func test_getApiData_With_Valid_Request_Returns_Success()
     {
         // ARRANGE
-        let requestUrl = URL(string: "http://demo0333988.mockable.io/Employees")
+        let requestUrl = URL(string: "https://api-dev-scus-demo.azurewebsites.net/api/Animal/GetAnimals")
         let expectation = XCTestExpectation(description: "Data received from server")
         let request = HURequest(withUrl: requestUrl!, forHttpMethod: .get)
 
-        _utility.request(huRequest: request, resultType: Employees.self) { (response) in
+        _utility.request(huRequest: request, resultType: AnimalResponse.self) { (response) in
             switch response
             {
-            case .success(let employee):
+            case .success(let animal):
 
                 // ASSERT
-                XCTAssertNotNil(employee)
-                XCTAssertTrue(employee?.count == 2)
+                XCTAssertNotNil(animal)
+                XCTAssertNotNil(animal?.data)
 
             case .failure(let error):
 
@@ -168,7 +166,7 @@ class HttpUtilityIntegrationTests: XCTestCase {
         let expectation = XCTestExpectation(description: "Multipart form data test")
         let requestUrl = URL(string: "https://api-dev-scus-demo.azurewebsites.net/TestMultiPart")
 
-        let myStruct = MyStruct(name: "Bruce", lastName: "Wayne")
+        let myStruct = MultiPartPostRequest(name: "Bruce", lastName: "Wayne")
         let multiPartRequest = HUMultiPartRequest(url: requestUrl!, method: .post, request: myStruct)
 
         // ACT

HttpUtilityTests/TestModel/Response.swift

@@ -8,19 +8,16 @@
 
 import Foundation
 
-// MARK: - EmployeeResponse
-struct EmployeeResponse: Decodable {
-    let id: Int?
-    let name, role, joiningDate: String?
-    let depID, salary: Int?
-    let workPhone: String?
+// MARK: - AnimalResponse
+struct AnimalResponse: Decodable {
+    let errorMessage: String?
+    let data: [Animal]?
+}
 
-    enum CodingKeys: String, CodingKey {
-        case id, name, role
-        case joiningDate = "joining_date"
-        case depID = "dep_id"
-        case salary, workPhone
-    }
+// MARK: - Datum
+struct Animal: Decodable {
+    let name: String
+    let image: String
 }
 
 // MARK: - RegisterResponse