Skip to content

Commit 3a98fc2

Browse files
author
unknown
committed
refine test cases
1 parent d956f9c commit 3a98fc2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1250
-1434
lines changed

‎src/main/java/com/aliyun/oss/OSS.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ public List<LiveRecord> getLiveChannelHistory(LiveChannelGenericRequest liveChan
16231623
* @throws OSSException OSS Server异常信息。
16241624
* @throws ClientException OSS Client异常信息。
16251625
*/
1626-
public void GenerateVodPlaylist(String bucketName, String liveChannelName, String PlaylistName,
1626+
public void generateVodPlaylist(String bucketName, String liveChannelName, String PlaylistName,
16271627
long startTime, long endTime) throws OSSException, ClientException;
16281628

16291629
/**
@@ -1632,7 +1632,7 @@ public void GenerateVodPlaylist(String bucketName, String liveChannelName, Strin
16321632
* @throws OSSException OSS Server异常信息。
16331633
* @throws ClientException OSS Client异常信息。
16341634
*/
1635-
public void GenerateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRequest)
1635+
public void generateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRequest)
16361636
throws OSSException, ClientException;
16371637

16381638
/**
@@ -1645,7 +1645,7 @@ public void GenerateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRe
16451645
* @throws OSSException OSS Server异常信息。
16461646
* @throws ClientException OSS Client异常信息。
16471647
*/
1648-
public String GenerateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
1648+
public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
16491649
long expires) throws OSSException, ClientException;
16501650

16511651
/**
@@ -1659,7 +1659,7 @@ public String GenerateRtmpUri(String bucketName, String liveChannelName, String
16591659
* @throws OSSException OSS Server异常信息。
16601660
* @throws ClientException OSS Client异常信息。
16611661
*/
1662-
public String GenerateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
1662+
public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
16631663
long expires, Map<String, String> parameters) throws OSSException, ClientException;
16641664

16651665
/**
@@ -1669,7 +1669,7 @@ public String GenerateRtmpUri(String bucketName, String liveChannelName, String
16691669
* @throws OSSException OSS Server异常信息。
16701670
* @throws ClientException OSS Client异常信息。
16711671
*/
1672-
public String GenerateRtmpUri(GenerateRtmpUriRequest generatePushflowUrlRequest)
1672+
public String generateRtmpUri(GenerateRtmpUriRequest generatePushflowUrlRequest)
16731673
throws OSSException, ClientException;
16741674

16751675
}

‎src/main/java/com/aliyun/oss/OSSClient.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,36 +1374,36 @@ public List<LiveRecord> getLiveChannelHistory(LiveChannelGenericRequest liveChan
13741374
}
13751375

