FormUpload With InputStream

Author: 缘潘

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

@@ -88,33 +88,6 @@ public void accept(String key, Object value) {
         return ret;
     }
 
-    /**
-     * 上传字节流，默认分片上传
-     * @param inputStream
-     * @param key
-     * @param token
-     * @return
-     * @throws QiniuException
-     * @throws IOException
-     */
-    public Response put(InputStream inputStream, String key, String token) throws QiniuException, IOException {
-    	return put(inputStream, -1, key, token, null, null, false);
-    }
-    
-    /**
-     * 上传字节流，小文件走表单，大文件走分片
-     * @param inputStream
-     * @param size
-     * @param key
-     * @param token
-     * @return
-     * @throws QiniuException
-     * @throws IOException
-     */
-    public Response put(InputStream inputStream, long size, String key, String token) throws QiniuException, IOException {
-    	return put(inputStream, size, key, token, null, null, false);
-    }
-    
 	/**
 	 * 上传字节流，小文件走表单，大文件走分片
 	 * @param inputStream

src/test/java/test/com/qiniu/TestConfig.java

@@ -2,7 +2,7 @@
 
 import com.qiniu.util.Auth;
 
-import test.com.qiniu.storage.FormUploadTest2;
+import test.com.qiniu.storage.FormUploadTest;
 
 public final class TestConfig {
 
@@ -46,10 +46,9 @@ public static boolean isTravis() {
     }
 
     public static void main(String[] args) {
-    	FormUploadTest2 t = new FormUploadTest2();
     	try {
+    		FormUploadTest t = new FormUploadTest();
     		t.testFormUploadWithInputStream();
-    		t.testFormUploadWithInputStreamWithPolicy();
 			System.out.println("done");
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -14,6 +14,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -450,6 +451,47 @@ public void testFormLargeSize2() {
             }
         }
     }
+    
+	/**
+	 * 测试inputStream 表单上传
+	 * 检测reqid是否为Null
+	 * 检测状态码是否为200
+	 */
+	@Test
+	public void testFormUploadWithInputStream() {
+		testFormUploadWithInputStream(1, -1);
+		testFormUploadWithInputStream(1, 0);
+		testFormUploadWithInputStream(1, 1000);
+		testFormUploadWithInputStream(4 * 1024, 4 * 1024 * 1024);
+		testFormUploadWithInputStream(5 * 1024, -1);
+		testFormUploadWithInputStream(5 * 1024, 5 * 1024 * 1024);
+	}
+	
+	/**
+	 * 测试inputStream 表单上传
+	 * 检测reqid是否为Null
+	 * 检测状态码是否为200
+	 */
+	public void testFormUploadWithInputStream(long kiloSize, long size) {
+		
+		String token = TestConfig.testAuth.uploadToken(TestConfig.testBucket_z0, TestConfig.testBucket_z0, 3600, null);
+		System.out.println("token="+token);
+		
+		try {
+			File file = TempFile.createFile(kiloSize);
+			InputStream inputStream = new FileInputStream(file);
+			System.out.println("length=" + file.length());
+			System.out.println("size=" + size);
+			Response response = uploadManager.put(inputStream, size, TestConfig.testBucket_z0, token, null, null, false);
+			System.out.println("code="+response.statusCode);
+			System.out.println("reqid="+response.reqId);
+			System.out.println(response.bodyString());
+			assertNotNull(response.reqId);
+			assertEquals(200, response.statusCode);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 
     class MyRet {
         public String hash;