@@ -729,51 +729,57 @@ final class HTTPClientTests: XCTestCaseHTTPClientTestsBaseClass {
729
729
var request = try Request ( url: self . defaultHTTPBinURLPrefix + " events/10/content-length " )
730
730
request. headers. add ( name: " Accept " , value: " text/event-stream " )
731
731
732
- let progress =
733
- try TemporaryFileHelpers . withTemporaryFilePath { path -> FileDownloadDelegate . Progress in
732
+ let response =
733
+ try TemporaryFileHelpers . withTemporaryFilePath { path -> FileDownloadDelegate . Response in
734
734
let delegate = try FileDownloadDelegate ( path: path)
735
735
736
- let progress = try self . defaultClient. execute (
736
+ let response = try self . defaultClient. execute (
737
737
request: request,
738
738
delegate: delegate
739
739
)
740
740
. wait ( )
741
741
742
742
try XCTAssertEqual ( 50 , TemporaryFileHelpers . fileSize ( path: path) )
743
743
744
- return progress
744
+ return response
745
745
}
746
746
747
- XCTAssertEqual ( 50 , progress. totalBytes)
748
- XCTAssertEqual ( 50 , progress. receivedBytes)
747
+ XCTAssertEqual ( response. head. status, . ok)
748
+ XCTAssertEqual ( " 50 " , response. head. headers. first ( name: " content-length " ) )
749
+
750
+ XCTAssertEqual ( 50 , response. totalBytes)
751
+ XCTAssertEqual ( 50 , response. receivedBytes)
749
752
}
750
753
751
754
func testFileDownloadError( ) throws {
752
755
var request = try Request ( url: self . defaultHTTPBinURLPrefix + " not-found " )
753
756
request. headers. add ( name: " Accept " , value: " text/event-stream " )
754
757
755
- let progress =
756
- try TemporaryFileHelpers . withTemporaryFilePath { path -> FileDownloadDelegate . Progress in
758
+ let response =
759
+ try TemporaryFileHelpers . withTemporaryFilePath { path -> FileDownloadDelegate . Response in
757
760
let delegate = try FileDownloadDelegate (
758
761
path: path,
759
762
reportHead: {
760
763
XCTAssertEqual ( $0. status, . notFound)
761
764
}
762
765
)
763
766
764
- let progress = try self . defaultClient. execute (
767
+ let response = try self . defaultClient. execute (
765
768
request: request,
766
769
delegate: delegate
767
770
)
768
771
. wait ( )
769
772
770
773
XCTAssertFalse ( TemporaryFileHelpers . fileExists ( path: path) )
771
774
772
- return progress
775
+ return response
773
776
}
774
777
775
- XCTAssertEqual ( nil , progress. totalBytes)
776
- XCTAssertEqual ( 0 , progress. receivedBytes)
778
+ XCTAssertEqual ( response. head. status, . notFound)
779
+ XCTAssertFalse ( response. head. headers. contains ( name: " content-length " ) )
780
+
781
+ XCTAssertEqual ( nil , response. totalBytes)
782
+ XCTAssertEqual ( 0 , response. receivedBytes)
777
783
}
778
784
779
785
func testFileDownloadCustomError( ) throws {
@@ -3910,23 +3916,27 @@ final class HTTPClientTests: XCTestCaseHTTPClientTestsBaseClass {
3910
3916
var request = try Request ( url: self . defaultHTTPBinURLPrefix + " chunked " )
3911
3917
request. headers. add ( name: " Accept " , value: " text/event-stream " )
3912
3918
3913
- let progress =
3919
+ let response =
3914
3920
try TemporaryFileHelpers . withTemporaryFilePath { path -> FileDownloadDelegate . Progress in
3915
3921
let delegate = try FileDownloadDelegate ( path: path)
3916
3922
3917
- let progress = try self . defaultClient. execute (
3923
+ let response = try self . defaultClient. execute (
3918
3924
request: request,
3919
3925
delegate: delegate
3920
3926
)
3921
3927
. wait ( )
3922
3928
3923
3929
try XCTAssertEqual ( 50 , TemporaryFileHelpers . fileSize ( path: path) )
3924
3930
3925
- return progress
3931
+ return response
3926
3932
}
3927
3933
3928
- XCTAssertEqual ( nil , progress. totalBytes)
3929
- XCTAssertEqual ( 50 , progress. receivedBytes)
3934
+ XCTAssertEqual ( . ok, response. head. status)
3935
+ XCTAssertEqual ( " chunked " , response. head. headers. first ( name: " transfer-encoding " ) )
3936
+ XCTAssertFalse ( response. head. headers. contains ( name: " content-length " ) )
3937
+
3938
+ XCTAssertEqual ( nil , response. totalBytes)
3939
+ XCTAssertEqual ( 50 , response. receivedBytes)
3930
3940
}
3931
3941
3932
3942
func testCloseWhileBackpressureIsExertedIsFine( ) throws {
0 commit comments