Skip to content

Commit 5a29c8a

Browse files
committed
Add tramsform test
1 parent a3c0b58 commit 5a29c8a

File tree

3 files changed

+89
-26
lines changed

3 files changed

+89
-26
lines changed

src/main/java/com/qiniu/api/rs/PutPolicy.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ public class PutPolicy {
4848
public long deadline;
4949

5050
/**
51-
*
52-
* 对文件先进行一次变换操作(比如将音频统一转为某种码率的mp3)再进行存储。
53-
* transform的值就是一个fop指令,比如 "avthumb/mp3"。其含义是对上传的文件
54-
* 执行这个 fop 指令,然后把结果保存到七牛。最后保存的是经过处理过的文件,
55-
* 而不是用户上传的原始文件。
56-
*
51+
*
52+
* 对文件先进行一次变换操作(比如将音频统一转为某种码率的mp3)再进行存储。
53+
* transform的值就是一个fop指令,比如 "avthumb/mp3"。其含义是对上传的文件
54+
* 执行这个 fop 指令,然后把结果保存到七牛。最后保存的是经过处理过的文件,
55+
* 而不是用户上传的原始文件。
56+
*
5757
**/
5858
public String transform;
5959

src/test/java/com/qiniu/testing/IOTest.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,26 +64,6 @@ public void testPut() throws Exception {
6464
}
6565
}
6666

67-
/**
68-
* 这个案例测试上传后转码并将转码结果保存为目标文件。例中使用了 PutPolicy 中的
69-
* transform 和 fopTimeout 两个参数,分别对应要进行的转码操作和转码超时时间,
70-
* 测试的时候请将例中的 localFile 改成合法的文件路径。
71-
**/
72-
public void testPutTransform() throws Exception {
73-
PutPolicy putPolicy = new PutPolicy(bucketName);
74-
putPolicy.transform = "avthumb/mp3";
75-
putPolicy.fopTimeout = 60;
76-
77-
String uptoken = putPolicy.token(mac);
78-
String localFile = "/Users/ikbear/7niu/music.mp4";
79-
String key = "music-ikbear.mp3";
80-
81-
PutExtra extra = new PutExtra();
82-
83-
PutRet ret = IoApi.putFile(uptoken, key, localFile, extra);
84-
assertTrue(ret.ok());
85-
}
86-
8767
@Override
8868
public void tearDown() {
8969
// delete the metadata from rs
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
package com.qiniu.testing;
2+
3+
import java.io.*;
4+
5+
import junit.framework.TestCase;
6+
7+
import com.qiniu.api.auth.digest.Mac;
8+
import com.qiniu.api.config.Config;
9+
import com.qiniu.api.io.IoApi;
10+
import com.qiniu.api.io.PutExtra;
11+
import com.qiniu.api.io.PutRet;
12+
import com.qiniu.api.net.CallRet;
13+
import com.qiniu.api.rs.Entry;
14+
import com.qiniu.api.rs.PutPolicy;
15+
import com.qiniu.api.rs.RSClient;
16+
17+
public class TransformTest extends TestCase {
18+
19+
// because all the testcase concurrently executes
20+
// so the key should be different.
21+
public final String key = "IOTest-key";
22+
23+
public final String expectedHash = "FivxSqsM1SyWCnYeIGPUqZM5LL4b";
24+
25+
public String bucketName;
26+
27+
public Mac mac;
28+
@Override
29+
public void setUp() {
30+
Config.ACCESS_KEY = System.getenv("QINIU_ACCESS_KEY");
31+
Config.SECRET_KEY = System.getenv("QINIU_SECRET_KEY");
32+
Config.RS_HOST = System.getenv("QINIU_RS_HOST");
33+
bucketName = System.getenv("QINIU_TEST_BUCKET");
34+
35+
assertNotNull(Config.ACCESS_KEY);
36+
assertNotNull(Config.SECRET_KEY);
37+
assertNotNull(Config.RS_HOST);
38+
assertNotNull(bucketName);
39+
mac = new Mac(Config.ACCESS_KEY, Config.SECRET_KEY);
40+
}
41+
42+
public void testPutTransform() throws Exception {
43+
PutPolicy putPolicy = new PutPolicy(bucketName);
44+
putPolicy.transform = "imageView/2/w/100/h/100";
45+
putPolicy.fopTimeout = 10;
46+
47+
String uptoken = putPolicy.token(mac);
48+
String dir = System.getProperty("user.dir");
49+
String localFile = dir + "/testdata/" + "logo.png";
50+
51+
PutExtra extra = new PutExtra();
52+
53+
PutRet ret = IoApi.putFile(uptoken, key, localFile, extra);
54+
assertTrue(ret.ok());
55+
}
56+
57+
@Override
58+
public void tearDown() {
59+
// delete the metadata from rs
60+
// confirms it exists.
61+
{
62+
RSClient rs = new RSClient(mac);
63+
Entry sr = rs.stat(bucketName, key);
64+
System.out.println(sr.getHash());
65+
assertTrue(sr.ok());
66+
assertTrue(expectedHash.equals(sr.getHash()));
67+
}
68+
69+
// deletes it from rs
70+
{
71+
RSClient rs = new RSClient(mac);
72+
CallRet cr = rs.delete(bucketName, key);
73+
assertTrue(cr.ok());
74+
}
75+
76+
// confirms that it's deleted
77+
{
78+
RSClient rs = new RSClient(mac);
79+
Entry sr = rs.stat(bucketName, key);
80+
assertTrue(!sr.ok());
81+
}
82+
}
83+
}

0 commit comments

Comments
 (0)