Merge pull request #227 from sxci/7.0

 自定义变量

Author: longbai

src/main/java/com/qiniu/storage/ResumeUploader.java

@@ -165,7 +165,7 @@ public void accept(String key, Object value) {
                     b.append("/");
                     b.append(key);
                     b.append("/");
-                    b.append(value);
+                    b.append(UrlSafeBase64.encodeToString("" + value));
                 }
             });
         }

src/test/java/com/qiniu/HttpTest.java

@@ -22,13 +22,13 @@ public void testPost1() {
     }
 
     @Test
-    public void testPost2() {
+    public void testPost2() throws Exception {
         Response r = null;
         try {
             r = httpManager.post("http://up.qiniu.com", "hello", null);
             Assert.fail();
         } catch (QiniuException e) {
-            Assert.assertNotNull(e.response.reqId);
+            Assert.assertEquals(false, e.response.isOK());
         }
     }
 

src/test/java/com/qiniu/storage/FormUploadTest.java

@@ -170,6 +170,33 @@ public void complete(String key, Response r) {
         }
     }
 
+    @Test
+    public void testXVar() {
+        final String expectKey = "世/界";
+        File f = null;
+        try {
+            f = TempFile.createFile(1);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        assert f != null;
+        StringMap params = new StringMap().put("x:foo", "foo_val");
+        final String returnBody = "{\"key\":\"$(key)\",\"hash\":\"$(etag)\",\"fsize\":\"$(fsize)\""
+                + ",\"fname\":\"$(fname)\",\"mimeType\":\"$(mimeType)\",\"foo\":\"$(x:foo)\"}";
+        String token = TestConfig.testAuth.uploadToken(TestConfig.bucket, expectKey, 3600,
+                new StringMap().put("returnBody", returnBody));
+
+        try {
+            Response res = uploadManager.put(f, expectKey, token, params, null, true);
+            StringMap m = res.jsonToMap();
+            assertEquals("foo_val", m.get("foo"));
+        } catch (QiniuException e) {
+            fail();
+        } finally {
+            TempFile.remove(f);
+        }
+    }
+
     @Test
     public void testFname() {
         final String expectKey = "世/界";

src/test/java/com/qiniu/storage/ResumeUploadTest.java

@@ -16,12 +16,33 @@
 
 public class ResumeUploadTest {
 
-    class MyRet {
-        public String hash;
-        public String key;
-        public String fsize;
-        public String fname;
-        public String mimeType;
+    @Test
+    public void testXVar() throws IOException {
+        final String expectKey = "世/界";
+        File f = null;
+        try {
+            f = TempFile.createFile(1024 * 4 + 2341);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        assert f != null;
+        StringMap params = new StringMap().put("x:foo", "foo_val");
+        final String returnBody = "{\"key\":\"$(key)\",\"hash\":\"$(etag)\",\"fsize\":\"$(fsize)\""
+                + ",\"fname\":\"$(fname)\",\"mimeType\":\"$(mimeType)\",\"foo\":\"$(x:foo)\"}";
+        String token = TestConfig.testAuth.uploadToken(TestConfig.bucket, expectKey, 3600,
+                new StringMap().put("returnBody", returnBody));
+
+        try {
+            UploadManager uploadManager = new UploadManager();
+            Response res = uploadManager.put(f, expectKey, token, params, null, true);
+            StringMap m = res.jsonToMap();
+            assertEquals("foo_val", m.get("foo"));
+        } catch (QiniuException e) {
+            assertEquals("", e.response.bodyString());
+            fail();
+        } finally {
+            TempFile.remove(f);
+        }
     }
 
     private void template(int size) throws IOException {
@@ -70,4 +91,12 @@ public void test8M1k() throws Throwable {
         }
         template(1024 * 8 + 1);
     }
+
+    class MyRet {
+        public String hash;
+        public String key;
+        public String fsize;
+        public String fname;
+        public String mimeType;
+    }
 }