Skip to content

Fix macOS test crash: read httpBodyStream when httpBody is nil #3

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

Open
jonathan-kosgei wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix macOS test crash: read httpBodyStream when httpBody is nil #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion Tests/IPDataTests/IPDataClientTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,25 @@ final class IPDataClientTests: XCTestCase {
XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/json")
XCTAssertEqual(request.value(forHTTPHeaderField: "api-key"), "test-api-key")

let body = try! JSONDecoder().decode([String].self, from: request.httpBody!)
// On macOS, URLProtocol delivers the body via httpBodyStream instead of httpBody.
let bodyData: Data
if let httpBody = request.httpBody {
bodyData = httpBody
} else if let stream = request.httpBodyStream {
stream.open()
var buffer = [UInt8](repeating: 0, count: 1024)
var collected = Data()
while stream.hasBytesAvailable {
let read = stream.read(&buffer, maxLength: buffer.count)
if read <= 0 { break }
collected.append(buffer, count: read)
}
stream.close()
bodyData = collected
} else {
XCTFail("Expected HTTP body"); return (HTTPURLResponse(), Data())
}
let body = try! JSONDecoder().decode([String].self, from: bodyData)
XCTAssertEqual(body, ["1.1.1.1", "8.8.8.8"])

let response = HTTPURLResponse(url: request.url!, statusCode: 200, httpVersion: nil, headerFields: nil)!
Expand Down
Loading