Merge pull request #62 from qiniu/develop

Release 6.2.5

Author: longbai

QiniuSDK/QiniuUtils.m

@@ -18,7 +18,7 @@
     NSDictionary *dic = nil;
     NSError *httpError = nil;
     long errorCode = 400;
-    
+
     if (request) {
         NSDictionary *responseObj = request.responseObject;
         if ([responseObj isKindOfClass:NSDictionary.class]) {
@@ -27,7 +27,7 @@
         httpError = [request error];
         errorCode = [request response].statusCode;
     }
-    
+
     NSString *errorDescription = nil;
     if (dic) { // Check if there is response content.
         NSObject *errorObj = [dic objectForKey:kQiniuErrorKey];
@@ -39,11 +39,12 @@
         errorCode = [httpError code];
         errorDescription = [httpError localizedDescription];
     }
-    
-    NSDictionary *userInfo = nil;
+
+    NSString *reqid = [[request.response allHeaderFields] objectForKey:@"X-Reqid"];
+    NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObject:reqid forKey:@"reqid"];
     if (errorDescription) {
-        userInfo = [NSDictionary dictionaryWithObject:errorDescription forKey:kQiniuErrorKey];
+        [userInfo setObject:errorDescription forKey:kQiniuErrorKey];
     }
-    
+
     return [NSError errorWithDomain:kQiniuErrorDomain code:errorCode userInfo:userInfo];
 }

QiniuSDKTests/QiniuSDKTests.m

@@ -110,6 +110,15 @@ - (void) testSimpleUpload
     XCTAssertEqual(_succeed, YES, "SimpleUpload failed, error: %@", _error);
 }
 
+- (void) testSimpleUploadFailed
+{
+    QiniuSimpleUploader *uploader = [QiniuSimpleUploader uploaderWithToken:@""];
+    uploader.delegate = self;
+    [uploader uploadFile:_filePath key:[NSString stringWithFormat:@"test-%@.png", [self timeString]] extra:nil];
+    [self waitFinish];
+    XCTAssertEqual(NO, NO, "SimpleUpload should failed, error: %@", _error);
+}
+
 
 - (void) testSimpleUploadWithUndefinedKey
 {