Skip to content

Commit 6ec4028

Browse files
huiguangjunhuiguangjun
committed
update testcase.
1 parent ca7af26 commit 6ec4028

File tree

9 files changed

+87
-27
lines changed

9 files changed

+87
-27
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class BucketWebsiteTest extends TestBase {
3636

3737
@Test
3838
public void testNormalSetBucketWebsite() {
39-
final String bucketName = "normal-set-bucket-website";
39+
final String bucketName = super.bucketName + "normal-set-bucket-website";
4040
final String indexDocument = "index.html";
4141
final String errorDocument = "error.html";
4242

@@ -81,7 +81,7 @@ public void testNormalSetBucketWebsite() {
8181

8282
@Test
8383
public void testNormalSetBucketWebsiteWithMirror() {
84-
final String bucketName = "normal-set-bucket-website-mirror";
84+
final String bucketName = super.bucketName + "normal-set-bucket-website-mirror";
8585
final String indexDocument = "index.html";
8686

8787
try {
@@ -226,7 +226,7 @@ public void testNormalSetBucketWebsiteWithMirror() {
226226

227227
@Test
228228
public void testNormalSetBucketWebsiteWithRedirect() {
229-
final String bucketName = "normal-set-bucket-website-redirect";
229+
final String bucketName = super.bucketName + "normal-set-bucket-website-redirect";
230230
final String indexDocument = "index.html";
231231

232232
try {
@@ -329,7 +329,7 @@ public void testNormalSetBucketWebsiteWithRedirect() {
329329

330330
@Test
331331
public void testNormalSetBucketWebsiteWithCDNRedirect() {
332-
final String bucketName = "normal-set-bucket-website-redirect-cdn";
332+
final String bucketName = super.bucketName + "normal-set-bucket-website-redirect-cdn";
333333
final String indexDocument = "index.html";
334334

335335
try {
@@ -431,7 +431,7 @@ public void testNormalSetBucketWebsiteWithCDNRedirect() {
431431

432432
@Test
433433
public void testUnormalSetBucketWebsiteWithMirror() {
434-
final String bucketName = "unormal-set-bucket-website-mirror";
434+
final String bucketName = super.bucketName + "unormal-set-bucket-website-mirror";
435435
final String indexDocument = "index.html";
436436

437437
try {
@@ -511,7 +511,7 @@ public void testUnormalSetBucketWebsiteWithMirror() {
511511

512512
@Test
513513
public void testUnormalSetBucketWebsiteWithRedirect() {
514-
final String bucketName = "unormal-set-bucket-website-redirect";
514+
final String bucketName = super.bucketName + "unormal-set-bucket-website-redirect";
515515
final String indexDocument = "index.html";
516516

517517
try {
@@ -575,7 +575,7 @@ public void testUnormalSetBucketWebsiteWithRedirect() {
575575

576576
@Test
577577
public void testUnormalSetBucketWebsite() {
578-
final String bucketName = "unormal-set-bucket-website";
578+
final String bucketName = super.bucketName + "unormal-set-bucket-website";
579579
final String indexDocument = "index.html";
580580
final String errorDocument = "error.html";
581581

@@ -615,7 +615,7 @@ public void testUnormalSetBucketWebsite() {
615615
@Test
616616
public void testUnormalGetBucketWebsite() {
617617
// Get non-existent bucket
618-
final String nonexistentBucket = "unormal-get-bucket-website";
618+
final String nonexistentBucket = super.bucketName + "unormal-get-bucket-website";
619619
try {
620620
ossClient.getBucketWebsite(nonexistentBucket);
621621
Assert.fail("Get bucket website should not be successful");
@@ -651,7 +651,7 @@ public void testUnormalGetBucketWebsite() {
651651
@Test
652652
public void testUnormalDeleteBucketWebsite() {
653653
// Delete non-existent bucket
654-
final String nonexistentBucket = "unormal-delete-bucket-website";
654+
final String nonexistentBucket = super.bucketName + "unormal-delete-bucket-website";
655655
try {
656656
ossClient.deleteBucketWebsite(nonexistentBucket);
657657
Assert.fail("Delete bucket website should not be successful");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
@SuppressWarnings("deprecation")
5959
public class CallbackTest extends TestBase {
6060

61-
private static final String callbackUrl = "oss-demo.aliyuncs.com:23450";
61+
private static final String callbackUrl = TestConfig.CALLBACK_URL;
6262

6363
private static final int instreamLength = 1024;
6464
private static final int bufferLength = 1024;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class CreateBucketTest extends TestBase {
5555

5656
@Test
5757
public void testPutWithDefaultLocation() {
58-
final String bucketName = "bucket-with-default-location";
58+
final String bucketName = super.bucketName + "-with-default-location";
5959

6060
try {
6161
Bucket bucket = ossClient.createBucket(bucketName);
@@ -77,7 +77,7 @@ public void testPutWithDefaultLocation() {
7777

7878
@Test
7979
public void testPutWithUnsupportedLocation() {
80-
final String bucketName = "bucket-with-unsupported-location";
80+
final String bucketName = super.bucketName + "-with-unsupported-location";
8181
final String unsupportedLocation = "oss-cn-zhengzhou";
8282

8383
CreateBucketRequest request = new CreateBucketRequest(bucketName);
@@ -93,7 +93,7 @@ public void testPutWithUnsupportedLocation() {
9393

9494
@Test
9595
public void testPutWithInconsistentLocation() {
96-
final String bucketName = "bucket-with-inconsistent-location";
96+
final String bucketName = super.bucketName + "-with-inconsistent-location";
9797

9898
CreateBucketRequest request = new CreateBucketRequest(bucketName);
9999
// Make location constraint inconsistent with endpoint
@@ -109,7 +109,7 @@ public void testPutWithInconsistentLocation() {
109109

110110
@Test
111111
public void testModifyExistingBucketLocation() {
112-
final String bucketName = "modify-existing-bucket-location";
112+
final String bucketName = super.bucketName + "-modify-existing-bucket-location";
113113

114114
try {
115115
ossClient.createBucket(bucketName);
@@ -218,7 +218,7 @@ public void testPutTooManyBuckets() {
218218

219219
@Test
220220
public void testPutWithCannedACL() {
221-
final String bucketName = "bucket-with-canned-acl";
221+
final String bucketName = super.bucketName + "-with-canned-acl";
222222

223223
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
224224
try {
@@ -288,7 +288,7 @@ public void testPutWithCannedACL() {
288288

289289
@Test
290290
public void testPutWithDefaultStorageType() {
291-
final String bucketName = "bucket-with-default-storage-type";
291+
final String bucketName = super.bucketName + "-with-default-storage-type";
292292

293293
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
294294
try {
@@ -307,7 +307,7 @@ public void testPutWithDefaultStorageType() {
307307

308308
@Ignore
309309
public void testPutWithStorageType() {
310-
final String bucketName = "bucket-with-storage-type";
310+
final String bucketName = super.bucketName + "-with-storage-type";
311311

312312
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
313313
createBucketRequest.setStorageClass(StorageClass.IA);
@@ -329,7 +329,7 @@ public void testPutWithStorageType() {
329329

330330
@Ignore
331331
public void testPutWithStorageTypeFunc() {
332-
final String bucketName = "bucket-with-storage-type-func";
332+
final String bucketName = super.bucketName + "-with-storage-type-func";
333333

334334
try {
335335
ossClient.createBucket(new CreateBucketRequest(bucketName).withStorageType(StorageClass.IA));
@@ -349,7 +349,7 @@ public void testPutWithStorageTypeFunc() {
349349

350350
@Test
351351
public void testPutWithStorageTypeAndLocation() {
352-
final String bucketName = "bucket-with-storage-and-location";
352+
final String bucketName = super.bucketName + "-with-storage-and-location";
353353

354354
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
355355
createBucketRequest.setStorageClass(StorageClass.Standard);
@@ -375,7 +375,7 @@ public void testPutWithStorageTypeAndLocation() {
375375

376376
@Ignore
377377
public void testPutWithStorageTypeModify() {
378-
final String bucketName = "bucket-with-storage-type-modify";
378+
final String bucketName = super.bucketName + "-with-storage-type-modify";
379379

380380
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
381381
try {
@@ -402,7 +402,7 @@ public void testPutWithStorageTypeModify() {
402402

403403
@Test
404404
public void testPutWithWithStorageTypeUnsupportedLocation() {
405-
final String bucketName = "bucket-with-storage-unsupported-location";
405+
final String bucketName = super.bucketName + "-with-storage-unsupported-location";
406406
final String unsupportedLocation = "oss-cn-zhengzhou";
407407

408408
CreateBucketRequest request = new CreateBucketRequest(bucketName);
@@ -419,7 +419,7 @@ public void testPutWithWithStorageTypeUnsupportedLocation() {
419419

420420
@Test
421421
public void testPutWithStorageTypeCompatibility() {
422-
final String bucketName = "bucket-with-storage-type-compatibility";
422+
final String bucketName = super.bucketName + "-with-storage-type-compatibility";
423423

424424
CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName);
425425
try {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class ListBucketsTest extends TestBase {
4141

4242
@Test
4343
public void testNormalListBuckets() {
44-
final String bucketNamePrefix = BUCKET_NAME_PREFIX + "normal-list-buckets-";
44+
final String bucketNamePrefix = super.bucketName + "-normal-list-buckets-";
4545

4646
try {
4747
List<Bucket> returnedBuckets = ossClient.listBuckets();

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

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

4343
@Test
4444
public void testNormalListObjects() {
45-
final String bucketName = "normal-list-objects";
45+
final String bucketName = super.bucketName + "-normal-list-objects";
4646

4747
try {
4848
ossClient.createBucket(bucketName);
@@ -162,13 +162,13 @@ public void testNormalListObjects() {
162162

163163
@Test
164164
public void testUnormalListObjects() {
165-
final String bucketName = "unormal-list-objects";
165+
final String bucketName = super.bucketName + "-unormal-list-objects";
166166

167167
try {
168168
ossClient.createBucket(bucketName);
169169

170170
// List objects under non-existent bucket
171-
final String nonexistentBucket = "unormal-list-objects-bucket";
171+
final String nonexistentBucket = super.bucketName + "-unormal-list-objects-bucket";
172172
try {
173173
ossClient.listObjects(nonexistentBucket);
174174
Assert.fail("List objects should not be successful");

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,21 @@
3636
import com.aliyun.oss.model.ListVersionsRequest;
3737
import com.aliyun.oss.model.OSSVersionSummary;
3838
import com.aliyun.oss.model.VersionListing;
39+
import com.aliyun.oss.model.BucketVersioningConfiguration;
40+
import com.aliyun.oss.model.SetBucketVersioningRequest;
3941

4042
public class ListVersionsTest extends TestBase {
4143

44+
public void setUp() throws Exception {
45+
super.setUp();
46+
47+
// start versioning
48+
BucketVersioningConfiguration configuration = new BucketVersioningConfiguration();
49+
configuration.setStatus(BucketVersioningConfiguration.ENABLED);
50+
SetBucketVersioningRequest request = new SetBucketVersioningRequest(bucketName, configuration);
51+
ossClient.setBucketVersioning(request);
52+
}
53+
4254
@Test
4355
public void testNormalListVersions() {
4456
String prefix = "version-test-put-object";

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,21 @@
6161
import com.aliyun.oss.model.DeleteVersionsRequest.KeyVersion;
6262
import com.aliyun.oss.model.DeleteVersionsResult;
6363
import com.aliyun.oss.model.GenericRequest;
64+
import com.aliyun.oss.model.BucketVersioningConfiguration;
65+
import com.aliyun.oss.model.SetBucketVersioningRequest;
6466

6567
public class ObjectVersionTest extends TestBase {
6668

69+
public void setUp() throws Exception {
70+
super.setUp();
71+
72+
// start versioning
73+
BucketVersioningConfiguration configuration = new BucketVersioningConfiguration();
74+
configuration.setStatus(BucketVersioningConfiguration.ENABLED);
75+
SetBucketVersioningRequest request = new SetBucketVersioningRequest(bucketName, configuration);
76+
ossClient.setBucketVersioning(request);
77+
}
78+
6779
@Test
6880
public void testPutObject() {
6981
String key = "version-test-put-object";

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
import com.aliyun.oss.model.MultipartUploadListing;
5656
import com.aliyun.oss.model.OSSObjectSummary;
5757
import com.aliyun.oss.model.ObjectListing;
58+
import com.aliyun.oss.model.BucketVersioningConfiguration;
59+
import com.aliyun.oss.model.VersionListing;
60+
import com.aliyun.oss.model.ListVersionsRequest;
61+
import com.aliyun.oss.model.OSSVersionSummary;
5862

5963
public class TestBase {
6064

@@ -119,6 +123,35 @@ protected static void deleteBucketWithObjects(OSSClient client, String bucketNam
119123
return;
120124
}
121125

126+
//delete objects by version id
127+
try {
128+
// start versioning
129+
BucketVersioningConfiguration versionConfiguration = ossClient.getBucketVersioning(bucketName);
130+
if (versionConfiguration.getStatus() != BucketVersioningConfiguration.OFF) {
131+
// stop versioning
132+
//versionConfiguration.setStatus(BucketVersioningConfiguration.SUSPENDED);
133+
//ossClient.setBucketVersioning(new SetBucketVersioningRequest(bucketName, versionConfiguration));
134+
135+
String nextKeyMarker = null;
136+
String nextVersionMarker = null;
137+
VersionListing versionListing = null;
138+
do {
139+
ListVersionsRequest listVersionsRequest = new ListVersionsRequest()
140+
.withBucketName(bucketName)
141+
.withKeyMarker(nextKeyMarker)
142+
.withVersionIdMarker(nextVersionMarker);
143+
versionListing = ossClient.listVersions(listVersionsRequest);
144+
145+
for (OSSVersionSummary ossVersion : versionListing.getVersionSummaries()) {
146+
ossClient.deleteVersion(bucketName, ossVersion.getKey(), ossVersion.getVersionId());
147+
}
148+
nextKeyMarker = versionListing.getNextKeyMarker();
149+
nextVersionMarker = versionListing.getNextVersionIdMarker();
150+
} while (versionListing.isTruncated());
151+
}
152+
} catch (Exception e) {
153+
}
154+
122155
// delete objects
123156
List<String> allObjects = listAllObjects(client, bucketName);
124157
int total = allObjects.size();

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public final class TestConfig {
2626
public static String OSS_TEST_REGION = null;
2727
public static String OSS_TEST_ACCESS_KEY_ID = null;
2828
public static String OSS_TEST_ACCESS_KEY_SECRET = null;
29-
public static String OSS_TEST_ACCESS_KEY_ID_1 = null;
29+
public static String OSS_TEST_ACCESS_KEY_ID_1 = null;
3030
public static String OSS_TEST_ACCESS_KEY_SECRET_1 = null;
3131

3232
// OSS replication test configuration
@@ -47,4 +47,7 @@ public final class TestConfig {
4747

4848
// OSS cmk id configuration
4949
public static String CMK_ID = null;
50+
51+
// OSS callback
52+
public static String CALLBACK_URL = null;
5053
}

0 commit comments

Comments
 (0)