Merge pull request #222 from longbai/multizone-auto

multizone auto

Author: longbai

.idea/.name

@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.3.0 (2016-09-30)
+
+### 增加
+* 自动判断上传存储区
+
 ## 7.2.3 (2016-09-07)
 
 ### 增加

.idea/compiler.xml

@@ -5,6 +5,7 @@
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
+import com.qiniu.android.common.FixedZone;
 import com.qiniu.android.common.ServiceAddress;
 import com.qiniu.android.common.Zone;
 import com.qiniu.android.http.ResponseInfo;
@@ -338,8 +339,8 @@ public void testNoComplete() {
 
     @SmallTest
     public void testIpBack() throws Throwable {
-        ServiceAddress s = new ServiceAddress("http://upwelcome.qiniu.com", Zone.zone0.up.backupIps);
-        Zone z = new Zone(s, Zone.zone0.upBackup);
+        ServiceAddress s = new ServiceAddress("http://upwelcome.qiniu.com", Zone.zone0.upHost("").backupIps);
+        Zone z = new FixedZone(s, Zone.zone0.upHostBackup(""));
         Configuration c = new Configuration.Builder()
                 .zone(z)
                 .build();
@@ -377,7 +378,7 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
     @SmallTest
     public void testPortBackup() throws Throwable {
         ServiceAddress s = new ServiceAddress("http://upload.qiniu.com:9999", null);
-        Zone z = new Zone(s, Zone.zone0.upBackup);
+        Zone z = new FixedZone(s, Zone.zone0.upHostBackup(""));
         Configuration c = new Configuration.Builder()
                 .zone(z)
                 .build();
@@ -413,8 +414,8 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
 
     @SmallTest
     public void testDnsHijacking() throws Throwable {
-        ServiceAddress s = new ServiceAddress("http://uphijacktest.qiniu.com", Zone.zone0.up.backupIps);
-        Zone z = new Zone(s, Zone.zone0.upBackup);
+        ServiceAddress s = new ServiceAddress("http://uphijacktest.qiniu.com", Zone.zone0.upHost("").backupIps);
+        Zone z = new FixedZone(s, Zone.zone0.upHostBackup(""));
         Configuration c = new Configuration.Builder()
                 .zone(z)
                 .build();
@@ -456,7 +457,7 @@ public void testHttps() throws Throwable {
         params.put("x:foo", "fooval");
         final UploadOptions opt = new UploadOptions(params, null, true, null, null);
         ServiceAddress s = new ServiceAddress("https://up.qbox.me", null);
-        Zone z = new Zone(s, Zone.zone0.upBackup);
+        Zone z = new FixedZone(s, Zone.zone0.upHostBackup(""));
         Configuration c = new Configuration.Builder()
                 .zone(z)
                 .build();

.idea/encodings.xml

@@ -156,28 +156,28 @@ public void complete(ResponseInfo rinfo, JSONObject response) {
         Assert.assertEquals(ResponseInfo.UnknownHost, info.statusCode);
     }
 
-    @SmallTest
-    public void testPostNoPort() throws Throwable {
-
-        httpManager.asyncPost("http://up.qiniu.com:12345", "hello".getBytes(),
-                null, null, new CompletionHandler() {
-                    @Override
-                    public void complete(ResponseInfo rinfo, JSONObject response) {
-                        Log.d("qiniutest", rinfo.toString());
-                        info = rinfo;
-                        signal.countDown();
-                    }
-                }, null);
-
-        try {
-            signal.await(60, TimeUnit.SECONDS); // wait for callback
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        Assert.assertEquals("", info.reqId);
-        Assert.assertTrue(ResponseInfo.CannotConnectToHost == info.statusCode ||
-                ResponseInfo.TimedOut == info.statusCode);
-    }
+//    @SmallTest
+//    public void testPostNoPort() throws Throwable {
+//
+//        httpManager.asyncPost("http://up.qiniu.com:12345", "hello".getBytes(),
+//                null, null, new CompletionHandler() {
+//                    @Override
+//                    public void complete(ResponseInfo rinfo, JSONObject response) {
+//                        Log.d("qiniutest", rinfo.toString());
+//                        info = rinfo;
+//                        signal.countDown();
+//                    }
+//                }, null);
+//
+//        try {
+//            signal.await(60, TimeUnit.SECONDS); // wait for callback
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+//        Assert.assertEquals("", info.reqId);
+//        Assert.assertTrue(ResponseInfo.CannotConnectToHost == info.statusCode ||
+//                ResponseInfo.TimedOut == info.statusCode);
+//    }
 
     @SmallTest
     public void testPostIP() throws Throwable {

.idea/gradle.xml

@@ -5,6 +5,7 @@
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
+import com.qiniu.android.common.FixedZone;
 import com.qiniu.android.common.ServiceAddress;
 import com.qiniu.android.common.Zone;
 import com.qiniu.android.http.ResponseInfo;
@@ -36,7 +37,7 @@ public class PortTest extends InstrumentationTestCase {
     @Override
     protected void setUp() throws Exception {
         ServiceAddress s1 = new ServiceAddress("http://upload.qiniu.com:8888");
-        Zone z = new Zone(s1, s1);
+        Zone z = new FixedZone(s1, s1);
         Configuration config = new Configuration.Builder().zone(z).build();
         uploadManager = new UploadManager(config);
     }