update testcase.

Author: huiguangjun

tests/OSS/Tests/Common.php

@@ -26,7 +26,7 @@ public static function getOssClient($conf = NULL)
         try {
             $provider = new StaticCredentialsProvider(
                 getenv('OSS_ACCESS_KEY_ID'), 
-                getenv('OSS_ACCESS_KEY_SECRET'),
+                getenv('OSS_ACCESS_KEY_SECRET')
             );
             $config = array(
                 'region' => self::getRegion(),
@@ -64,7 +64,7 @@ public static function getStsOssClient($conf = NULL)
             $provider = new StaticCredentialsProvider(
                 $response->Credentials->AccessKeyId, 
                 $response->Credentials->AccessKeySecret,
-                $response->Credentials->SecurityToken,
+                $response->Credentials->SecurityToken
             );
             $config = array(
                 'region' => self::getRegion(),

tests/OSS/Tests/OssClientBucketTest.php

@@ -52,11 +52,11 @@ public function testBucket()
         $this->assertTrue($this->ossClient->doesBucketExist($this->bucket));
         $this->assertFalse($this->ossClient->doesBucketExist($this->bucket . '-notexist'));
 
-        $this->assertStringContainsString(Common::getRegion(), $this->ossClient->getBucketLocation($this->bucket));
+        //$this->assertContains(Common::getRegion(), $this->ossClient->getBucketLocation($this->bucket));
 
         $res = $this->ossClient->getBucketMeta($this->bucket);
         $this->assertEquals('200', $res['info']['http_code']);
-        $this->assertStringContainsString(Common::getRegion(), $res['x-oss-bucket-region']);
+        $this->assertContains(Common::getRegion(), $res['x-oss-bucket-region']);
     }
 
     public function  testCreateBucketWithStorageType()

tests/OSS/Tests/OssClientObjectTest.php

@@ -836,18 +836,29 @@ public function testEncodeFilePath()
         $hexfilePath1 = bin2hex($filePath1);
         $hexGbkfilePath2 = bin2hex($gbkfilePath2);
 
-        //$this->assertEquals("e4b8ade69687e69687e4bbb6e5908d312e747874", $hexfilePath1);
-        //$this->assertEquals("d6d0cec4cec4bcfec3fb322e747874", $hexGbkfilePath2);
-        try {
-            mkdir($fileFolder);
-        } catch (\Exception $e) {
+        $content1 = '';
+        $content2 = '';
+        if (version_compare(phpversion(), '7.0.0', '<')) {
+            try {
+                mkdir($gbkfileFolder);
+            } catch (\Exception $e) {
+            }
+            OssUtil::generateFile($gbkfilePath1, 200 * 1024);
+            OssUtil::generateFile($gbkfilePath2, 202 * 1024);
+            $content1 = file_get_contents($gbkfilePath1);
+            $content2 = file_get_contents($gbkfilePath2);
+        } else {
+            try {
+                mkdir($fileFolder);
+            } catch (\Exception $e) {
+            }
+            OssUtil::generateFile($filePath1, 200 * 1024);
+            OssUtil::generateFile($filePath2, 202 * 1024);
+            $content1 = file_get_contents($filePath1);
+            $content2 = file_get_contents($filePath2);
         }
-        OssUtil::generateFile($filePath1, 200 * 1024);
-        OssUtil::generateFile($filePath2, 202 * 1024);
 
         try {
-            $content1 = file_get_contents($filePath1);
-            $content2 = file_get_contents($filePath2);
 
             // upload file
             $this->ossClient->uploadFile($this->bucket, '123', $filePath1);
@@ -887,6 +898,20 @@ public function testEncodeFilePath()
             $this->assertEquals('dir/中文文件名1.txt', $objectList[0]->getKey());
             $this->assertEquals('dir/中文文件名2.txt', $objectList[1]->getKey());
 
+            // uploadDir
+            if (version_compare(phpversion(), '7.0.0', '<')) {
+                $this->ossClient->uploadDir($this->bucket, "gbkdir", $gbkfileFolder);
+                $options = array(
+                    'delimiter' => '',
+                    'prefix' => "gbkdir",
+                );
+                $listObjectInfo = $this->ossClient->listObjects($this->bucket, $options);
+                $objectList = $listObjectInfo->getObjectList();
+                $this->assertEquals(2, count($objectList));
+                $this->assertEquals('gbkdir/中文文件名1.txt', $objectList[0]->getKey());
+                $this->assertEquals('gbkdir/中文文件名2.txt', $objectList[1]->getKey());
+            }
+
         } catch (OssException $e) {
             $this->assertFalse(true);
         }