13761376
@Override
1377-
public void GenerateVodPlaylist(String bucketName, String liveChannelName, String PlaylistName,
1377+
public void generateVodPlaylist(String bucketName, String liveChannelName, String PlaylistName,
13781378
long startTime, long endTime) throws OSSException, ClientException {
1379-
this.GenerateVodPlaylist(new GenerateVodPlaylistRequest(bucketName, liveChannelName,
1379+
this.generateVodPlaylist(new GenerateVodPlaylistRequest(bucketName, liveChannelName,
13801380
PlaylistName, startTime, endTime));
13811381
}
13821382

13831383
@Override
1384-
public void GenerateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRequest)
1384+
public void generateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRequest)
13851385
throws OSSException, ClientException {
1386-
liveChannelOperation.GenerateVodPlaylist(generateVodPlaylistRequest);
1386+
liveChannelOperation.generateVodPlaylist(generateVodPlaylistRequest);
13871387
}
13881388

13891389
@Override
1390-
public String GenerateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
1390+
public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
13911391
long expires) throws OSSException, ClientException {
1392-
return this.GenerateRtmpUri(new GenerateRtmpUriRequest(bucketName, liveChannelName,
1392+
return this.generateRtmpUri(new GenerateRtmpUriRequest(bucketName, liveChannelName,
13931393
PlaylistName, expires, null));
13941394
}
13951395

13961396
@Override
1397-
public String GenerateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
1397+
public String generateRtmpUri(String bucketName, String liveChannelName, String PlaylistName,
13981398
long expires, Map<String, String> parameters) throws OSSException, ClientException {
1399-
return this.GenerateRtmpUri(new GenerateRtmpUriRequest(bucketName, liveChannelName,
1399+
return this.generateRtmpUri(new GenerateRtmpUriRequest(bucketName, liveChannelName,
14001400
PlaylistName, expires, parameters));
14011401
}
14021402

14031403
@Override
1404-
public String GenerateRtmpUri(GenerateRtmpUriRequest generatePushflowUrlRequest)
1404+
public String generateRtmpUri(GenerateRtmpUriRequest generatePushflowUrlRequest)
14051405
throws OSSException, ClientException {
1406-
return liveChannelOperation.GeneratePushflowUrl(generatePushflowUrlRequest);
1406+
return liveChannelOperation.generatePushflowUrl(generatePushflowUrlRequest);
14071407
}
14081408

14091409
@Override

‎src/main/java/com/aliyun/oss/common/utils/HttpUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static String urlEncode(String value, String encoding) {
4141
try {
4242
String encoded = URLEncoder.encode(value, encoding);
4343
return encoded.replace("+", "%20").replace("*", "%2A")
44-
.replace("%7E", "~").replace("%2F", "/");
44+
.replace("~", "%7E").replace("/", "%2F");
4545
} catch (UnsupportedEncodingException e) {
4646
throw new IllegalArgumentException(OSS_RESOURCE_MANAGER.getString("FailedToEncodeUri"), e);
4747
}

‎src/main/java/com/aliyun/oss/internal/LiveChannelOperation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public List<LiveRecord> getLiveChannelHistory(LiveChannelGenericRequest liveChan
297297
return doOperation(request, getLiveChannelHistoryResponseParser, bucketName, liveChannelName, true);
298298
}
299299

300-
public void GenerateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRequest)
300+
public void generateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRequest)
301301
throws OSSException, ClientException {
302302

303303
assertParameterNotNull(generateVodPlaylistRequest, "generateVodPlaylistRequest");
@@ -336,7 +336,7 @@ public void GenerateVodPlaylist(GenerateVodPlaylistRequest generateVodPlaylistRe
336336
doOperation(request, emptyResponseParser, bucketName, key);
337337
}
338338

339-
public String GeneratePushflowUrl(GenerateRtmpUriRequest request)
339+
public String generatePushflowUrl(GenerateRtmpUriRequest request)
340340
throws OSSException, ClientException {
341341

342342
assertParameterNotNull(request, "request");

‎src/test/java/com/aliyun/oss/integrationtests/AppendObjectTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public void testNormalAppendObject() throws Exception {
5151
InputStream instream = genFixedLengthInputStream(instreamLength);
5252
AppendObjectRequest appendObjectRequest = new AppendObjectRequest(bucketName, key, instream, null);
5353
appendObjectRequest.setPosition(2 * i * instreamLength);
54-
AppendObjectResult appendObjectResult = secondClient.appendObject(appendObjectRequest);
55-
OSSObject o = secondClient.getObject(bucketName, key);
54+
AppendObjectResult appendObjectResult = ossClient.appendObject(appendObjectRequest);
55+
OSSObject o = ossClient.getObject(bucketName, key);
5656
Assert.assertEquals(key, o.getKey());
5757
Assert.assertEquals((2 * i + 1) * instreamLength, o.getObjectMetadata().getContentLength());
5858
Assert.assertEquals(APPENDABLE_OBJECT_TYPE, o.getObjectMetadata().getObjectType());
@@ -64,8 +64,8 @@ public void testNormalAppendObject() throws Exception {
6464
final String filePath = genFixedLengthFile(instreamLength);
6565
appendObjectRequest = new AppendObjectRequest(bucketName, key, new File(filePath));
6666
appendObjectRequest.setPosition(appendObjectResult.getNextPosition());
67-
appendObjectResult = secondClient.appendObject(appendObjectRequest);
68-
o = secondClient.getObject(bucketName, key);
67+
appendObjectResult = ossClient.appendObject(appendObjectRequest);
68+
o = ossClient.getObject(bucketName, key);
6969
Assert.assertEquals(instreamLength * 2 * (i + 1), o.getObjectMetadata().getContentLength());
7070
Assert.assertEquals(APPENDABLE_OBJECT_TYPE, o.getObjectMetadata().getObjectType());
7171
if (appendObjectResult.getNextPosition() != null) {
@@ -84,8 +84,8 @@ public void testAppendExistingNormalObject() throws Exception {
8484

8585
try {
8686
InputStream instream = genFixedLengthInputStream(instreamLength);
87-
defaultClient.putObject(bucketName, key, instream, null);
88-
OSSObject o = defaultClient.getObject(bucketName, key);
87+
ossClient.putObject(bucketName, key, instream, null);
88+
OSSObject o = ossClient.getObject(bucketName, key);
8989
Assert.assertEquals(key, o.getKey());
9090
Assert.assertEquals(instreamLength, o.getObjectMetadata().getContentLength());
9191
o.getObjectContent().close();
@@ -94,7 +94,7 @@ public void testAppendExistingNormalObject() throws Exception {
9494
instream = genFixedLengthInputStream(instreamLength);
9595
AppendObjectRequest appendObjectRequest = new AppendObjectRequest(bucketName, key, instream, null);
9696
appendObjectRequest.setPosition(instreamLength);
97-
defaultClient.appendObject(appendObjectRequest);
97+
ossClient.appendObject(appendObjectRequest);
9898
} catch (OSSException ex) {
9999
Assert.assertEquals(OSSErrorCode.OBJECT_NOT_APPENDALBE, ex.getErrorCode());
100100
Assert.assertTrue(ex.getMessage().startsWith(OBJECT_NOT_APPENDABLE_ERR));
@@ -113,8 +113,8 @@ public void testAppendObjectAtIllegalPosition() throws Exception {
113113
InputStream instream = genFixedLengthInputStream(instreamLength);
114114
AppendObjectRequest appendObjectRequest = new AppendObjectRequest(bucketName, key, instream, null);
115115
appendObjectRequest.setPosition(0L);
116-
AppendObjectResult appendObjectResult = defaultClient.appendObject(appendObjectRequest);
117-
OSSObject o = defaultClient.getObject(bucketName, key);
116+
AppendObjectResult appendObjectResult = ossClient.appendObject(appendObjectRequest);
117+
OSSObject o = ossClient.getObject(bucketName, key);
118118
Assert.assertEquals(key, o.getKey());
119119
Assert.assertEquals(instreamLength, o.getObjectMetadata().getContentLength());
120120
Assert.assertEquals(APPENDABLE_OBJECT_TYPE, o.getObjectMetadata().getObjectType());
@@ -128,7 +128,7 @@ public void testAppendObjectAtIllegalPosition() throws Exception {
128128
appendObjectRequest = new AppendObjectRequest(bucketName, key, instream, null);
129129
// Set illegal postion to append, here should be 'instreamLength' rather than other positions.
130130
appendObjectRequest.setPosition(instreamLength - 1);
131-
defaultClient.appendObject(appendObjectRequest);
131+
ossClient.appendObject(appendObjectRequest);
132132
} catch (OSSException ex) {
133133
Assert.assertEquals(OSSErrorCode.POSITION_NOT_EQUAL_TO_LENGTH, ex.getErrorCode());
134134
Assert.assertTrue(ex.getMessage().startsWith(POSITION_NOT_EQUAL_TO_LENGTH_ERROR));
@@ -144,11 +144,11 @@ public void testAppendObjectMissingArguments() throws Exception {
144144
final long instreamLength = 128 * 1024;
145145

146146
try {
147-
Assert.assertEquals(true, defaultClient.doesBucketExist(bucketName));
147+
Assert.assertEquals(true, ossClient.doesBucketExist(bucketName));
148148
InputStream instream = genFixedLengthInputStream(instreamLength);
149149
AppendObjectRequest appendObjectRequest = new AppendObjectRequest(bucketName, key, instream, null);
150150
// Missing required parameter 'postition'
151-
defaultClient.appendObject(appendObjectRequest);
151+
ossClient.appendObject(appendObjectRequest);
152152
} catch (OSSException ex) {
153153
Assert.assertEquals(OSSErrorCode.MISSING_ARGUMENT, ex.getErrorCode());
154154
Assert.assertTrue(ex.getMessage().startsWith(MISSING_ARGUMENT_ERR));

‎src/test/java/com/aliyun/oss/integrationtests/BucketAclTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,12 @@ public void testNormalSetBucketAcl() {
4949
final String bucketName = "normal-set-bucket-acl";
5050

5151
try {
52-
secondClient.createBucket(bucketName);
52+
ossClient.createBucket(bucketName);
5353

5454
for (CannedAccessControlList acl : acls) {
55-
secondClient.setBucketAcl(bucketName, acl);
55+
ossClient.setBucketAcl(bucketName, acl);
5656

57-
AccessControlList returnedAcl = secondClient.getBucketAcl(bucketName);
57+
AccessControlList returnedAcl = ossClient.getBucketAcl(bucketName);
5858
if (acl != null && !acl.equals(CannedAccessControlList.Private)) {
5959
Set<Grant> grants = returnedAcl.getGrants();
6060
Assert.assertEquals(1, grants.size());
@@ -73,7 +73,7 @@ public void testNormalSetBucketAcl() {
7373
} catch (Exception e) {
7474
Assert.fail(e.getMessage());
7575
} finally {
76-
secondClient.deleteBucket(bucketName);
76+
ossClient.deleteBucket(bucketName);
7777
}
7878
}
7979

@@ -82,12 +82,12 @@ public void testUnormalSetBucketAcl() {
8282
final String bucketName = "unormal-set-bucket-acl";
8383

8484
try {
85-
secondClient.createBucket(bucketName);
85+
ossClient.createBucket(bucketName);
8686

8787
// Set non-existent bucket
8888
final String nonexistentBucket = "unormal-set-bucket-acl";
8989
try {
90-
secondClient.setBucketAcl(nonexistentBucket, CannedAccessControlList.Private);
90+
ossClient.setBucketAcl(nonexistentBucket, CannedAccessControlList.Private);
9191
// TODO: Why not failed with NO_SUCK_BUCKET error code ?
9292
//Assert.fail("Set bucket acl should not be successful");
9393
} catch (Exception e) {
@@ -97,7 +97,7 @@ public void testUnormalSetBucketAcl() {
9797
// Set bucket without ownership
9898
final String bucketWithoutOwnership = "oss";
9999
try {
100-
secondClient.setBucketAcl(bucketWithoutOwnership, CannedAccessControlList.Private);
100+
ossClient.setBucketAcl(bucketWithoutOwnership, CannedAccessControlList.Private);
101101
Assert.fail("Set bucket acl should not be successful");
102102
} catch (OSSException e) {
103103
Assert.assertEquals(OSSErrorCode.BUCKET_ALREADY_EXISTS, e.getErrorCode());
@@ -115,7 +115,7 @@ public void testUnormalSetBucketAcl() {
115115
} catch (Exception e) {
116116
Assert.fail(e.getMessage());
117117
} finally {
118-
secondClient.deleteBucket(bucketName);
118+
ossClient.deleteBucket(bucketName);
119119
}
120120
}
121121

@@ -124,7 +124,7 @@ public void testUnormalGetBucketAcl() {
124124
// Get non-existent bucket
125125
final String nonexistentBucket = "unormal-get-bucket-acl";
126126
try {
127-
secondClient.getBucketAcl(nonexistentBucket);
127+
ossClient.getBucketAcl(nonexistentBucket);
128128
Assert.fail("Get bucket acl should not be successful");
129129
} catch (OSSException e) {
130130
Assert.assertEquals(OSSErrorCode.NO_SUCH_BUCKET, e.getErrorCode());
@@ -134,7 +134,7 @@ public void testUnormalGetBucketAcl() {
134134
// Get bucket without ownership
135135
final String bucketWithoutOwnership = "oss";
136136
try {
137-
secondClient.getBucketAcl(bucketWithoutOwnership);
137+
ossClient.getBucketAcl(bucketWithoutOwnership);
138138
Assert.fail("Get bucket referer should not be successful");
139139
} catch (OSSException e) {
140140
Assert.assertEquals(OSSErrorCode.ACCESS_DENIED, e.getErrorCode());
@@ -143,16 +143,16 @@ public void testUnormalGetBucketAcl() {
143143
// Get bucket using default acl
144144
final String bucketUsingDefaultAcl = "bucket-using-default-acl";
145145
try {
146-
secondClient.createBucket(bucketUsingDefaultAcl);
146+
ossClient.createBucket(bucketUsingDefaultAcl);
147147

148-
AccessControlList returnedACL = secondClient.getBucketAcl(bucketUsingDefaultAcl);
148+
AccessControlList returnedACL = ossClient.getBucketAcl(bucketUsingDefaultAcl);
149149
Set<Grant> grants = returnedACL.getGrants();
150150
// No grants when using default acl
151151
Assert.assertEquals(0, grants.size());
152152
} catch (Exception e) {
153153
Assert.fail(e.getMessage());
154154
} finally {
155-
secondClient.deleteBucket(bucketUsingDefaultAcl);
155+
ossClient.deleteBucket(bucketUsingDefaultAcl);
156156
}
157157
}
158158
}

0 commit comments

Comments
 (0)