Fix progress handlers called with fractionCompleted == 1 several times

Setting the expectation to nil after it is fulfilled in order to avoid `*** Assertion failure in -[XCTestExpectation fulfill]` was just hiding the real issue.
joshhua · Sep 23, 2016 · cd5cd6e · cd5cd6e
1 parent 6aa6a3b
commit cd5cd6e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/AFNetworking/AFURLSessionManager.m b/AFNetworking/AFURLSessionManager.m
@@ -285,8 +285,8 @@ - (void)URLSession:(__unused NSURLSession *)session
           dataTask:(__unused NSURLSessionDataTask *)dataTask
     didReceiveData:(NSData *)data
 {
-    self.downloadProgress.completedUnitCount = dataTask.countOfBytesReceived;
     self.downloadProgress.totalUnitCount = dataTask.countOfBytesExpectedToReceive;
+    self.downloadProgress.completedUnitCount = dataTask.countOfBytesReceived;
 
     [self.mutableData appendData:data];
 }
@@ -296,8 +296,8 @@ - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task
     totalBytesSent:(int64_t)totalBytesSent
 totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend{
 
-    self.uploadProgress.completedUnitCount = task.countOfBytesSent;
     self.uploadProgress.totalUnitCount = task.countOfBytesExpectedToSend;
+    self.uploadProgress.completedUnitCount = task.countOfBytesSent;
 }
 
 #pragma mark - NSURLSessionDownloadDelegate

diff --git a/Tests/Tests/AFHTTPSessionManagerTests.m b/Tests/Tests/AFHTTPSessionManagerTests.m
@@ -228,7 +228,7 @@ - (void)testCanBeCopied {
 #pragma mark - Progress
 
 - (void)testDownloadProgressIsReportedForGET {
-    XCTestExpectation *expectation = [self expectationWithDescription:@"Progress Should equal 1.0"];
+    __weak XCTestExpectation *expectation = [self expectationWithDescription:@"Progress Should equal 1.0"];
     [self.manager
      GET:@"image"
      parameters:nil
@@ -248,15 +248,14 @@ - (void)testUploadProgressIsReportedForPOST {
         [payload appendString:@"AFNetworking"];
     }
 
-    __weak __block XCTestExpectation *expectation = [self expectationWithDescription:@"Progress Should equal 1.0"];
+    __weak XCTestExpectation *expectation = [self expectationWithDescription:@"Progress Should equal 1.0"];
 
     [self.manager
      POST:@"post"
      parameters:payload
      progress:^(NSProgress * _Nonnull uploadProgress) {
          if (uploadProgress.fractionCompleted == 1.0) {
              [expectation fulfill];
-             expectation = nil;
          }
      }
      success:nil
@@ -270,7 +269,7 @@ - (void)testUploadProgressIsReportedForStreamingPost {
         [payload appendString:@"AFNetworking"];
     }
 
-    __block __weak XCTestExpectation *expectation = [self expectationWithDescription:@"Progress Should equal 1.0"];
+    __weak XCTestExpectation *expectation = [self expectationWithDescription:@"Progress Should equal 1.0"];
 
     [self.manager
      POST:@"post"
@@ -281,7 +280,6 @@ - (void)testUploadProgressIsReportedForStreamingPost {
      progress:^(NSProgress * _Nonnull uploadProgress) {
          if (uploadProgress.fractionCompleted == 1.0) {
              [expectation fulfill];
-             expectation = nil;
          }
      }
      success:nil

diff --git a/Tests/Tests/AFURLSessionManagerTests.m b/Tests/Tests/AFURLSessionManagerTests.m
@@ -140,7 +140,7 @@ - (void)testUploadTaskDoesReportProgress {
             fromData:[payload dataUsingEncoding:NSUTF8StringEncoding]
             progress:^(NSProgress * _Nonnull uploadProgress) {
                 NSLog(@"%@", uploadProgress.localizedDescription);
-                if ([uploadProgress fractionCompleted] == 1.0) {
+                if (uploadProgress.fractionCompleted == 1.0) {
                     [expectation fulfill];
                 }
             }