Skip to content

Commit 7ed9d8a

Browse files
sxcisxci
committed
test
1 parent f227b9c commit 7ed9d8a

File tree

7 files changed

+45
-21
lines changed

7 files changed

+45
-21
lines changed

‎src/main/java/com/qiniu/common/QiniuException.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ public QiniuException(Response response) {
1818
}
1919

2020
public QiniuException(Exception e) {
21+
this(e, null);
22+
}
23+
24+
public QiniuException(Exception e, String msg) {
2125
super(e);
2226
this.response = null;
27+
this.error = msg;
2328
}
2429

2530
public String url() {

‎src/main/java/com/qiniu/common/Zone.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ public class Zone {
77
// 地址: https://cf.qiniu.io/pages/viewpage.action?pageId=16092953
88

99
private String upHttp = "http://up.qiniu.com";
10-
private String upBackupHttp = "http://upload.qiniu.com";
1110
private String upHttps = "https://up.qbox.me";
11+
private String upBackupHttp = "http://upload.qiniu.com";
1212
private String upBackupHttps = "https://upload.qbox.me";
1313
private String upIpHttp = "";
1414
private String upIpHttps = "";
1515
private String iovipHttp = "http://iovip.qbox.me";
1616
private String iovipHttps = "https://iovip.qbox.me";
1717

18-
// 下方地址,会经中间转发
18+
1919
private String rsHttp = "http://rs.qiniu.com";
2020
private String rsHttps = "https://rs.qbox.me";
2121
private String rsfHttp = "http://rsf.qiniu.com";
@@ -28,8 +28,8 @@ public class Zone {
2828
* 华东
2929
*/
3030
public static Zone zone0() {
31-
return new Builder().up("http://up.qiniu.com").upBackup("http://upload.qiniu.com").
32-
upHttps("https://up.qbox.me").upBackupHttps("https://upload.qbox.me").
31+
return new Builder().up("http://up.qiniu.com").upHttps("https://up.qbox.me").
32+
upBackup("http://upload.qiniu.com").upBackupHttps("https://upload.qbox.me").
3333
iovip("http://iovip.qbox.me").iovipHttps("https://iovip.qbox.me").
3434
rs("http://rs-z0.qiniu.com").rsHttps("https://rs-z0.qbox.me").
3535
rsf("http://rsf-z0.qiniu.com").rsfHttps("https://rsf-z0.qbox.me").
@@ -40,8 +40,8 @@ public static Zone zone0() {
4040
* 华北
4141
*/
4242
public static Zone zone1() {
43-
return new Builder().up("http://up-z1.qiniu.com").upBackup("http://upload-z1.qiniu.com").
44-
upHttps("https://up-z1.qbox.me").upBackupHttps("https://upload-z1.qbox.me").
43+
return new Builder().up("http://up-z1.qiniu.com").upHttps("https://up-z1.qbox.me").
44+
upBackup("http://upload-z1.qiniu.com").upBackupHttps("https://upload-z1.qbox.me").
4545
iovip("http://iovip-z1.qbox.me").iovipHttps("https://iovip-z1.qbox.me").
4646
rs("http://rs-z1.qiniu.com").rsHttps("https://rs-z1.qbox.me").
4747
rsf("http://rsf-z1.qiniu.com").rsfHttps("https://rsf-z1.qbox.me").
@@ -52,8 +52,8 @@ public static Zone zone1() {
5252
* 华南
5353
*/
5454
public static Zone zone2() {
55-
return new Builder().up("http://up-z2.qiniu.com").upBackup("http://upload-z2.qiniu.com").
56-
upHttps("https://up-z2.qbox.me").upBackupHttps("https://upload-z2.qbox.me").
55+
return new Builder().up("http://up-z2.qiniu.com").upHttps("https://up-z2.qbox.me").
56+
upBackup("http://upload-z2.qiniu.com").upBackupHttps("https://upload-z2.qbox.me").
5757
iovip("http://iovip-z2.qbox.me").iovipHttps("https://iovip-z2.qbox.me").
5858
rs("http://rs-z2.qiniu.com").rsHttps("https://rs-z2.qbox.me").
5959
rsf("http://rsf-z2.qiniu.com").rsfHttps("https://rsf-z2.qbox.me").
@@ -64,16 +64,16 @@ public static Zone zone2() {
6464
* 北美
6565
*/
6666
public static Zone zoneNa0() {
67-
return new Builder().up("http://up-na0.qiniu.com").upBackup("http://upload-na0.qiniu.com").
68-
upHttps("https://up-na0.qbox.me").upBackupHttps("https://upload-na0.qbox.me").
67+
return new Builder().up("http://up-na0.qiniu.com").upHttps("https://up-na0.qbox.me").
68+
upBackup("http://upload-na0.qiniu.com").upBackupHttps("https://upload-na0.qbox.me").
6969
iovip("http://iovip-na0.qbox.me").iovipHttps("https://iovip-na0.qbox.me").
7070
rs("http://rs-na0.qiniu.com").rsHttps("https://rs-na0.qbox.me").
7171
rsf("http://rsf-na0.qiniu.com").rsfHttps("https://rsf-na0.qbox.me").
7272
api("http://api.qiniu.com").apiHttps("https://api.qiniu.com").build();
7373
}
7474

7575
/**
76-
* 自动判断区域,用于快速测试、接入。实际中推荐使用固定 zone 。
76+
* 自动判断区域,用于快速接入。实际中推荐使用固定 zone 。
7777
* 空间所属区域,可到 portal 查询。
7878
*/
7979
public static Zone autoZone() {

‎src/main/java/com/qiniu/common/ZoneReqInfo.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,18 @@
99
public class ZoneReqInfo {
1010
public final String ak;
1111
public final String bucket;
12-
public ZoneReqInfo(String token) {
12+
13+
public ZoneReqInfo(String token) throws QiniuException {
1314
// http://developer.qiniu.com/article/developer/security/upload-token.html
1415
// http://developer.qiniu.com/article/developer/security/put-policy.html
15-
String[] strings = token.split(":");
16-
ak = strings[0];
17-
String policy = new String(UrlSafeBase64.decode(strings[2]), Constants.UTF_8);
18-
bucket = Json.decode(policy).get("scope").toString().split(":")[0];
16+
try {
17+
String[] strings = token.split(":");
18+
ak = strings[0];
19+
String policy = new String(UrlSafeBase64.decode(strings[2]), Constants.UTF_8);
20+
bucket = Json.decode(policy).get("scope").toString().split(":")[0];
21+
} catch (Exception e) {
22+
throw new QiniuException(e, "token is invalid");
23+
}
1924
}
2025

2126
public ZoneReqInfo(String ak, String bucket) {

‎src/main/java/com/qiniu/storage/Configuration.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.qiniu.storage;
22

3+
import com.qiniu.common.QiniuException;
34
import com.qiniu.common.ZoneReqInfo;
45
import com.qiniu.common.Constants;
56
import com.qiniu.common.Zone;
@@ -65,15 +66,15 @@ public Configuration clone() {
6566
return null;
6667
}
6768

68-
public String upHost(String upToken) {
69+
public String upHost(String upToken) throws QiniuException {
6970
if (uploadByHttps) {
7071
return zone.getUpHttps(new ZoneReqInfo(upToken));
7172
} else {
7273
return zone.getUpHttp(new ZoneReqInfo(upToken));
7374
}
7475
}
7576

76-
public String upHostBackup(String upToken) {
77+
public String upHostBackup(String upToken) throws QiniuException {
7778
if (uploadByHttps) {
7879
return zone.getUpBackupHttps(new ZoneReqInfo(upToken));
7980
} else {

‎src/test/java/com/qiniu/storage/BucketTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ public void testList() {
4343
assertNotNull(l.marker);
4444
} catch (QiniuException e) {
4545
e.printStackTrace();
46+
assertEquals("", e.error());
47+
assertEquals("", e.getMessage());
4648
fail();
4749
}
4850
}
@@ -60,6 +62,8 @@ public void testListUseDelimiter() {
6062

6163
} catch (QiniuException e) {
6264
e.printStackTrace();
65+
assertEquals("", e.error());
66+
assertEquals("", e.getMessage());
6367
fail();
6468
}
6569
}

‎src/test/java/com/qiniu/storage/RecordUploadTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ public void run() {
107107
assertNotNull(response);
108108
assertTrue(response.isOK());
109109
assertEquals(etag, hash);
110-
doSleep(100);
110+
doSleep(500);
111111
showRecord("nodata: " + size + " :", recorder, recordKey);
112-
assertNull(recorder.get(recordKey));
112+
assertNull("文件上传成功,但断点记录文件为清理", recorder.get(recordKey));
113113
} finally {
114114
TempFile.remove(f);
115115
}

‎src/test/java/com/qiniu/streaming/StreamingTest.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.qiniu.streaming;
22

3+
import com.qiniu.TestConfig;
34
import com.qiniu.common.QiniuException;
45
import com.qiniu.streaming.model.ActivityRecords;
56
import com.qiniu.streaming.model.StreamAttribute;
@@ -14,7 +15,15 @@
1415
* Created by bailong on 16/9/22.
1516
*/
1617
public class StreamingTest {
17-
private Auth auth = Auth.create(System.getenv("ak"), System.getenv("sk"));
18+
private Auth auth = null;
19+
20+
{
21+
try {
22+
auth = Auth.create(System.getenv("ak"), System.getenv("sk"));
23+
} catch (Exception e) {
24+
auth = TestConfig.testAuth;
25+
}
26+
}
1827
private String hub = "pilisdktest";
1928
private String streamKeyPrefix = "pilijava" + System.currentTimeMillis();
2029
private StreamingManager manager = new StreamingManager(auth, hub);

0 commit comments

Comments
 (0)