Skip to content

Fix HTTPBody length calculation for utf8 strings. #60

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.

Sign up for GitHub

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
merged 9 commits into from
Oct 23, 2023
Merged

Fix HTTPBody length calculation for utf8 strings. #60

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
51a1f60
fix utf8 http body issue with strings
tib Oct 23, 2023
93cb61e
equatable httpbody length, utf8 length tests
tib Oct 23, 2023
f9520a5
simplify length calculation
tib Oct 23, 2023
2415b99
assert equal instead of true
tib Oct 23, 2023
37174c6
apply soundness & format
tib Oct 23, 2023
57b7e4c
fix doc comment
tib Oct 23, 2023
7d6fd75
apply swift format 5.8
tib Oct 23, 2023
d220994
remove unnecessary comment
tib Oct 23, 2023
54b191a
remove return doc
tib Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Sources/OpenAPIRuntime/Conversion/ParameterStyles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ extension ParameterStyle {

/// Returns the default value of the explode field for the given style
/// - Parameter style: The parameter style.
/// - Returns: `true` if the style is form, otherwise `false`.
static func defaultExplodeFor(forStyle style: ParameterStyle) -> Bool {
style == .form
}
Expand Down
7 changes: 2 additions & 5 deletions Sources/OpenAPIRuntime/Interface/HTTPBody.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public final class HTTPBody: @unchecked Sendable {
public let iterationBehavior: IterationBehavior

/// Describes the total length of the body, if known.
public enum Length: Sendable {
public enum Length: Sendable, Equatable {

/// Total length not known yet.
case unknown
Expand Down Expand Up @@ -542,10 +542,7 @@ extension HTTPBody {
@inlinable public convenience init(
_ string: some StringProtocol & Sendable
) {
self.init(
ByteChunk(string),
length: .known(string.count)
)
self.init(ByteChunk(string))
}

/// Creates a new body with the provided async throwing stream of strings.
Expand Down
7 changes: 7 additions & 0 deletions Tests/OpenAPIRuntimeTests/Interface/Test_HTTPBody.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,13 @@ final class Test_Body: Test_Runtime {
XCTAssertEqual(chunks, ["hel", "lo"].map { Array($0.utf8)[...] })
}

func testUTF8String() async throws {
XCTAssertEqual(HTTPBody("abc").length, .known(3))
XCTAssertEqual(HTTPBody("🤘").length, .known(4))
XCTAssertEqual(HTTPBody("\u{1f603}").length, .known(4))
XCTAssertEqual(HTTPBody("árvíztűrő tükörfúrógép").length, .known(31))
}

func testIterationBehavior_single() async throws {
let sequence = AsyncStream(
String.self,
Expand Down
1 change: 1 addition & 0 deletions Tests/OpenAPIRuntimeTests/Test_Runtime.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import HTTPTypes

class Test_Runtime: XCTestCase {

/// setUp tests
override func setUp() async throws {
try await super.setUp()
continueAfterFailure = false
Expand Down