-
Notifications
You must be signed in to change notification settings - Fork 50
Conform RuntimeError to HTTPResponseConvertible #135
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
simonjbeaumont
merged 7 commits into
apple:main
from
gayathrisairam:runtime_error_codes
Dec 20, 2024
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cd80496
Confirm RuntimeErrors to HTTPResponseConvertible
f440264
Confirm RuntimeErrors to HTTPResponseConvertible
52618bb
Review comments and swift-format changes
4251d32
Merge branch 'main' into runtime_error_codes
gayathrisairam c68e5d4
Merge branch 'main' into runtime_error_codes
gayathrisairam f0a8282
Fix unit test formatting issues
79bd32a
Fix typos
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// This source file is part of the SwiftOpenAPIGenerator open source project | ||
// | ||
// Copyright (c) 2024 Apple Inc. and the SwiftOpenAPIGenerator project authors | ||
// Licensed under Apache License v2.0 | ||
// | ||
// See LICENSE.txt for license information | ||
// See CONTRIBUTORS.txt for the list of SwiftOpenAPIGenerator project authors | ||
// | ||
// SPDX-License-Identifier: Apache-2.0 | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
import HTTPTypes | ||
@_spi(Generated) @testable import OpenAPIRuntime | ||
import XCTest | ||
|
||
struct MockRuntimeErrorHandler: Sendable { | ||
var failWithError: (any Error)? = nil | ||
func greet(_ input: String) async throws -> String { | ||
if let failWithError { throw failWithError } | ||
guard input == "hello" else { throw TestError() } | ||
return "bye" | ||
} | ||
|
||
static let requestBody: HTTPBody = HTTPBody("hello") | ||
static let responseBody: HTTPBody = HTTPBody("bye") | ||
} | ||
|
||
final class Test_RuntimeError: XCTestCase { | ||
func testRuntimeError_withUnderlyingErrorNotConforming_returns500() async throws { | ||
let server = UniversalServer( | ||
handler: MockRuntimeErrorHandler(failWithError: RuntimeError.transportFailed(TestError())), | ||
middlewares: [ErrorHandlingMiddleware()] | ||
) | ||
let response = try await server.handle( | ||
request: .init(soar_path: "/", method: .post), | ||
requestBody: MockHandler.requestBody, | ||
metadata: .init(), | ||
forOperation: "op", | ||
using: { MockRuntimeErrorHandler.greet($0) }, | ||
deserializer: { request, body, metadata in | ||
let body = try XCTUnwrap(body) | ||
return try await String(collecting: body, upTo: 10) | ||
}, | ||
serializer: { output, _ in fatalError() } | ||
) | ||
XCTAssertEqual(response.0.status, .internalServerError) | ||
} | ||
|
||
func testRuntimeError_withUnderlyingErrorConforming_returnsCorrectStatusCode() async throws { | ||
let server = UniversalServer( | ||
handler: MockRuntimeErrorHandler(failWithError: TestErrorConvertible.testError("Test Error")), | ||
middlewares: [ErrorHandlingMiddleware()] | ||
) | ||
let response = try await server.handle( | ||
request: .init(soar_path: "/", method: .post), | ||
requestBody: MockHandler.requestBody, | ||
metadata: .init(), | ||
forOperation: "op", | ||
using: { MockRuntimeErrorHandler.greet($0) }, | ||
deserializer: { request, body, metadata in | ||
let body = try XCTUnwrap(body) | ||
return try await String(collecting: body, upTo: 10) | ||
}, | ||
serializer: { output, _ in fatalError() } | ||
) | ||
XCTAssertEqual(response.0.status, .badGateway) | ||
} | ||
} | ||
|
||
enum TestErrorConvertible: Error, HTTPResponseConvertible { | ||
case testError(String) | ||
/// HTTP status code for error cases | ||
public var httpStatus: HTTPTypes.HTTPResponse.Status { .badGateway } | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.