提交的内容

vendor/aliyuncs/oss-sdk-php/tests/OSS/Tests/CallbackTest.php

@@ -44,27 +44,26 @@ class CallbackTest extends TestOssClientBase
         /**
          * step 3.
          */
-        $json = 
-        '{
-            "callbackUrl":"'.Common::getCallbackUrl().'",'.
-        '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+        $json =
+            '{
+            "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
             "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
             "callbackBodyType":"application/json"
         }';
-            
-       $var = 
-       '{
+
+        $var =
+            '{
            "x:var1":"value1",
            "x:var2":"值2"
        }';
-       $options = array(OssClient::OSS_CALLBACK => $json,
-                        OssClient::OSS_CALLBACK_VAR => $var
-                       );
+        $options = array(OssClient::OSS_CALLBACK => $json,
+            OssClient::OSS_CALLBACK_VAR => $var
+        );
 
         try {
             $result = $this->ossClient->completeMultipartUpload($this->bucket, $object, $upload_id, $upload_parts, $options);
             $this->assertEquals("200", $result['info']['http_code']);
-            $this->assertEquals("{\"Status\":\"OK\"}", $result['body']);
         } catch (OssException $e) {
             $this->assertTrue(false);
         }
@@ -104,24 +103,24 @@ class CallbackTest extends TestOssClientBase
         /**
          * step 3.
          */
-        
-        $json = 
-        '{
+
+        $json =
+            '{
             "callbackUrl":"www.baidu.com",
             "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
             "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
             "callbackBodyType":"application/json"
         }';
-            
-       $var = 
-       '{
+
+        $var =
+            '{
        "x:var1":"value1",
        "x:var2":"值2"
        }';
-       $options = array(OssClient::OSS_CALLBACK => $json,
-                        OssClient::OSS_CALLBACK_VAR => $var
-                       );
-        
+        $options = array(OssClient::OSS_CALLBACK => $json,
+            OssClient::OSS_CALLBACK_VAR => $var
+        );
+
         try {
             $result = $this->ossClient->completeMultipartUpload($this->bucket, $object, $upload_id, $upload_parts, $options);
             $this->assertTrue(false);
@@ -131,39 +130,39 @@ class CallbackTest extends TestOssClientBase
         }
 
     }
-   
+
     public function testPutObjectCallbackNormal()
     {
         //json
         {
-            $json = 
-            '{
-                "callbackUrl":"'.Common::getCallbackUrl().'",'.
-            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+            $json =
+                '{
+                "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+                '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size}}",
                 "callbackBodyType":"application/json"
             }';
             $options = array(OssClient::OSS_CALLBACK => $json);
             $this->putObjectCallbackOk($options, "200");
-       }
-       //url
-       {
-            $url = 
-            '{
-                "callbackUrl":"'.Common::getCallbackUrl().'",'.
-            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+        }
+        //url
+        {
+            $url =
+                '{
+                "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+                '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}",
                 "callbackBodyType":"application/x-www-form-urlencoded"
             }';
             $options = array(OssClient::OSS_CALLBACK => $url);
             $this->putObjectCallbackOk($options, "200");
-        } 
+        }
         // Unspecified typre 
-       {
-            $url = 
-            '{
-                "callbackUrl":"'.Common::getCallbackUrl().'",'.
-            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+        {
+            $url =
+                '{
+                "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+                '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}"
             }';
             $options = array(OssClient::OSS_CALLBACK => $url);
@@ -171,10 +170,10 @@ class CallbackTest extends TestOssClientBase
         }
         //json and body is chinese
         {
-            $json = 
-            '{
-                "callbackUrl":"'.Common::getCallbackUrl().'",'.
-            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+            $json =
+                '{
+                "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+                '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\" 春水碧于天，画船听雨眠。\":\"垆边人似月，皓腕凝霜雪。\"}",
                 "callbackBodyType":"application/json"
             }';
