Skip to content

Fix progressHandler to work properly#236

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
ishkawa merged 1 commit into from
Mar 30, 2017
Merged

Fix progressHandler to work properly #236

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Sources/APIKit/SessionAdapter/URLSessionAdapter.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ open class URLSessionAdapter: NSObject, SessionAdapter, URLSessionDelegate, URLS
}

private func progressHandler(for task: URLSessionTask) -> ((Int64, Int64, Int64) -> Void)? {
return objc_getAssociatedObject(task, &taskAssociatedObjectCompletionHandlerKey) as? (Int64, Int64, Int64) -> Void
return objc_getAssociatedObject(task, &taskAssociatedObjectProgressHandlerKey) as? (Int64, Int64, Int64) -> Void
}
// MARK: URLSessionTaskDelegate
open func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
Expand Down
11 changes: 3 additions & 8 deletions Tests/APIKitTests/SessionAdapterType/URLSessionAdapterSubclassTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,14 +64,9 @@ class URLSessionAdapterSubclassTests: XCTestCase {
let adapter = SessionAdapter(configuration: configuration)
let session = Session(adapter: adapter)

session.send(request,
completionHandler: { result in
if case .failure = result {
XCTFail()
}

expectation.fulfill()
})
session.send(request, progressHandler: { _, _, _ in
expectation.fulfill()
})

waitForExpectations(timeout: 10.0, handler: nil)
XCTAssertEqual(adapter.functionCallFlags["urlSession(_:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:)"], true)
Expand Down