ut update

Author: jordanqin

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/core/TestConst.java

@@ -26,7 +26,7 @@ public class TestConst {
     public static final String PERSIST_BUCKET_DOCUMENT_PATH = "/do_not_remove/document.docx";
     public static final String PERSIST_BUCKET_POST_OBJECT_PATH = "/do_not_remove/post_object";
     public static final String PERSIST_BUCKET_COPY_OBJECT_DST_PATH = "/do_not_remove/copy_dst_object";
-    public static final String PERSIST_BUCKET_DEEP_ARCHIVE_OBJECT_PATH = "/do_not_remove/small_object_deepArchive";
+    public static final String PERSIST_BUCKET_DEEP_ARCHIVE_OBJECT_PATH = "/do_not_remove/small_object_archive";
     public static final String PERSIST_BUCKET_REPLICATION = BuildConfig.PERSIST_BUCKET_REPLICATION;
     public static final String PERSIST_BUCKET_REPLICATION_REGION = BuildConfig.PERSIST_BUCKET_REPLICATION_REGION;
 

QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/transfer/UploadTest.java

@@ -223,7 +223,7 @@ public void testUploadFileConcurrent() throws Exception{
         final StringBuilder errorMessage = new StringBuilder();
         for (int i = 0 ; i < fileCount; i++) {
 
-            String cosPath = "uploadTask_cancel" + i;
+            String cosPath = UPLOAD_FOLDER+"uploadTask_cancel" + i;
             final String srcPath = TestUtils.localPath("upload" + i);
             TestUtils.createFile(srcPath, 10 * 1024 * 1024);
             final COSXMLUploadTask cosxmlUploadTask = transferManager.upload(TestConst.PERSIST_BUCKET, cosPath, srcPath, null);

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/BucketTest.java

@@ -25,15 +25,17 @@ public class BucketTest {
             new GetBucketVersionsTestAdapter(),
             new ListMultiUploadsTestAdapter(),
 
-            new PutBucketVersioningTestAdapter(), new GetBucketVersioningTestAdapter(),
+            new PutBucketVersioningTestAdapter(true), new GetBucketVersioningTestAdapter(),
+            new PutBucketReplicationTestAdapter(), new GetBucketReplicationTestAdapter(), new DeleteBucketReplicationTestAdapter(),
+            new PutBucketVersioningTestAdapter(false),
+
             new PutBucketInventoryTestAdapter(), new GetBucketInventoryTestAdapter(),
             new ListBucketInventoryTestAdapter(), new DeleteBucketInventoryTestAdapter(),
             new PutBucketDomainTestAdapter(), new GetBucketDomainTestAdapter(),
             new PutBucketCORSTestAdapter(), new GetBucketCORSTestAdapter(), new DeleteBucketCORSTestAdapter(),
             new PutBucketAccelerateTestAdapter(), new GetBucketAccelerateTestAdapter(),
             new PutBucketWebsiteTestAdapter(), new GetBucketWebsiteTestAdapter(), new DeleteBucketWebsiteTestAdapter(),
             new PutBucketLifecycleTestAdapter(), new GetBucketLifecycleTestAdapter(), new DeleteBucketLifecycleTestAdapter(),
-            new PutBucketReplicationTestAdapter(), new GetBucketReplicationTestAdapter(), new DeleteBucketReplicationTestAdapter(),
     };
 
     @Test public void testAsync() {

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/GetBucketObjectVersionsTestAdapter.java

@@ -14,8 +14,8 @@ public class GetBucketObjectVersionsTestAdapter extends NormalRequestTestAdapter
     @Override
     protected GetBucketObjectVersionsRequest newRequestInstance() {
         GetBucketObjectVersionsRequest request = new GetBucketObjectVersionsRequest(TestConst.PERSIST_BUCKET);
-        request.setPrefix("copy/");
-        request = new GetBucketObjectVersionsRequest(TestConst.PERSIST_BUCKET, "copy/", "/", null, null);
+        request.setPrefix("do_not_remove_test/");
+        request = new GetBucketObjectVersionsRequest(TestConst.PERSIST_BUCKET, "do_not_remove_test/", "/", null, null);
         request.setKeyMarker(null);
         request = new GetBucketObjectVersionsRequest(TestConst.PERSIST_BUCKET, "/", null, null);
         request.setVersionIdMarker(null);

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/GetBucketVersionsTestAdapter.java

@@ -12,7 +12,7 @@ public class GetBucketVersionsTestAdapter extends NormalRequestTestAdapter<ListB
     @Override
     protected ListBucketVersionsRequest newRequestInstance() {
         ListBucketVersionsRequest request = new ListBucketVersionsRequest(TestConst.PERSIST_BUCKET);
-        request.setPrefix("copy/");
+        request.setPrefix("do_not_remove_test/");
         request.setKeyMarker(null);
         request.setVersionIdMarker(null);
         request.setDelimiter("/");

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/ListMultiUploadsTestAdapter.java

@@ -38,8 +38,8 @@ protected ListMultiUploadsRequest newRequestInstance() {
         ListMultiUploadsRequest request = new ListMultiUploadsRequest(TestConst.PERSIST_BUCKET);
         request.setDelimiter("/");
         Assert.assertEquals("/", request.getDelimiter());
-        request.setPrefix("copy/");
-        Assert.assertEquals("copy/", request.getPrefix());
+        request.setPrefix("do_not_remove_test/");
+        Assert.assertEquals("do_not_remove_test/", request.getPrefix());
         request.setEncodingType("url");
         Assert.assertEquals("url", request.getEncodingType());
         request.setKeyMarker(null);

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/PutBucketInventoryTestAdapter.java

@@ -19,7 +19,7 @@ protected PutBucketInventoryRequest newRequestInstance() {
         PutBucketInventoryRequest putBucketInventoryRequest = new PutBucketInventoryRequest(TestConst.PERSIST_BUCKET);
         putBucketInventoryRequest.setInventoryId("inventoryId");
         putBucketInventoryRequest.isEnable(true);
-        putBucketInventoryRequest.setFilter("copy/");
+        putBucketInventoryRequest.setFilter("do_not_remove_test/");
         putBucketInventoryRequest.setIncludedObjectVersions(InventoryConfiguration.IncludedObjectVersions.ALL);
         putBucketInventoryRequest.setScheduleFrequency(InventoryConfiguration.SCHEDULE_FREQUENCY_DAILY);
         putBucketInventoryRequest.setOptionalFields(InventoryConfiguration.Field.StroageClass);

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/PutBucketLifecycleTestAdapter.java

@@ -21,7 +21,7 @@ protected PutBucketLifecycleRequest newRequestInstance() {
         LifecycleConfiguration.Rule rule = new LifecycleConfiguration.Rule();
         rule.id = "lifecycle_" + new Random(System.currentTimeMillis()).nextInt();
         LifecycleConfiguration.Filter filter = new LifecycleConfiguration.Filter();
-        filter.prefix = "copy/";
+        filter.prefix = "do_not_remove_test/";
         rule.filter = filter;
         rule.status = "Enabled";
         rule.transition = new LifecycleConfiguration.Transition();

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/model/bucket/PutBucketVersioningTestAdapter.java

@@ -9,10 +9,16 @@
 import com.tencent.cos.xml.model.NormalRequestTestAdapter;
 
 public class PutBucketVersioningTestAdapter extends NormalRequestTestAdapter<PutBucketVersioningRequest, PutBucketVersioningResult> {
+    private boolean isEnable;
+
+    public PutBucketVersioningTestAdapter(boolean isEnable){
+        this.isEnable = isEnable;
+    }
+
     @Override
     protected PutBucketVersioningRequest newRequestInstance() {
         PutBucketVersioningRequest request = new PutBucketVersioningRequest(TestConst.PERSIST_BUCKET);
-        request.setEnableVersion(true);
+        request.setEnableVersion(this.isEnable);
         return request;
     }
 

QCloudCosXml/cosxml/src/androidTestNormal/java/com/tencent/cos/xml/transfer/ZClearTest.java

@@ -0,0 +1,95 @@
+ 
+/*
+ * Copyright (c) 2010-2020 Tencent Cloud. All rights reserved.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.tencent.cos.xml.transfer;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.tencent.cos.xml.CosXmlService;
+import com.tencent.cos.xml.core.NormalServiceFactory;
+import com.tencent.cos.xml.core.TestConst;
+import com.tencent.cos.xml.exception.CosXmlClientException;
+import com.tencent.cos.xml.exception.CosXmlServiceException;
+import com.tencent.cos.xml.model.bucket.GetBucketObjectVersionsRequest;
+import com.tencent.cos.xml.model.bucket.GetBucketObjectVersionsResult;
+import com.tencent.cos.xml.model.object.DeleteMultiObjectRequest;
+import com.tencent.cos.xml.model.tag.ListVersionResult;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ZClearTest {
+    //com.tencent.cos.xml.transfer.ZClearTest是为了在transfer测试类最后执行
+
+    @Test
+    public void clearTestObjects() {
+        //清理copy和upload文件夹中的文件
+        List<String> deleteKeys = new ArrayList<>();
+        CosXmlService cosXmlService = NormalServiceFactory.INSTANCE.newDefaultService();
+
+        GetBucketObjectVersionsRequest requestUpload = new GetBucketObjectVersionsRequest(TestConst.PERSIST_BUCKET);
+        requestUpload.setPrefix("upload/");
+        try {
+            GetBucketObjectVersionsResult result = cosXmlService.getBucketObjectVersions(requestUpload);
+            if(result.listVersionResult.versions!=null) {
+                for (ListVersionResult.Version version : result.listVersionResult.versions) {
+                    deleteKeys.add(version.key);
+                }
+            }
+        } catch (CosXmlClientException e) {
+            e.printStackTrace();
+        } catch (CosXmlServiceException e) {
+            e.printStackTrace();
+        }
+
+        GetBucketObjectVersionsRequest requestCopy = new GetBucketObjectVersionsRequest(TestConst.PERSIST_BUCKET);
+        requestCopy.setPrefix("copy/");
+        try {
+            GetBucketObjectVersionsResult result = cosXmlService.getBucketObjectVersions(requestCopy);
+            if(result.listVersionResult.versions!=null) {
+                for (ListVersionResult.Version version : result.listVersionResult.versions) {
+                    deleteKeys.add(version.key);
+                }
+            }
+        } catch (CosXmlClientException e) {
+            e.printStackTrace();
+        } catch (CosXmlServiceException e) {
+            e.printStackTrace();
+        }
+
+        DeleteMultiObjectRequest deleteMultiObjectRequest = new DeleteMultiObjectRequest(TestConst.PERSIST_BUCKET, deleteKeys);
+        try {
+            cosXmlService.deleteMultiObject(deleteMultiObjectRequest);
+        } catch (CosXmlClientException e) {
+            e.printStackTrace();
+        } catch (CosXmlServiceException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+}