Skip to content

Commit 2a3e60e

Browse files
committed
update testcase.
1 parent 350af20 commit 2a3e60e

10 files changed

+243
-31
lines changed

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
<version>1.67</version>
6060
<scope>test</scope>
6161
</dependency>
62+
<dependency>
63+
<groupId>com.aliyun.kms</groupId>
64+
<artifactId>kms-transfer-client</artifactId>
65+
<version>0.1.0</version>
66+
<scope>test</scope>
67+
</dependency>
6268
</dependencies>
6369

6470
<reporting>

src/test/java/com/aliyun/oss/OSSClientArgCheckTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void testValidEndpoint() {
109109
Assert.assertNotNull(url3);
110110

111111
Assert.assertFalse(OSSUtils.validateEndpoint(url1.getHost()));
112-
Assert.assertFalse(OSSUtils.validateEndpoint(url2.getHost()));
112+
Assert.assertTrue(OSSUtils.validateEndpoint(url2.getHost()));
113113
Assert.assertTrue(OSSUtils.validateEndpoint(url3.getHost()));
114114

115115
Assert.assertTrue(OSSUtils.validateEndpoint("oss-cn-shenzhen.aliyuncs.com"));

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,12 @@ public void testNormalSetBucketAcl() {
5656

5757
try {
5858
ossClient.createBucket(bucketName);
59+
Thread.sleep(2000);
5960

6061
for (CannedAccessControlList acl : acls) {
6162
ossClient.setBucketAcl(bucketName, acl);
62-
63+
Thread.sleep(3000);
64+
6365
AccessControlList returnedAcl = ossClient.getBucketAcl(bucketName);
6466
if (acl != null && !acl.equals(CannedAccessControlList.Private)) {
6567
Set<Grant> grants = returnedAcl.getGrants();

src/test/java/com/aliyun/oss/integrationtests/BucketInventoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public void testBucketInventoryNormalWithFilter() {
390390
Assert.assertEquals(Long.valueOf(1638347592), actualConfig.getInventoryFilter().getLastModifyEndTimeStamp());
391391
Assert.assertEquals(Long.valueOf(1024L), actualConfig.getInventoryFilter().getLowerSizeBound());
392392
Assert.assertEquals(Long.valueOf(1048576L), actualConfig.getInventoryFilter().getUpperSizeBound());
393-
Assert.assertEquals("Standard,IA", actualConfig.getInventoryFilter().getStorageClass());
393+
Assert.assertEquals("IA,Standard", actualConfig.getInventoryFilter().getStorageClass());
394394
Assert.assertNotNull(actualDestin.getEncryption().getServerSideOssEncryption());
395395
Assert.assertNull(actualDestin.getEncryption().getServerSideKmsEncryption());
396396
} catch (ClientException e) {

src/test/java/com/aliyun/oss/integrationtests/CreateBucketTest.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,13 +217,15 @@ public void testPutWithCannedACL() {
217217
try {
218218
// Create bucket with default(private) acl
219219
ossClient.createBucket(createBucketRequest);
220+
Thread.sleep(5000);
220221
AccessControlList returnedAcl = ossClient.getBucketAcl(bucketName);
221222
Set<Grant> grants = returnedAcl.getGrants();
222223
Assert.assertEquals(0, grants.size());
223224
Assert.assertEquals(returnedAcl.getCannedACL(), CannedAccessControlList.Private);
224225

225226
// Try to create existing bucket without setting acl
226227
ossClient.createBucket(bucketName);
228+
Thread.sleep(5000);
227229
waitForCacheExpiration(5);
228230
returnedAcl = ossClient.getBucketAcl(bucketName);
229231
grants = returnedAcl.getGrants();
@@ -232,6 +234,7 @@ public void testPutWithCannedACL() {
232234
// Create bucket with public-read acl
233235
createBucketRequest.setCannedACL(CannedAccessControlList.PublicRead);
234236
ossClient.createBucket(createBucketRequest);
237+
Thread.sleep(5000);
235238
waitForCacheExpiration(5);
236239
returnedAcl = ossClient.getBucketAcl(bucketName);
237240
grants = returnedAcl.getGrants();
@@ -243,6 +246,7 @@ public void testPutWithCannedACL() {
243246

244247
// Try to create existing bucket without setting acl
245248
ossClient.createBucket(bucketName);
249+
Thread.sleep(5000);
246250
waitForCacheExpiration(5);
247251
returnedAcl = ossClient.getBucketAcl(bucketName);
248252
grants = returnedAcl.getGrants();
@@ -254,6 +258,7 @@ public void testPutWithCannedACL() {
254258
// Create bucket with public-read-write acl
255259
createBucketRequest.setCannedACL(CannedAccessControlList.PublicReadWrite);
256260
ossClient.createBucket(createBucketRequest);
261+
Thread.sleep(5000);
257262
waitForCacheExpiration(5);
258263
returnedAcl = ossClient.getBucketAcl(bucketName);
259264
grants = returnedAcl.getGrants();
@@ -265,6 +270,7 @@ public void testPutWithCannedACL() {
265270

266271
// Try to create existing bucket without setting acl
267272
ossClient.createBucket(bucketName);
273+
Thread.sleep(5000);
268274
waitForCacheExpiration(5);
269275
returnedAcl = ossClient.getBucketAcl(bucketName);
270276
grants = returnedAcl.getGrants();
@@ -431,13 +437,13 @@ public void testPutWithStorageTypeCompatibility() {
431437

432438
@Test
433439
public void testPutWithDataRedundancyType() {
434-
final String bucketName = super.bucketName + "-with-data-redundancy-type";
440+
String bucketName = super.bucketName + "-data-redundancy-type-1";
435441

436442
try {
437443
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName)
438444
.withDataRedundancyType(DataRedundancyType.LRS).withStorageType(StorageClass.Standard);
439445
ossClient.createBucket(createBucketRequest);
440-
Thread.sleep(2000);
446+
Thread.sleep(5000);
441447
BucketInfo bucketInfo = ossClient.getBucketInfo(bucketName);
442448
Assert.assertEquals(DataRedundancyType.LRS, bucketInfo.getDataRedundancyType());
443449
} catch (Exception e) {
@@ -446,11 +452,12 @@ public void testPutWithDataRedundancyType() {
446452
ossClient.deleteBucket(bucketName);
447453
}
448454

455+
bucketName = super.bucketName + "-data-redundancy-type-2";
449456
try {
450457
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName)
451458
.withDataRedundancyType(DataRedundancyType.ZRS).withStorageType(StorageClass.Standard);
452459
ossClient.createBucket(createBucketRequest);
453-
Thread.sleep(2000);
460+
Thread.sleep(5000);
454461
BucketInfo bucketInfo = ossClient.getBucketInfo(bucketName);
455462
Assert.assertEquals(DataRedundancyType.ZRS, bucketInfo.getDataRedundancyType());
456463
} catch (Exception e) {

0 commit comments

Comments
 (0)