update test case lib

Author: yangsen

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.4'
+        classpath 'com.android.tools.build:gradle:3.6.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

gradle.properties

@@ -1,3 +1,5 @@
+android.useAndroidX=true
+
 VERSION_NAME=
 VERSION_CODE=
 GROUP=com.qiniu

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jun 28 14:50:04 CST 2021
+#Thu Jul 28 11:54:47 CST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME

library/build.gradle

@@ -28,6 +28,8 @@ android {
         targetSdkVersion 30
         versionCode code
         versionName version
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {

library/src/androidTest/java/com/qiniu/android/BaseTest.java

@@ -4,11 +4,6 @@
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.qiniu.android.transaction.TransactionManager;
-
-import junit.framework.TestCase;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -21,12 +16,11 @@
 /**
  * Created by yangsen on 2020/5/26
  */
-//@RunWith(AndroidJUnit4.class)
 public class BaseTest {
 
     private long maxWaitTimestamp = 0;
 
-    private Context context;
+    private Context context = ApplicationProvider.getApplicationContext();
 
     @Before
     public void setUp() throws Exception {

library/src/androidTest/java/com/qiniu/android/collect/UplogTest.java

@@ -5,11 +5,16 @@
 import com.qiniu.android.TestConfig;
 import com.qiniu.android.BaseTest;
 
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 public class UplogTest extends BaseTest {
 
+    @Test
+    public void test() {
+    }
+
     private void no_testUplog() {
         ReportItem item = new ReportItem();
         item.setReport(ReportItem.LogTypeRequest, ReportItem.RequestKeyLogType);

library/src/androidTest/java/com/qiniu/android/http/HttpHeaderTest.java

@@ -19,7 +19,7 @@ public class HttpHeaderTest {
     private Headers headers;
 
     @Before
-    protected void setUp() throws Exception {
+    public void setUp() throws Exception {
 
         HashMap<String, String> keyVaules = new HashMap<>();
         keyVaules.put("date", "2020-07-15 07:40:01");

library/src/androidTest/java/com/qiniu/android/http/dns/DnsApiTest.java

@@ -48,8 +48,7 @@ public boolean shouldWait() {
         assertTrue(addressList.size() > 0);
     }
 
-    @Test
-    public void testRecover(){
+    private void testRecover(){
         final String host = "uplog.qbox.me";
 
         final DnsPrefetcher dnsPrefetcher = DnsPrefetcher.getInstance();

library/src/androidTest/java/com/qiniu/android/http/dns/DnsTransactionTest.java

@@ -8,6 +8,7 @@
 import com.qiniu.android.BaseTest;
 import com.qiniu.android.storage.UpToken;
 
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 
@@ -21,6 +22,7 @@ public class DnsTransactionTest extends BaseTest {
     private int completeCount = 0;
     private int successCount = 0;
 
+    @Test
     public void testLocalLoad(){
 
         completeCount = 0;
@@ -54,7 +56,7 @@ public boolean shouldWait() {
         assertTrue(successCount < 2);
     }
 
-
+    @Test
     public void test_CheckAndPrefetch(){
 
         completeCount = 0;
@@ -91,7 +93,7 @@ public boolean shouldWait() {
         assertTrue("successCount:" + successCount, successCount < 3);
     }
 
-
+    @Test
     public void testCheckWhetherCachedValid(){
 
         completeCount = 0;

library/src/androidTest/java/com/qiniu/android/storage/UploadBaseTest.java

@@ -22,10 +22,10 @@
 import java.io.InputStream;
 import java.io.RandomAccessFile;
 
-//@RunWith(AndroidJUnit4.class)
 public class UploadBaseTest extends BaseTest {
 
-    @Override @Before
+    @Override
+    @Before
     public void setUp() throws Exception {
         LogUtil.enableLog(true);
         LogUtil.setLogLevel(Log.VERBOSE);

library/src/androidTest/java/com/qiniu/android/storage/UploadFlowTest.java

@@ -22,9 +22,11 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 
-//@RunWith(AndroidJUnit4.class)
 public class UploadFlowTest extends UploadBaseTest {
 
+    public void test() {
+    }
+
     protected void cancelTest(long cancelPosition,
                               File file,
                               String key,

library/src/androidTest/java/com/qiniu/android/storage/UriTest.java

@@ -44,6 +44,9 @@ public class UriTest extends BaseTest {
             {false, false, false},
     };
 
+    public void test() {
+    }
+
     private void notestUpload() {
         int MB = 1024;
         int[] sizeList = {512, MB, 4*MB, 5*MB, 8*MB, 10*MB, 20*MB};
@@ -74,8 +77,8 @@ private void notestUpload() {
     }
 
 
-    @Test
-    public void testUpload() {
+
+    private void testUpload() {
         String uriString = "content://media/external/images/media/12045";
         Uri uri = Uri.parse(uriString);
         testUpload(uri, "uri_test", "AAAA", true, false, false);

settings.gradle

@@ -1 +1,2 @@
+rootProject.name = "android-sdk"
 include ':library'