9 Commits
1.1.0 ... 1.2.1

Author SHA1 Message Date
5602a76477 Merge pull request '[Testing and Reliability] Unit Testing & CI' (#25) from feature/unit-testing into main
Reviewed-on: #25
2024-04-03 17:05:00 +00:00
Victor Bodinaud
ff810b9341 👷 Adding CI for tests
All checks were successful
Run Swift Tests / build (pull_request) Successful in 33s
2024-04-03 19:00:50 +02:00
Victor Bodinaud
a5ff5b34a3 Add unit testing 2024-03-22 14:45:15 +01:00
Victor Bodinaud
d8dacb30a4 Merge branch 'release/1.2.0' 2024-03-21 15:07:13 +01:00
Victor Bodinaud
9f8a411438 Merge tag '1.2.0' into develop
- Add update methods (PUT, PATCH)
2024-03-21 15:07:13 +01:00
Victor Bodinaud
1eab731325 Merge branch 'feature/add-update-methods' into develop 2024-03-21 15:06:19 +01:00
Victor Bodinaud
93c89266b0 📝Edit SPM repo url in README 2024-03-21 15:05:19 +01:00
Victor Bodinaud
b29505ca1f Add Put & Patch methods 2024-03-21 15:05:12 +01:00
Victor Bodinaud
743530ef50 Merge tag '1.1.0' into develop 2024-01-14 19:32:25 +01:00
5 changed files with 168 additions and 11 deletions

View File

@@ -0,0 +1,20 @@
name: Run Swift Tests
on:
pull_request:
branches:
- main
jobs:
build:
runs-on: macos
steps:
- name: ⬇️ Checkout code v3
uses: actions/checkout@v4
- name: 🛠️ Setup node
uses: actions/setup-node@v4
- name: 🧪 Test
run: swift test

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
.DS_Store .DS_Store
/.build /.build
/.vscode
/Packages /Packages
xcuserdata/ xcuserdata/
DerivedData/ DerivedData/

View File

@@ -17,5 +17,5 @@ You can use Swift Package Manager to integrate Hermes into your project. Add the
```swift ```swift
dependencies: [ dependencies: [
.package(url: "https://github.com/yourusername/Hermes.git", from: "1.0.0") .package(url: "https://git.mahtan-melwasul.com/Mahtan/Hermes.git", from: "1.0.0")
] ]

View File

@@ -11,6 +11,7 @@ public enum NetworkError: Error {
case serverError(String) case serverError(String)
case decodingError case decodingError
case invalidResponse case invalidResponse
case notFound
} }
extension NetworkError: LocalizedError { extension NetworkError: LocalizedError {
@@ -19,19 +20,22 @@ extension NetworkError: LocalizedError {
case .badRequest: case .badRequest:
return NSLocalizedString("Unable to perform request", comment: "badRequestError") return NSLocalizedString("Unable to perform request", comment: "badRequestError")
case .serverError(let errorMessage): case .serverError(let errorMessage):
print(errorMessage)
return NSLocalizedString(errorMessage, comment: "serverError") return NSLocalizedString(errorMessage, comment: "serverError")
case .decodingError: case .decodingError:
return NSLocalizedString("Unable to decode successfully", comment: "decodingError") return NSLocalizedString("Unable to decode successfully", comment: "decodingError")
case .invalidResponse: case .invalidResponse:
return NSLocalizedString("Invalid response", comment: "invalidResponse") return NSLocalizedString("Invalid response", comment: "invalidResponse")
case .notFound:
return NSLocalizedString("Not Found", comment: "notFound")
} }
} }
} }
public enum HTTPMethod { public enum HTTPMethod {
case get([URLQueryItem]) case get([URLQueryItem]? = nil)
case post(Data?) case post(Data?)
case put(Data?)
case patch(Data?)
case delete case delete
var name: String { var name: String {
@@ -40,6 +44,10 @@ public enum HTTPMethod {
return "GET" return "GET"
case .post: case .post:
return "POST" return "POST"
case .put:
return "PUT"
case .patch:
return "PATCH"
case .delete: case .delete:
return "DELETE" return "DELETE"
} }
@@ -88,7 +96,9 @@ public struct Hermes {
request = URLRequest(url: url) request = URLRequest(url: url)
case .post(let data): case .post(let data),
.put(let data),
.patch(let data):
request.httpMethod = resource.method.name request.httpMethod = resource.method.name
request.httpBody = data request.httpBody = data
@@ -102,10 +112,21 @@ public struct Hermes {
let (data, response) = try await session.data(for: request) let (data, response) = try await session.data(for: request)
guard let _ = response as? HTTPURLResponse else { guard let response = response as? HTTPURLResponse else {
throw NetworkError.invalidResponse throw NetworkError.invalidResponse
} }
if response.statusCode != 200 {
switch response.statusCode {
case 404:
throw NetworkError.notFound
case 500:
throw NetworkError.serverError(response.description)
default:
throw NetworkError.invalidResponse
}
}
guard let result = try? JSONDecoder().decode(resource.modelType, from: data) else { guard let result = try? JSONDecoder().decode(resource.modelType, from: data) else {
throw NetworkError.decodingError throw NetworkError.decodingError
} }

View File

@@ -2,11 +2,126 @@ import XCTest
@testable import Hermes @testable import Hermes
final class HermesTests: XCTestCase { final class HermesTests: XCTestCase {
func testExample() throws {
// XCTest Documentation func testGetRequest() async throws {
// https://developer.apple.com/documentation/xctest let hermes = Hermes()
let queryParams = [URLQueryItem(name: "foo", value: "bar")]
// Defining Test Cases and Test Methods let resource = Resource(url: URL(string: "https://httpbin.org/get")!, method: .get(queryParams), modelType: GetResponse.self)
// https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
let getResponse = try await hermes.load(resource)
XCTAssertEqual(getResponse.url, "https://httpbin.org/get?foo=bar")
XCTAssertEqual(getResponse.args.count, 1)
XCTAssertGreaterThan(getResponse.headers.count, 0)
}
func testPostRequest() async throws {
let hermes = Hermes()
let postDatas = try? JSONEncoder().encode(["foo": "bar"])
let resource = Resource(url: URL(string: "https://httpbin.org/post")!, method: .post(postDatas), modelType: PostResponse.self)
let postResponse = try await hermes.load(resource)
XCTAssertEqual(postResponse.url, "https://httpbin.org/post")
XCTAssertEqual(postResponse.args.count, 0)
XCTAssertNotNil(postResponse.json)
XCTAssertEqual(postResponse.json!.count, 1)
XCTAssertGreaterThan(postResponse.headers.count, 0)
}
func testPutRequest() async throws {
let hermes = Hermes()
let postDatas = try? JSONEncoder().encode(["foo": "bar"])
let resource = Resource(url: URL(string: "https://httpbin.org/put")!, method: .put(postDatas), modelType: PostResponse.self)
let putResponse = try await hermes.load(resource)
XCTAssertEqual(putResponse.url, "https://httpbin.org/put")
XCTAssertEqual(putResponse.args.count, 0)
XCTAssertNotNil(putResponse.json)
XCTAssertEqual(putResponse.json!.count, 1)
XCTAssertGreaterThan(putResponse.headers.count, 0)
}
func testPatchRequest() async throws {
let hermes = Hermes()
let postDatas = try? JSONEncoder().encode(["foo": "bar"])
let resource = Resource(url: URL(string: "https://httpbin.org/patch")!, method: .patch(postDatas), modelType: PostResponse.self)
let patchResponse = try await hermes.load(resource)
XCTAssertEqual(patchResponse.url, "https://httpbin.org/patch")
XCTAssertEqual(patchResponse.args.count, 0)
XCTAssertNotNil(patchResponse.json)
XCTAssertEqual(patchResponse.json!.count, 1)
XCTAssertGreaterThan(patchResponse.headers.count, 0)
}
func testDeleteRequest() async throws {
let hermes = Hermes()
let resource = Resource(url: URL(string: "https://httpbin.org/delete")!, method: .delete, modelType: PostResponse.self)
let deleteResponse = try await hermes.load(resource)
XCTAssertEqual(deleteResponse.url, "https://httpbin.org/delete")
XCTAssertEqual(deleteResponse.args.count, 0)
XCTAssertNil(deleteResponse.json)
XCTAssertGreaterThan(deleteResponse.headers.count, 0)
}
func testNotFound() async throws {
let hermes = Hermes()
let resource = Resource(url: URL(string: "https://httpbin.org/status/404")!, method: .get(), modelType: GetResponse.self)
do {
let _ = try await hermes.load(resource)
} catch NetworkError.notFound {
XCTAssert(true)
}
}
func testServerError() async throws {
let hermes = Hermes()
let resource = Resource(url: URL(string: "https://httpbin.org/status/500")!, method: .get(), modelType: GetResponse.self)
do {
let _ = try await hermes.load(resource)
} catch NetworkError.serverError(_) {
XCTAssert(true)
}
}
func testDecodeError() async throws {
let hermes = Hermes()
let resource = Resource(url: URL(string: "https://httpbin.org/get")!, method: .get(), modelType: DummyResponse.self)
do {
let _ = try await hermes.load(resource)
} catch NetworkError.decodingError {
XCTAssert(true)
}
} }
} }
struct GetResponse: Codable {
let args: [String: String]
let headers: [String: String]
let origin: String
let url: String
}
struct PostResponse: Codable {
let args: [String: String]
let data: String
let files: [String: String]
let form: [String: String]
let headers: [String: String]
let json: [String: String]?
let origin: String
let url: String
}
struct DummyResponse: Codable {
let dumb: Int
let dumber: Double
}