@@ -183,10 +182,10 @@ class CallbackTest extends TestOssClientBase
         }
         //url and body is chinese
         {
-            $url = 
-            '{
-                "callbackUrl":"'.Common::getCallbackUrl().'",'.
-            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+            $url =
+                '{
+                "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+                '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"春水碧于天，画船听雨眠。垆边人似月，皓腕凝霜雪",
                 "callbackBodyType":"application/x-www-form-urlencoded"
             }';
@@ -195,51 +194,51 @@ class CallbackTest extends TestOssClientBase
         }
         //json and add callback_var
         {
-            $json = 
-            '{
-                "callbackUrl":"'.Common::getCallbackUrl().'",'.
-            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+            $json =
+                '{
+                "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+                '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size},\"x:var1\":${x:var1},\"x:var2\":${x:var2}}",
                 "callbackBodyType":"application/json"
             }';
-            
-            $var = 
-            '{
+
+            $var =
+                '{
                 "x:var1":"value1",
                 "x:var2":"aliyun.com"
             }';
             $options = array(OssClient::OSS_CALLBACK => $json,
-                             OssClient::OSS_CALLBACK_VAR => $var
-                             );
+                OssClient::OSS_CALLBACK_VAR => $var
+            );
             $this->putObjectCallbackOk($options, "200");
         }
         //url and add callback_var
         {
-            $url = 
-            '{
-                "callbackUrl":"'.Common::getCallbackUrl().'",'.
-            '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
+            $url =
+                '{
+                "callbackUrl":"' . Common::getCallbackUrl() . '",' .
+                '   "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}&my_var1=${x:var1}&my_var2=${x:var2}",
                 "callbackBodyType":"application/x-www-form-urlencoded"
             }';
-            $var = 
-            '{
+            $var =
+                '{
                 "x:var1":"value1凌波不过横塘路，但目送，芳",
                 "x:var2":"值2"
             }';
             $options = array(OssClient::OSS_CALLBACK => $url,
-                             OssClient::OSS_CALLBACK_VAR => $var
-                            );
+                OssClient::OSS_CALLBACK_VAR => $var
+            );
             $this->putObjectCallbackOk($options, "200");
         }
 
     }
 
     public function testPutCallbackWithCallbackFailed()
-    { 
+    {
         {
-            $json = 
-            '{
+            $json =
+                '{
                 "callbackUrl":"http://www.baidu.com",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"{\"mimeType\":${mimeType},\"size\":${size}}",
@@ -250,13 +249,13 @@ class CallbackTest extends TestOssClientBase
         }
 
         {
-            $url = 
-            '{
+            $url =
+                '{
                 "callbackUrl":"http://www.baidu.com",
                 "callbackHost":"oss-cn-hangzhou.aliyuncs.com",
                 "callbackBody":"bucket=${bucket}&object=${object}&etag=${etag}&size=${size}&mimeType=${mimeType}&imageInfo.height=${imageInfo.height}&imageInfo.width=${imageInfo.width}&imageInfo.format=${imageInfo.format}&my_var1=${x:var1}&my_var2=${x:var2}",
                 "callbackBodyType":"application/x-www-form-urlencoded"
-            }';      
+            }';
             $options = array(OssClient::OSS_CALLBACK => $url);
             $this->putObjectCallbackFailed($options, "203");
         }
@@ -270,7 +269,6 @@ class CallbackTest extends TestOssClientBase
         try {
             $result = $this->ossClient->putObject($this->bucket, $object, $content, $options);
             $this->assertEquals($status, $result['info']['http_code']);
-            $this->assertEquals("{\"Status\":\"OK\"}", $result['body']);
         } catch (OssException $e) {
             $this->assertFalse(true);
         }
@@ -292,5 +290,8 @@ class CallbackTest extends TestOssClientBase
     protected function setUp(): void
     {
         parent::setUp();
+        if (strlen(Common::getCallbackUrl()) == 0) {
+            throw new OssException("callback url can not be empty!");
+        }
     }
 }