token test

Author: longbai

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

@@ -70,6 +70,7 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
         Assert.assertTrue(info.isOK());
         Assert.assertNotNull(info.reqId);
         Assert.assertNotNull(resp);
+        Assert.assertEquals("/", info.path);
     }
 
     @SmallTest
@@ -106,6 +107,7 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) {
         Assert.assertEquals(expectKey, key);
         Assert.assertTrue(info.isOK());
         Assert.assertNotNull(info.reqId);
+        Assert.assertEquals("/", info.path);
         Assert.assertNotNull(resp);
         Assert.assertEquals("Fqr0xh3cxeii2r7eDztILNmuqUNN", resp.optString("key", ""));
     }

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

@@ -14,4 +14,18 @@ public void testRight() {
         UpToken t = UpToken.parse(TestConfig.token);
         Assert.assertNotNull(t);
     }
+
+    public void testEmpty() {
+        UpToken t = UpToken.parse(null);
+        Assert.assertNull(t);
+
+        t = UpToken.parse("");
+        Assert.assertNull(t);
+    }
+
+    public void testReturnUrl() {
+        UpToken t = UpToken.parse("QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm:1jLiztn4plVyeB8Hie1ryO5z9uo=:eyJzY29wZSI6InB5c2RrIiwiZGVhZGxpbmUiOjE0MzM0ODM5MzYsInJldHVyblVybCI6Imh0dHA6Ly8xMjcuMC4wLjEvIn0=");
+        Assert.assertTrue(t.hasReturnUrl());
+    }
+
 }

library/src/main/java/com/qiniu/android/http/ResponseHandler.java

@@ -53,13 +53,16 @@ public final class ResponseHandler extends AsyncHttpResponseHandler {
      */
     private int port = -1;
 
+    private String path = null;
+
     public ResponseHandler(String url, CompletionHandler completionHandler, ProgressHandler progressHandler) {
         super(Looper.getMainLooper());
         URI uri = null;
         try {
             uri = new URI(url);
             this.host = uri.getHost();
             this.port = uri.getPort();
+            this.path = uri.getPath();
         } catch (URISyntaxException e) {
             this.host = "N/A";
             e.printStackTrace();
@@ -69,7 +72,7 @@ public ResponseHandler(String url, CompletionHandler completionHandler, Progress
     }
 
     private static ResponseInfo buildResponseInfo(int statusCode, Header[] headers, byte[] responseBody,
-                                                  String host, String ip, int port, double duration, Throwable error) {
+                                                  String host, String path, String ip, int port, double duration, Throwable error) {
 
         if (error != null && error instanceof CancellationHandler.CancellationException) {
             return ResponseInfo.cancelled();
@@ -138,7 +141,7 @@ private static ResponseInfo buildResponseInfo(int statusCode, Header[] headers,
             }
         }
 
-        return new ResponseInfo(statusCode, reqId, xlog, xvia, host, ip, port, duration, err);
+        return new ResponseInfo(statusCode, reqId, xlog, xvia, host, path, ip, port, duration, err);
     }
 
     private static JSONObject buildJsonResp(byte[] body) throws Exception {
@@ -156,15 +159,15 @@ public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) {
         } catch (Exception e) {
             exception = e;
         }
-        ResponseInfo info = buildResponseInfo(statusCode, headers, null, host, ip, port, duration, exception);
+        ResponseInfo info = buildResponseInfo(statusCode, headers, null, host, path, ip, port, duration, exception);
         Log.i("upload----success", info.toString());
         completionHandler.complete(info, obj);
     }
 
     @Override
     public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) {
         double duration = (System.currentTimeMillis() - reqStartTime) / 1000.0;
-        ResponseInfo info = buildResponseInfo(statusCode, headers, responseBody, host, ip, port, duration, error);
+        ResponseInfo info = buildResponseInfo(statusCode, headers, responseBody, host, path, ip, port, duration, error);
         Log.i("upload----failed", info.toString());
         completionHandler.complete(info, null);
     }

library/src/main/java/com/qiniu/android/http/ResponseInfo.java

@@ -58,34 +58,40 @@ public final class ResponseInfo {
      */
     public final int port;
 
-    public ResponseInfo(int statusCode, String reqId, String xlog, String xvia, String host, String ip, int port, double duration, String error) {
+    /**
+     * 访问路径
+     */
+    public final String path;
+
+    public ResponseInfo(int statusCode, String reqId, String xlog, String xvia, String host, String path, String ip, int port, double duration, String error) {
         this.statusCode = statusCode;
         this.reqId = reqId;
         this.xlog = xlog;
         this.xvia = xvia;
         this.host = host;
+        this.path = path;
         this.duration = duration;
         this.error = error;
         this.ip = ip;
         this.port = port;
     }
 
     public static ResponseInfo cancelled() {
-        return new ResponseInfo(Cancelled, "", "", "", "", "", -1, 0, "cancelled by user");
+        return new ResponseInfo(Cancelled, "", "", "", "", "",  "", -1, 0, "cancelled by user");
     }
 
     public static ResponseInfo invalidArgument(String message) {
-        return new ResponseInfo(InvalidArgument, "", "", "", "", "", -1, 0,
+        return new ResponseInfo(InvalidArgument, "", "", "", "", "", "", -1, 0,
                 message);
     }
 
     public static ResponseInfo invalidToken(String message) {
-        return new ResponseInfo(InvalidToken, "", "", "", "", "", -1, 0,
+        return new ResponseInfo(InvalidToken, "", "", "", "", "", "", -1, 0,
                 message);
     }
 
     public static ResponseInfo fileError(Exception e) {
-        return new ResponseInfo(InvalidFile, "", "", "", "", "", -1,
+        return new ResponseInfo(InvalidFile, "", "", "", "", "", "", -1,
                 0, e.getMessage());
     }
 
@@ -122,7 +128,7 @@ public boolean isNotQiniu() {
     }
 
     public String toString() {
-        return String.format(Locale.ENGLISH, "{ResponseInfo:%s,status:%d, reqId:%s, xlog:%s, xvia:%s, host:%s, ip:%s, port:%d, duration:%f s, error:%s}",
-                super.toString(), statusCode, reqId, xlog, xvia, host, ip, port, duration, error);
+        return String.format(Locale.ENGLISH, "{ResponseInfo:%s,status:%d, reqId:%s, xlog:%s, xvia:%s, host:%s, path:%s, ip:%s, port:%d, duration:%f s, error:%s}",
+                super.toString(), statusCode, reqId, xlog, xvia, host, path, ip, port, duration, error);
     }
 }

library/src/main/java/com/qiniu/android/storage/FormUploader.java

@@ -138,6 +138,6 @@ public void complete(ResponseInfo info, JSONObject response) {
     }
 
     private static String genUploadAddress(String host, int port) {
-        return "http://" + host + ":" + port;
+        return "http://" + host + ":" + port + "/";
     }
 }

library/src/main/java/com/qiniu/android/storage/UpToken.java

@@ -49,7 +49,7 @@ public String toString(){
         return token;
     }
 
-    boolean hasReturnUrl(){
+    public boolean hasReturnUrl(){
         return !returnUrl.equals("");
     }