Merge pull request #96 from lintianzhi/fix/uint32_crcValue

crc32
qiniu · Sep 29, 2014 · e6098a7 · e6098a7
2 parents 91fae46 + 549fba6
commit e6098a7
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 4 deletions.
diff --git a/QiniuSDK/QiniuBlkputRet.h b/QiniuSDK/QiniuBlkputRet.h
@@ -12,7 +12,7 @@
 @property (copy, nonatomic) NSString* host;
 @property (copy, nonatomic) NSString* ctx;
 @property (copy, nonatomic) NSString* checksum;
-@property int crc32;
+@property UInt32 crc32;
 @property int offset;
 
 @end
diff --git a/QiniuSDK/QiniuBlockUploader.m b/QiniuSDK/QiniuBlockUploader.m
@@ -67,7 +67,7 @@ - (void) postChunk:(NSData *)chunk
         progress.ctx = [putRet objectForKey:@"ctx"];
         progress.host = [putRet objectForKey:@"host"];
         progress.checksum = [putRet objectForKey:@"checksum"];
-        progress.crc32 = [[putRet objectForKey:@"crc32"] intValue];
+        progress.crc32 = [[putRet objectForKey:@"crc32"] unsignedIntValue];
         progress.offset = [[putRet objectForKey:@"offset"] intValue];
         *error = nil;
     } else {

diff --git a/QiniuSDK/QiniuSDKTests/QiniuSDKTests.h b/QiniuSDK/QiniuSDKTests/QiniuSDKTests.h
@@ -10,7 +10,7 @@
 
 @interface QiniuSDKTests : SenTestCase<QiniuUploadDelegate>
 {
-    bool _done;
+    bool _done, _succeed;
     bool _progressReceived;
     NSString *_filePath;
     NSString *_token;

diff --git a/QiniuSDK/QiniuSDKTests/QiniuSDKTests.m b/QiniuSDK/QiniuSDKTests/QiniuSDKTests.m
@@ -54,6 +54,14 @@ - (void)setUp
     _token = [policy makeToken:QiniuAccessKey secretKey:QiniuSecretKey];
 
     _done = false;
+    _succeed = false;
+    _progressReceived = false;
+}
+
+- (void)reset
+{
+    _done = false;
+    _succeed = false;
     _progressReceived = false;
 }
 
@@ -87,6 +95,7 @@ - (void)uploadProgressUpdated:(NSString *)theFilePath percent:(float)percent
 - (void)uploadSucceeded:(NSString *)theFilePath ret:(NSDictionary *)ret
 {
     _done = true;
+    _succeed = true;
     NSLog(@"Upload Succeeded: %@ - Ret: %@", theFilePath, ret);
 }
 
@@ -118,23 +127,29 @@ - (void) waitFinish {
 
 - (void) testSimpleUpload
 {
+    [self reset];
     QiniuSimpleUploader *uploader = [QiniuSimpleUploader uploaderWithToken:_token];
     uploader.delegate = self;
     [uploader uploadFile:_filePath key:[NSString stringWithFormat:@"test-%@.png", [self timeString]] extra:nil];
     [self waitFinish];
+    STAssertTrue(_succeed, @"upload should succeed");
+
 }
 
 - (void) testSimpleUploadWithUndefinedKey
 {
+    [self reset];
     QiniuSimpleUploader *uploader = [QiniuSimpleUploader uploaderWithToken:_token];
     uploader.delegate = self;
     [uploader uploadFile:_filePath key:kQiniuUndefinedKey extra:nil];
     [self waitFinish];
+    STAssertTrue(_succeed, @"upload should succeed");
 }
 
 
 - (void) testSimpleUploadWithReturnBodyAndUserParams
 {
+    [self reset];
     QiniuPutPolicy *policy = [[QiniuPutPolicy new] autorelease];
     policy.expires = 3600;
     policy.scope = QiniuBucketName;
@@ -152,10 +167,12 @@ - (void) testSimpleUploadWithReturnBodyAndUserParams
     // upload
     [uploader uploadFile:_filePath key:[NSString stringWithFormat:@"test-%@.png", [self timeString]] extra:extra];
     [self waitFinish];
+    STAssertTrue(_succeed, @"upload should succeed");
 }
 
 - (void) testSimpleUploadWithWrongCrc32
 {
+    [self reset];
     QiniuSimpleUploader *uploader = [QiniuSimpleUploader uploaderWithToken:_token];
     uploader.delegate = self;
 
@@ -167,10 +184,12 @@ - (void) testSimpleUploadWithWrongCrc32
     // upload
     [uploader uploadFile:_filePath key:[NSString stringWithFormat:@"test-%@.png", [self timeString]] extra:extra];
     [self waitFinish];
+    STAssertFalse(_succeed, @"upload should fail");
 }
 
 - (void) testSimpleUploadWithRightCrc32
 {
+    [self reset];
     QiniuSimpleUploader *uploader = [QiniuSimpleUploader uploaderWithToken:_token];
     uploader.delegate = self;
 
@@ -187,10 +206,40 @@ - (void) testSimpleUploadWithRightCrc32
     // upload
     [uploader uploadFile:_filePath key:[NSString stringWithFormat:@"test-%@.png", [self timeString]] extra:extra];
     [self waitFinish];
+    STAssertTrue(_succeed, @"upload should succeed");
+}
+
+- (void) testSimpleUploadWithNegativeCrc32
+{
+    [self reset];
+    QiniuSimpleUploader *uploader = [QiniuSimpleUploader uploaderWithToken:_token];
+    uploader.delegate = self;
+
+    // calc right crc32 value
+  //  NSData *buffer = [NSData dataWithContentsOfFile:_filePath];
+
+    NSData *buffer = [@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding];
+    uLong crc = crc32(0L, Z_NULL, 0);
+    crc = crc32(crc, [buffer bytes], [buffer length]);
+
+    // extra argument with right crc32
+    QiniuPutExtra *extra = [[[QiniuPutExtra alloc] init] autorelease];
+    extra.crc32 = crc;
+    extra.checkCrc = 1;
+    NSLog(@"crc32: %lu", crc);
+
+    NSString *crcpath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"testcrc"];
+    [buffer writeToFile:_filePath atomically:TRUE];
+
+    // upload
+    [uploader uploadFile:crcpath key:[NSString stringWithFormat:@"test-%@.png", [self timeString]] extra:extra];
+    [self waitFinish];
+    STAssertTrue(_succeed, @"upload should succeed");
 }
 
 - (void) testResumableUpload
 {
+    [self reset];
     QiniuResumableUploader *uploader = [QiniuResumableUploader instanceWithToken: _token];
     uploader.delegate = self;
     NSString *key = [NSString stringWithFormat:@"test-%@.png", [self timeString]];
@@ -209,6 +258,7 @@ - (void) testResumableUpload
     [uploader uploadFile:_filePath key:key params:params];
     NSLog(@"key: %@\n", key);
     [self waitFinish];
+    STAssertTrue(_succeed, @"upload should succeed");
 }
 
 @end
diff --git a/QiniuSDK/QiniuSimpleUploader.m b/QiniuSDK/QiniuSimpleUploader.m
@@ -98,7 +98,7 @@ - (void) uploadFile:(NSString *)filePath
     if (extra) {
         mimeType = extra.mimeType;
         if (extra.checkCrc == 1) {
-            [_request addPostValue: [NSString stringWithFormat:@"%ld", extra.crc32] forKey:@"crc32"];
+            [_request addPostValue: [NSString stringWithFormat:@"%lu", extra.crc32] forKey:@"crc32"];
         }
         for (NSString *key in extra.params) {
             [_request addPostValue:[extra.params objectForKey:key] forKey:key];