handle some case

Author: YangSen-qn

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

@@ -0,0 +1,25 @@
+package com.qiniu.android;
+
+import android.test.AndroidTestCase;
+
+import com.qiniu.android.bigdata.Configuration;
+
+public class BigDataConfigurationTest extends AndroidTestCase {
+
+    public void testCopy(){
+        Configuration configuration = new Configuration();
+        configuration.connectTimeout = 15;
+
+        Configuration configurationCopy = Configuration.copy(configuration);
+
+        assertTrue(configurationCopy.connectTimeout == configuration.connectTimeout);
+    }
+
+    public void testCopyNoValue(){
+        Configuration configuration = null;
+
+        Configuration configurationCopy = Configuration.copy(configuration);
+
+        assertTrue(configurationCopy != null);
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.qiniu.android;
+
+import android.test.AndroidTestCase;
+
+import com.qiniu.android.collect.Config;
+
+public class CollectConfigTest extends AndroidTestCase {
+
+    public void testQuick(){
+        Config.quick();
+        assertTrue(Config.uploadThreshold == 1024);
+        assertTrue(Config.interval == 2);
+    }
+
+    public void testNormal(){
+        Config.normal();
+        assertTrue(Config.uploadThreshold == 4*1024);
+        assertTrue(Config.interval == 10);
+    }
+
+    public void testSlow(){
+        Config.slow();
+        assertTrue(Config.uploadThreshold == 150*1024);
+        assertTrue(Config.interval == 300);
+    }
+}

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

@@ -26,6 +26,8 @@
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -39,6 +41,33 @@ public class DnsApiTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         configuration = new Configuration.Builder().build();
+        DnsPrefetcher dnsPrefetcher = DnsPrefetcher.getDnsPrefetcher();
+        dnsPrefetcher.setToken(TestConfig.commonToken);
+    }
+
+    public void testConcurrentHashMap(){
+        InetAddress address = null;
+        try {
+            address = InetAddress.getByName("127.0.0.1");
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+
+        if (address == null){
+            return;
+        }
+
+        List<InetAddress> addressList = new ArrayList<>();
+        addressList.add(address);
+
+        ConcurrentHashMap<String, List<InetAddress>> hashMap = new ConcurrentHashMap<>();
+        hashMap.put("localhost", addressList);
+
+        DnsPrefetcher dnsPrefetcher = DnsPrefetcher.getDnsPrefetcher();
+        dnsPrefetcher.setConcurrentHashMap(hashMap);
+
+        assertTrue(hashMap == dnsPrefetcher.getConcurrentHashMap());
+
     }
 
     public void testDns() throws Throwable {

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

@@ -0,0 +1,55 @@
+package com.qiniu.android;
+import android.test.AndroidTestCase;
+
+import com.qiniu.android.http.Headers;
+
+import java.util.HashMap;
+
+public class HttpHeaderTest extends AndroidTestCase {
+
+    private Headers headers;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        HashMap<String, String> keyVaules = new HashMap<>();
+        keyVaules.put("date", "2020-07-15 07:40:01");
+        keyVaules.put("host", "127.0.0.1");
+//        keyVaules.put("", "illegal key");
+        headers = Headers.of(keyVaules);
+    }
+
+    public void testValue(){
+
+        assertTrue(headers.getDate("date") != null);
+        assertTrue(headers.values("host") != null);
+    }
+
+    public void testCount(){
+
+        assertTrue(headers.get("host") != null);
+        assertTrue(headers.values("host") != null);
+    }
+
+    public void testBuilder(){
+        String dateKey = "date";
+        String dateValue = "2020-07-15 20:02:30";
+        String hostKey = "host";
+        String hostValue = "127.0.0.1";
+
+        Headers.Builder builder0 = new Headers.Builder();
+        builder0.add(dateKey, dateValue);
+        builder0.add(hostKey + ":" + hostValue);
+        Headers headers0 = builder0.build();
+
+        String host = headers0.get(hostKey);
+        assertTrue(headers0.get(dateKey).equals(dateValue));
+        assertTrue(headers0.get(hostKey).equals(hostValue));
+
+        Headers.Builder builder1 = new Headers.Builder();
+        builder1.addAll(headers0);
+        assertTrue(builder1.get(dateKey).equals(dateValue));
+
+    }
+}

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

@@ -22,6 +22,10 @@ public final class TestConfig {
     public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:K-4seSpuZ1XivgHK_VrZVt4z5Pw=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTU5NTA1ODM4NX0=";
     public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
 
+
+    //测试通用的token
+    public static final String commonToken = token_na0;
+
     //dns prefetch token
     public static final String uptoken_prefetch = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:WYvuul25V_gUskDyy16eTI9KH_Y=:eyJzY29wZSI6Ind4YXBwdGVzdCIsImRlYWRsaW5lIjoxNTk0MjI0NzYyfQ==";
 

library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java

@@ -45,18 +45,25 @@ public class AutoZoneTest extends AndroidTestCase {
 ////        assertTrue(zoneInfo.upDomainsList.contains("upload-nb.qiniup.com"));
 //    }
 
-//    public void testHttpFail() {
-//        AutoZone zone = new AutoZone();
-//        ZoneInfo zoneInfo = zone.zoneInfo(ak + "_not_be_ak", bkt);
-//        assertNull(zoneInfo);
-//    }
+    public void testHttpFail() {
+        AutoZone zone = new AutoZone();
+        ZoneInfo zoneInfo = zone.zoneInfo(ak + "_not_be_ak", bkt);
+        assertNull(zoneInfo);
+    }
 
 //    public void testSplitE() {
 //        String s1 = "bkt:key";
 //        String s2 = "bkt";
 //        Assert.assertEquals(s1.split(":")[0], s2.split(":")[0]);
 //    }
 
+    public void testUCServer(){
+        String ucServer = "ucserver.test";
+        AutoZone autoZone = new AutoZone();
+        autoZone.setUcServer(ucServer);
+        assertTrue(autoZone.getUcServer() == ucServer);
+    }
+
     public void testC1() {
         AutoZone autoZone = new AutoZone();
         final CountDownLatch countDownLatch = new CountDownLatch(1);

library/src/main/java/com/qiniu/android/collect/Config.java

@@ -4,6 +4,8 @@
 
 import com.qiniu.android.utils.ContextGetter;
 
+import java.io.File;
+
 /**
  * Created by Simon on 11/22/16.
  */
@@ -76,7 +78,7 @@ public final class Config {
     /**
      * dns缓存信息目录
      */
-    public static String dnscacheDir = Environment.getExternalStorageDirectory() + "/dnschache/";
+    public static String dnscacheDir = Environment.getExternalStorageDirectory() + File.separator + "dnschache" + File.separator;
 
     /**
      * preQuery host

library/src/main/java/com/qiniu/android/storage/persistent/DnsCacheFile.java

@@ -20,7 +20,7 @@ public class DnsCacheFile implements Recorder {
     public DnsCacheFile(String directory) throws IOException {
         this.directory = directory;
         f = new File(directory);
-        if (!f.exists()) {
+        if (f.isDirectory() || !f.exists()) {
             boolean r = f.mkdirs();
             if (!r) {
                 throw new IOException("mkdir failed");