Skip to content

Commit cb4347c

Browse files
yangzong18huiguangjun
authored andcommitted
refine path style test
1 parent f630c2c commit cb4347c

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

tests/OSS/Tests/OssClientForcePathStyleTest.php

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,32 @@ class OssClientForcePathStyleTest extends TestOssClientBase
1616
{
1717
public function testForcePathStyle()
1818
{
19-
$accessKeyId = getenv("OSS_ACCESS_KEY_ID");
20-
$accessKeySecret = getenv("OSS_ACCESS_KEY_SECRET");
21-
$endpoint = getenv('OSS_ENDPOINT');
22-
$provider = new StaticCredentialsProvider($accessKeyId, $accessKeySecret);
2319
$config = array(
24-
'endpoint' => $endpoint,
25-
'provider' => $provider,
20+
'signatureVersion' => OssClient::OSS_SIGNATURE_VERSION_V4,
2621
'hostType' => OssClient::OSS_HOST_TYPE_PATH_STYLE,
2722
);
28-
$ossClient = new OssClient($config);
23+
$this->ossClient = Common::getOssClient($config);
24+
2925
try {
30-
$ossClient->getBucketInfo($this->bucket);
26+
$this->ossClient->getBucketInfo($this->bucket);
3127
} catch (OssException $e) {
3228
$this->assertEquals($e->getErrorCode(), "SecondLevelDomainForbidden");
3329
$this->assertTrue(true);
3430
}
3531

3632
try {
3733
$object = "oss-php-sdk-test/upload-test-object-name.txt";
38-
$ossClient->putObject($this->bucket, $object, 'hi oss');
34+
$this->ossClient->putObject($this->bucket, $object, 'hi oss');
3935
} catch (OssException $e) {
4036
$this->assertEquals($e->getErrorCode(), "SecondLevelDomainForbidden");
4137
$this->assertTrue(true);
4238
}
4339

4440
try {
45-
$strUrl = $endpoint . "/" . $this->bucket . "/" . $object;
46-
$signUrl = $ossClient->signUrl($this->bucket, $object, 3600);
41+
$endpoint = Common::getEndpoint();
42+
$endpoint = str_replace(array('http://', 'https://'), '', $endpoint);
43+
$strUrl = $this->bucket . '.' . $endpoint . "/" . $object;
44+
$signUrl = $this->ossClient->signUrl($this->bucket, $object, 3600);
4745
$this->assertTrue(strpos($signUrl, $strUrl) !== false);
4846
} catch (OssException $e) {
4947
$this->assertFalse(true);

0 commit comments

Comments
 (0)