Skip to content

Commit ea5b1fe

Browse files
huiguangjunhuiguangjun
committed
update testcase
1 parent 433075f commit ea5b1fe

23 files changed

+116
-108
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
public class AccessPointTest extends TestBase {
1919
private static OSS ossClient;
20-
private static String bucketName = "oss-java-sdk-test-example4";
20+
private static String bucketName = genBucketName();
2121
private static OSS apClientTest;
2222
private static String arnEndpoint = "http://oss-ap-southeast-2.oss-accesspoint.aliyuncs.com";
2323
private static String apArn = "";

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class ArchiveTest extends TestBase {
4141

4242
@Test
4343
public void testNormalCreateArchiveBucket() {
44-
String bucketName = "create-archive-test-bucket";
44+
String bucketName = genBucketName() + "-archive";
4545
String key = "normal-create-archive.txt";
4646
String filePath = null;
4747

@@ -67,7 +67,7 @@ public void testNormalCreateArchiveBucket() {
6767

6868
@Ignore
6969
public void testNormalRestoreObject() {
70-
String bucketName = "restore-object-test-bucket";
70+
String bucketName = genBucketName() + "-restore";
7171
String key = "normal-restore-object.txt";
7272
String filePath = null;
7373

@@ -116,7 +116,7 @@ public void testNormalRestoreObject() {
116116

117117
@Test
118118
public void testUnormalOutofRestore() {
119-
String bucketName = "unnormal-restore-test-bucket";
119+
String bucketName = genBucketName() + "-restore";
120120
String key = "unnormal-restore-object.txt";
121121
String filePath = null;
122122

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import static com.aliyun.oss.integrationtests.TestUtils.waitForCacheExpiration;
3737

3838
public class AsyncFetchTaskTest extends TestBase {
39-
private final String objectName = "test-async-fetch-task-object";
39+
private final String objectName = genBucketName() + "test-async-fetch-task-object";
4040
private String contentMd5;
4141
private String url;
4242

@@ -48,7 +48,7 @@ public class AsyncFetchTaskTest extends TestBase {
4848
public void setUp() throws Exception {
4949
super.setUp();
5050

51-
bucketName = super.bucketName + "-aysnc-fetch-task";
51+
bucketName = genBucketName() + "-aysnc-fetch-task";
5252
endpoint = TestConfig.OSS_TEST_ENDPOINT;
5353

5454
//create client
@@ -66,7 +66,7 @@ public void setUp() throws Exception {
6666

6767
Date expiration = new Date(new Date().getTime() + 3600 * 1000);
6868
URL signedUrl = ossClient.generatePresignedUrl(bucketName, objectName, expiration);
69-
url = signedUrl.toString();
69+
url = signedUrl.toString().replace("-internal", "");;
7070
}
7171

7272
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class AsyncProcessObjectTest extends TestBase {
2828
public void setUp() throws Exception {
2929
super.setUp();
3030

31-
bucketName = super.bucketName + "-async-process";
31+
bucketName = genBucketName() + "-async-process";
3232
endpoint = "http://oss-cn-hangzhou.aliyuncs.com";
3333

3434
//create client

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class BucketAclTest extends TestBase {
5252

5353
@Test
5454
public void testNormalSetBucketAcl() {
55-
final String bucketName = super.bucketName + "normal-set-bucket-acl";
55+
final String bucketName = genBucketName() + "normal-set-bucket-acl";
5656

5757
try {
5858
ossClient.createBucket(bucketName);
@@ -92,7 +92,7 @@ public void testNormalSetBucketAcl() {
9292

9393
@Test
9494
public void testUnormalSetBucketAcl() {
95-
final String nonexistentBucket = super.bucketName + "unormal-set-bucket-acl";
95+
final String nonexistentBucket = genBucketName() + "unormal-set-bucket-acl";
9696

9797
try {
9898
// set non-existent bucket
@@ -135,7 +135,7 @@ public void testUnormalSetBucketAcl() {
135135
@Test
136136
public void testUnormalGetBucketAcl() {
137137
// Get non-existent bucket
138-
final String nonexistentBucket = super.bucketName + "unormal-get-bucket-acl";
138+
final String nonexistentBucket = genBucketName() + "-bucket-acl";
139139
try {
140140
ossClient.getBucketAcl(nonexistentBucket);
141141
Assert.fail("Get bucket acl should not be successful");
@@ -154,7 +154,7 @@ public void testUnormalGetBucketAcl() {
154154
}
155155

156156
// Get bucket using default acl
157-
final String bucketUsingDefaultAcl = "bucket-using-default-acl";
157+
final String bucketUsingDefaultAcl = genBucketName() + "-default-acl";
158158
try {
159159
ossClient.createBucket(bucketUsingDefaultAcl);
160160

@@ -171,7 +171,7 @@ public void testUnormalGetBucketAcl() {
171171

172172
@Test
173173
public void testUnormalDoesBucketExist() {
174-
final String nonexistentBucket = super.bucketName + "unormal-does-bucket-exist";
174+
final String nonexistentBucket = genBucketName() + "-exist";
175175

176176
try {
177177
Credentials credentials = new DefaultCredentials(TestConfig.OSS_TEST_ACCESS_KEY_ID, TestConfig.OSS_TEST_ACCESS_KEY_SECRET);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class BucketCORSTest extends TestBase {
4242

4343
@Test
4444
public void testNormalSetBucketCORS() {
45-
final String bucketName = "normal-set-bucket-cors";
45+
final String bucketName = genBucketName() + "-cors";
4646

4747
try {
4848
ossClient.createBucket(bucketName);
@@ -101,7 +101,7 @@ public void testNormalSetBucketCORS() {
101101

102102
@Test
103103
public void testUnormalSetBucketCORS() {
104-
final String bucketName = "unormal-set-bucket-cors";
104+
final String bucketName = genBucketName() + "-cors";
105105

106106
try {
107107
ossClient.createBucket(bucketName);
@@ -209,7 +209,7 @@ public void testUnormalSetBucketCORS() {
209209
@Test
210210
public void testUnormalGetBucketCORS() {
211211
// Get non-existent bucket
212-
final String nonexistentBucket = "unormal-get-bucket-cors";
212+
final String nonexistentBucket = genBucketName() + "-cors";
213213
try {
214214
ossClient.getBucketCORSRules(nonexistentBucket);
215215
Assert.fail("Get bucket cors should not be successful");
@@ -228,7 +228,7 @@ public void testUnormalGetBucketCORS() {
228228
}
229229

230230
// Get bucket without setting cors rules
231-
final String bucketWithoutCORSRules = "bucket-without-cors-rules";
231+
final String bucketWithoutCORSRules = genBucketName() + "-cors-rules";
232232
try {
233233
ossClient.createBucket(bucketWithoutCORSRules);
234234

@@ -245,7 +245,7 @@ public void testUnormalGetBucketCORS() {
245245
@Test
246246
public void testUnormalDeleteBucketCORS() {
247247
// Delete non-existent bucket
248-
final String nonexistentBucket = "unormal-delete-bucket-cors";
248+
final String nonexistentBucket = genBucketName() + "-cors";
249249
try {
250250
ossClient.getBucketCORSRules(nonexistentBucket);
251251
Assert.fail("Delete bucket cors should not be successful");
@@ -266,7 +266,7 @@ public void testUnormalDeleteBucketCORS() {
266266

267267
@Test
268268
public void testSetBucketCORSWithResponseVary() {
269-
final String bucketName = "set-bucket-cors-vary";
269+
final String bucketName = genBucketName() + "set-bucket-cors-vary";
270270

271271
try {
272272
ossClient.createBucket(bucketName);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void testNormalDeleteBucketCname() {
143143

144144
@Test
145145
public void testUnormaladdBucketCname() {
146-
final String bucketName = "unormal-set-bucket-cname";
146+
final String bucketName = genBucketName() + "-cname";
147147

148148
// parameter invalid
149149
try {
@@ -204,7 +204,7 @@ public void testUnormaladdBucketCname() {
204204
ossClient.addBucketCname(new AddBucketCnameRequest(bucketName).withDomain("your.com"));
205205
Assert.fail("Set bucket cname should not be successful");
206206
} catch (OSSException e) {
207-
Assert.assertEquals("NoSuchCnameInRecord", e.getErrorCode());
207+
Assert.assertEquals("NeedVerifyDomainOwnership", e.getErrorCode());
208208
}
209209

210210
} catch (Exception e) {
@@ -217,7 +217,7 @@ public void testUnormaladdBucketCname() {
217217
@Test
218218
public void testBucketCnameToken() {
219219
final String endpoint = "oss-ap-southeast-2.aliyuncs.com";
220-
final String bucketName = super.bucketName + "-bucket-cname";
220+
final String bucketName = genBucketName() + "-bucket-cname";
221221

222222
//create client
223223
ClientConfiguration conf = new ClientBuilderConfiguration();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class BucketEncryptionTest extends TestBase {
4646
public void setUp() throws Exception {
4747
super.setUp();
4848

49-
bucketName = super.bucketName + "-encryption";
49+
bucketName = genBucketName() + "-encryption";
5050
endpoint = "http://oss-ap-southeast-5.aliyuncs.com";
5151

5252
//create client

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class BucketInventoryTest extends TestBase {
4040
public void setUp() throws Exception {
4141
super.setUp();
4242

43-
bucketName = super.bucketName + "-inventory";
43+
bucketName = genBucketName() + "-inventory";
4444
endpoint = TestConfig.OSS_TEST_ENDPOINT;
4545

4646
//create client

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class BucketLifecycleTest extends TestBase {
4848

4949
@Test
5050
public void testNormalSetBucketLifecycle() throws ParseException {
51-
final String bucketName = super.bucketName + "normal-set-bucket-lifecycle";
51+
final String bucketName = genBucketName() + "-lifecycle";
5252
final String ruleId0 = "delete obsoleted files";
5353
final String matchPrefix0 = "obsoleted0/";
5454
final String ruleId1 = "delete temporary files";
@@ -200,7 +200,7 @@ public void testNormalSetBucketLifecycle() throws ParseException {
200200

201201
@Test
202202
public void testNormalSetBucketLifecyclWithTagging() throws ParseException {
203-
final String bucketName = super.bucketName + "normal-set-bucket-lifecycle-tagging";
203+
final String bucketName = genBucketName() + "-lifecycle-tagging";
204204
final String ruleId0 = "delete obsoleted files";
205205
final String matchPrefix0 = "obsoleted0/";
206206
final String ruleId1 = "delete temporary files";
@@ -346,7 +346,7 @@ public void testNormalSetBucketLifecyclWithTagging() throws ParseException {
346346

347347
@Test
348348
public void testUnormalSetBucketLifecycle() throws ParseException {
349-
final String bucketName = super.bucketName + "unormal-set-bucket-lifecycle";
349+
final String bucketName = genBucketName() + "-lifecycle";
350350
final String ruleId0 = "delete obsoleted files";
351351
final String matchPrefix0 = "obsoleted/";
352352

@@ -500,7 +500,7 @@ public void testUnormalSetBucketLifecycle() throws ParseException {
500500
@Test
501501
public void testUnormalGetBucketLifecycle() {
502502
// Get non-existent bucket
503-
final String nonexistentBucket = "unormal-get-bucket-lifecycle";
503+
final String nonexistentBucket = genBucketName() + "-lifecycle";
504504
try {
505505
ossClient.getBucketLifecycle(nonexistentBucket);
506506
Assert.fail("Get bucket lifecycle should not be successful");
@@ -519,7 +519,7 @@ public void testUnormalGetBucketLifecycle() {
519519
}
520520

521521
// Get bucket without setting lifecycle configuration
522-
final String bucketWithoutLifecycleConfiguration = super.bucketName + "bucket-without-lifecycle-configuration";
522+
final String bucketWithoutLifecycleConfiguration = genBucketName() + "-configuration";
523523
try {
524524
ossClient.createBucket(bucketWithoutLifecycleConfiguration);
525525

@@ -537,7 +537,7 @@ public void testUnormalGetBucketLifecycle() {
537537
@Test
538538
public void testUnormalDeleteBucketLifecycle() {
539539
// Delete non-existent bucket
540-
final String nonexistentBucket = super.bucketName + "unormal-delete-bucket-lifecycle";
540+
final String nonexistentBucket = genBucketName() + "-lifecycle";
541541
try {
542542
ossClient.deleteBucketLifecycle(nonexistentBucket);
543543
Assert.fail("Delete bucket lifecycle should not be successful");
@@ -556,7 +556,7 @@ public void testUnormalDeleteBucketLifecycle() {
556556
}
557557

558558
// Delete bucket without setting lifecycle configuration
559-
final String bucketWithoutLifecycleConfiguration = super.bucketName + "bucket-without-lifecycle-configuration";
559+
final String bucketWithoutLifecycleConfiguration = genBucketName() + "-configuration";
560560
try {
561561
ossClient.createBucket(bucketWithoutLifecycleConfiguration);
562562
ossClient.deleteBucketLifecycle(bucketWithoutLifecycleConfiguration);
@@ -569,7 +569,7 @@ public void testUnormalDeleteBucketLifecycle() {
569569

570570
@Test
571571
public void testNormalSetBucketLifecycleWithAccessMonitor() throws ParseException {
572-
final String bucketName = super.bucketName + "normal-set-bucket-lifecycle";
572+
final String bucketName = genBucketName() + "-lifecycle";
573573
final String ruleId0 = "delete obsoleted files";
574574
final String matchPrefix0 = "obsoleted0/";
575575
final String ruleId1 = "delete temporary files";
@@ -740,7 +740,7 @@ public void testNormalSetBucketLifecycleWithAccessMonitor() throws ParseExceptio
740740

741741
@Test
742742
public void testUnormalSetBucketLifecycleWithAccessMonitor() throws ParseException {
743-
final String bucketName = super.bucketName + "unormal-set-bucket-lifecycle";
743+
final String bucketName = genBucketName() + "-lifecycle";
744744
final String ruleId0 = "delete obsoleted files";
745745
final String matchPrefix0 = "obsoleted/";
746746

@@ -800,7 +800,7 @@ public void testUnormalSetBucketLifecycleWithAccessMonitor() throws ParseExcepti
800800

801801
@Test
802802
public void testUnormalSetBucketLifecycleWithNot() throws ParseException {
803-
final String bucketName = super.bucketName + "unormal-set-bucket-lifecycle";
803+
final String bucketName = genBucketName() + "-lifecycle";
804804
final String ruleId0 = "delete obsoleted files";
805805
final String matchPrefix0 = "obsoleted/";
806806

@@ -829,7 +829,7 @@ public void testUnormalSetBucketLifecycleWithNot() throws ParseException {
829829

830830
@Test
831831
public void testNormalSetBucketLifecycleWithNot() throws ParseException {
832-
final String bucketName = super.bucketName + "normal-set-bucket-lifecycle-tagging";
832+
final String bucketName = genBucketName() + "-lifecycle-tagging";
833833
final String ruleId0 = "delete obsoleted files";
834834
final String matchPrefix0 = "obsoleted0/";
835835
final String ruleId1 = "delete temporary files";
@@ -920,7 +920,7 @@ public void testVerificationLifecycleRulesLimit() throws ParseException {
920920

921921
@Test
922922
public void testBucketLifecycleWithFilterObjectSizeThan() throws ParseException {
923-
final String bucketName = super.bucketName + "-bucket-lifecycle-object-size-than";
923+
final String bucketName = genBucketName() + "-object-size-than";
924924
final String ruleId0 = "rule-object-size-than";
925925
final String matchPrefix0 = "rule-object/";
926926
final String ruleId1 = "rule2-object-size-than";

0 commit comments

Comments
 (0)