update qcloud sdk to 5.9.15

Author: jordanqin

QCloudCosXml/cos-android-base/src/main/java/com/tencent/cos/xml/CosXmlServiceConfig.java

@@ -630,8 +630,8 @@ public Builder() {
             isDebuggable = false;
             retryStrategy = RetryStrategy.DEFAULT;
             bucketInPath = false;
-            uploadMaxThreadCount = TaskExecutors.DEFAULT_UPLOAD_THREAD_COUNT;
-            downloadMaxThreadCount = TaskExecutors.DEFAULT_DOWNLOAD_THREAD_COUNT;
+            uploadMaxThreadCount = TaskExecutors.UPLOAD_THREAD_COUNT;
+            downloadMaxThreadCount = TaskExecutors.DOWNLOAD_THREAD_COUNT;
         }
 
         public Builder(CosXmlServiceConfig config) {

QCloudCosXml/cos-android/src/androidTest/java/com/tencent/cos/xml/core/ServiceFactory.java

@@ -51,7 +51,7 @@ public CosXmlSimpleService newDefaultService() {
                 .setConnectionTimeout(4000)
                 .setSocketTimeout(4000)
                 .setTransferThreadControl(true)
-                .setUploadMaxThreadCount(2)
+                .setUploadMaxThreadCount(10)
                 .setDownloadMaxThreadCount(3)
                 .setRegion(TestConst.PERSIST_BUCKET_REGION)
                 .builder();

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

@@ -29,6 +29,7 @@
 import static com.tencent.cos.xml.core.TestUtils.bigPlusFilePath;
 import static com.tencent.cos.xml.core.TestUtils.getContext;
 import static com.tencent.cos.xml.core.TestUtils.smallFilePath;
+import static com.tencent.qcloud.core.http.QCloudHttpClient.HTTP_LOG_TAG;
 
 import android.net.Uri;
 import android.text.TextUtils;
@@ -60,6 +61,7 @@
 import com.tencent.qcloud.core.auth.COSXmlSignSourceProvider;
 import com.tencent.qcloud.core.http.HttpTaskMetrics;
 import com.tencent.qcloud.core.logger.QCloudLogger;
+import com.tencent.qcloud.core.task.TaskExecutors;
 import com.tencent.qcloud.core.util.Base64Utils;
 import com.tencent.qcloud.core.util.QCloudStringUtils;
 
@@ -312,8 +314,9 @@ private void logMsTime(String desc, double ms) {
 //    }
 
     @Test public void testMultiUpload() {
-        int count = 2;
+        int count = 20;
         long sleep = 1000;
+        final TestLocker testLocker = new TestLocker();
         for (int i = 0; i <= count; i++) {
             testUploadSmallFileByPath(i);
             QCloudLogger.i("QCloudTest", "!!!Start to sleep for %d ms", sleep);
@@ -322,12 +325,18 @@ private void logMsTime(String desc, double ms) {
             } else {
                 QCloudLogger.i("QCloudTest", "------ Finish Test --------");
             }
+            if(i == count){
+                TestUtils.sleep(60000);
+                Assert.assertTrue(true);
+                testLocker.release();
+            }
         }
+        testLocker.lock();
     }
 
     public void testUploadSmallFileByPath(int number) {
         // String path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/youxue.jpg";
-        String path = bigFilePath();
+        String path = smallFilePath();
         QCloudLogger.i("QCloudTest", "upload path is " + path);
 
         TransferManager transferManager = ServiceFactory.INSTANCE.newDefaultTransferManager();
@@ -355,21 +364,18 @@ public void onGetHttpMetrics(String requestName, HttpTaskMetrics httpTaskMetrics
                 QCloudLogger.i("QCloudTest", "ip is " + httpTaskMetrics.getConnectAddress().getHostAddress());
             }
         });
-        final TestLocker testLocker = new TestLocker();
         uploadTask.setCosXmlResultListener(new CosXmlResultListener() {
             @Override
             public void onSuccess(CosXmlRequest request, CosXmlResult result) {
                 result.printResult();
                 TestUtils.parseBadResponseBody(result);
-                testLocker.release();
                 uploadTask.clearResultAndException();
             }
 
             @Override
             public void onFail(CosXmlRequest request, CosXmlClientException clientException, CosXmlServiceException serviceException) {
                 TestUtils.printError(TestUtils.getCosExceptionMessage(clientException, serviceException));
                 Assert.fail(TestUtils.getCosExceptionMessage(clientException, serviceException));
-                testLocker.release();
             }
         });
 
@@ -386,9 +392,6 @@ public void onSuccess(InitiateMultipartUpload initiateMultipartUpload) {
                 String uploadId = initiateMultipartUpload.uploadId;
             }
         });
-        
-        testLocker.lock();
-        TestUtils.assertCOSXMLTaskSuccess(uploadTask);
     }
 
     @Test public void testUpload() {

QCloudCosXml/version.gradle

@@ -22,6 +22,6 @@
  */
 
 ext {
-    cosSdkVersionCode = 50914
-    cosSdkVersionName = '5.9.14'
+    cosSdkVersionCode = 50915
+    cosSdkVersionName = '5.9.15'
 }