update TestResume

Author: lewzylu

src/Qcloud/Cos/Client.php

@@ -179,6 +179,7 @@ public function resumeUpload($bucket, $key, $body, $uploadId, $options = array()
         $multipartUpload = new MultipartUpload($this, $body, array(
                 'Bucket' => $bucket,
                 'Key' => $key,
+                'UploadId' => $uploadId,
             ) + $options);
 
         $rt = $multipartUpload->resumeUploading();

src/Qcloud/Cos/MultipartUpload.php

@@ -71,13 +71,12 @@ public function resumeUploading() {
                 'Bucket'=>$this->options['Bucket'],
                 'Key'=>$this->options['Key']));
                 $parts = array();
-        $offset = $this->partSize;
         if (count($rt['Parts']) > 0) {
             foreach ($rt['Parts'] as $part) {
                 $parts[$part['PartNumber'] - 1] = array('PartNumber' => $part['PartNumber'], 'ETag' => $part['ETag']);
             }
         }
-        for ($partNumber = 1;;++$partNumber,$offset+=$body->getSize()) {
+        for ($partNumber = 1;;++$partNumber) {
             if ($this->body->eof()) {
                 break;
             }
@@ -88,7 +87,6 @@ public function resumeUploading() {
                 if (md5($body) != substr($parts[$partNumber-1]['ETag'], 1, -1)){
                     throw new CosException("ETag check inconsistency");
                 }
-                $body->setOffset($offset);
                 continue;
             }
 

src/Qcloud/Cos/Tests/Test.php

@@ -10,8 +10,6 @@ class COSTest extends \PHPUnit_Framework_TestCase
     private $cosClient;
     private $bucket;
     private $region;
-    private $message;
-    private $ass;
     protected function setUp()
     {
         $this->bucket = getenv('COS_BUCKET');
@@ -1033,6 +1031,38 @@ public function testUploadLargeObject() {
         }
     }
 
+    /*
+     * 断点重传
+     * 200
+     */
+    public function testResumeUpload() {
+        try {
+            $key = '你好.txt';
+            $body = $this->generateRandomString(3*1024*1024+1023);
+            $partSize = 1024 * 1024 + 1;
+            $md5 = base64_encode(md5($body, true));
+            $rt = $this->cosClient->CreateMultipartUpload(['Bucket' => $this->bucket,
+                                                           'Key' => $key]);
+            $uploadId = $rt['UploadId'];
+            $this->cosClient->uploadPart(['Bucket' => $this->bucket,
+                                          'Key' => $key,
+                                          'Body' => substr($body, 0, $partSize),
+                                          'UploadId' => $uploadId,
+                                          'PartNumber' => 1]);
+            $this->cosClient->resumeUpload($bucket=$this->bucket,
+                                           $key=$key,
+                                           $body=$body,
+                                           $uploadId=$uploadId,
+                                           $options=['PartSize'=>$partSize]);
+            $rt = $this->cosClient->getObject(['Bucket'=>$this->bucket, 'Key'=>$key]);
+            $download_md5 = base64_encode(md5($rt['Body'], true));
+            $this->assertEquals($md5, $download_md5);
+        } catch (ServiceResponseException $e) {
+            print $e;
+            $this->assertFalse(TRUE);
+        }
+    }
+
     /*
      * 下载文件
      * 200