Skip to content

Commit 0853cd5

Browse files
author
chupei
committed
update token
1 parent e46bd58 commit 0853cd5

File tree

3 files changed

+87
-86
lines changed

3 files changed

+87
-86
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[![@qiniu on weibo](http://img.shields.io/badge/weibo-%40qiniutek-blue.svg)](http://weibo.com/qiniutek)
44
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
55
[![Build Status](https://travis-ci.org/qiniu/android-sdk.svg?branch=master)](https://travis-ci.org/qiniu/android-sdk)
6+
[![codecov](https://codecov.io/gh/qiniu/android-sdk/branch/master/graph/badge.svg)](https://codecov.io/gh/qiniu/android-sdk)
67
[![Latest Stable Version](http://img.shields.io/maven-central/v/com.qiniu/qiniu-android-sdk.svg)](https://github.com/qiniu/android-sdk/releases)
78

89
## 演示代码

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

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -134,86 +134,86 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
134134

135135

136136
/////模拟域名失败后，再重试的场景，需要手动修改zone域名无效来模拟/////
137-
// @SmallTest
138-
// public void testPutBytesWithFixedZoneUseBackupDomains() {
139-
// //have changed old code , because token policy been changed
140-
// //mime type
141-
// final String mimeType = "text/plain";
142-
// final UploadOptions options = new UploadOptions(null, mimeType, true, null, null);
143-
// byte[] putData = "hello qiniu cloud storage".getBytes();
144-
//
145-
// for (Map.Entry<String, Zone> bucketZone : this.mockBucketZoneMap.entrySet()) {
146-
// final CountDownLatch signal = new CountDownLatch(1);
147-
// final String bucket = bucketZone.getKey();
148-
// final Zone zone = bucketZone.getValue();
149-
// final String upToken = this.bucketTokenMap.get(bucket);
150-
// Log.e("qiniutest",upToken);
151-
//
152-
// final String expectKey = String.format("androidsdk/%s/qiniu_put_bytes_test.txt", bucket);
153-
//
154-
// Configuration cfg = new Configuration.Builder()
155-
// .zone(zone)
156-
// .useHttps(false)
157-
// .build();
158-
// UploadManager uploadManagerWithCfg = new UploadManager(cfg);
159-
// uploadManagerWithCfg.put(putData, expectKey, upToken, new UpCompletionHandler() {
160-
// public void complete(String key, ResponseInfo info, JSONObject response) {
161-
// Log.i("Qiniu.TestPutBytes", "upload result of bucket " + bucket);
162-
// Log.d("Qiniu.TestPutBytes", info.toString());
163-
//
164-
// responseBody = response;
165-
// signal.countDown();
166-
//
167-
// }
168-
// }, options);
169-
//
170-
// try {
171-
// signal.await(120, TimeUnit.SECONDS);
172-
// } catch (Exception ex) {
173-
// Assert.fail("Qiniu.TestPutBytes timeout");
174-
// }
175-
// }
176-
//
177-
// //retry will success
178-
// for (Map.Entry<String, Zone> bucketZone : this.mockBucketZoneMap.entrySet()) {
179-
// final CountDownLatch signal = new CountDownLatch(1);
180-
// final String bucket = bucketZone.getKey();
181-
// final String upToken = this.bucketTokenMap.get(bucket);
182-
// Log.e("qiniutest","retry:"+upToken);
183-
// final String expectKey = String.format("androidsdk/%s/qiniu_put_bytes_test.txt", bucket);
184-
//
185-
// Configuration cfg = new Configuration.Builder()
186-
// .useHttps(false)
187-
// .build();
188-
// UploadManager uploadManagerWithCfg = new UploadManager(cfg);
189-
// uploadManagerWithCfg.put(putData, expectKey, upToken, new UpCompletionHandler() {
190-
// public void complete(String key, ResponseInfo info, JSONObject response) {
191-
// Log.i("Qiniu.TestPutBytes", "upload result of bucket " + bucket);
192-
// Log.d("Qiniu.TestPutBytes", info.toString());
193-
//
194-
// responseBody = response;
195-
// Log.e("qiniutest","responseBody:"+responseBody.toString());
196-
// signal.countDown();
197-
//
198-
// }
199-
// }, options);
200-
//
201-
// try {
202-
// signal.await(120, TimeUnit.SECONDS);
203-
// } catch (Exception ex) {
204-
// Assert.fail("Qiniu.TestPutBytes timeout");
205-
// }
206-
//
207-
// try {
208-
// Log.e("qiniutest",responseBody.toString());
209-
// Assert.assertEquals("Qiniu.TestPutBytes upload failed", expectKey,
210-
// responseBody.getString("key"));
211-
// } catch (Exception ex) {
212-
// Assert.fail("Qiniu.TestPutBytes " + ex.getMessage());
213-
// }
214-
// }
215-
//
216-
//
217-
// }
137+
@SmallTest
138+
public void testPutBytesWithFixedZoneUseBackupDomains() {
139+
//have changed old code , because token policy been changed
140+
//mime type
141+
final String mimeType = "text/plain";
142+
final UploadOptions options = new UploadOptions(null, mimeType, true, null, null);
143+
byte[] putData = "hello qiniu cloud storage".getBytes();
144+
145+
for (Map.Entry<String, Zone> bucketZone : this.mockBucketZoneMap.entrySet()) {
146+
final CountDownLatch signal = new CountDownLatch(1);
147+
final String bucket = bucketZone.getKey();
148+
final Zone zone = bucketZone.getValue();
149+
final String upToken = this.bucketTokenMap.get(bucket);
150+
Log.e("qiniutest",upToken);
151+
152+
final String expectKey = String.format("androidsdk/%s/qiniu_put_bytes_test.txt", bucket);
153+
154+
Configuration cfg = new Configuration.Builder()
155+
.zone(zone)
156+
.useHttps(false)
157+
.build();
158+
UploadManager uploadManagerWithCfg = new UploadManager(cfg);
159+
uploadManagerWithCfg.put(putData, expectKey, upToken, new UpCompletionHandler() {
160+
public void complete(String key, ResponseInfo info, JSONObject response) {
161+
Log.i("Qiniu.TestPutBytes", "upload result of bucket " + bucket);
162+
Log.d("Qiniu.TestPutBytes", info.toString());
163+
164+
responseBody = response;
165+
signal.countDown();
166+
167+
}
168+
}, options);
169+
170+
try {
171+
signal.await(120, TimeUnit.SECONDS);
172+
} catch (Exception ex) {
173+
Assert.fail("Qiniu.TestPutBytes timeout");
174+
}
175+
}
176+
177+
//retry will success
178+
for (Map.Entry<String, Zone> bucketZone : this.mockBucketZoneMap.entrySet()) {
179+
final CountDownLatch signal = new CountDownLatch(1);
180+
final String bucket = bucketZone.getKey();
181+
final String upToken = this.bucketTokenMap.get(bucket);
182+
Log.e("qiniutest","retry:"+upToken);
183+
final String expectKey = String.format("androidsdk/%s/qiniu_put_bytes_test.txt", bucket);
184+
185+
Configuration cfg = new Configuration.Builder()
186+
.useHttps(false)
187+
.build();
188+
UploadManager uploadManagerWithCfg = new UploadManager(cfg);
189+
uploadManagerWithCfg.put(putData, expectKey, upToken, new UpCompletionHandler() {
190+
public void complete(String key, ResponseInfo info, JSONObject response) {
191+
Log.i("Qiniu.TestPutBytes", "upload result of bucket " + bucket);
192+
Log.d("Qiniu.TestPutBytes", info.toString());
193+
194+
responseBody = response;
195+
Log.e("qiniutest","responseBody:"+responseBody.toString());
196+
signal.countDown();
197+
198+
}
199+
}, options);
200+
201+
try {
202+
signal.await(120, TimeUnit.SECONDS);
203+
} catch (Exception ex) {
204+
Assert.fail("Qiniu.TestPutBytes timeout");
205+
}
206+
207+
try {
208+
Log.e("qiniutest",responseBody.toString());
209+
Assert.assertEquals("Qiniu.TestPutBytes upload failed", expectKey,
210+
responseBody.getString("key"));
211+
} catch (Exception ex) {
212+
Assert.fail("Qiniu.TestPutBytes " + ex.getMessage());
213+
}
214+
}
215+
216+
217+
}
218218

219219
}

‎library/src/androidTest/java/com/qiniu/android/TestConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ public final class TestConfig {
1010
// TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
1111
//华东上传凭证
1212
public static final String bucket_z0 = "sdk-z0";
13-
public static final String token_z0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:MLccAwMXUHBNVwpgywQ20wYkS8I=:eyJzY29wZSI6InNkay16MCIsImRlYWRsaW5lIjoxNTkzNDk5NTE3fQ==";
13+
public static final String token_z0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:WYvuul25V_gUskDyy16eTI9KH_Y=:eyJzY29wZSI6Ind4YXBwdGVzdCIsImRlYWRsaW5lIjoxNTk0MjI0NzYyfQ==";
1414
//华北上传凭证
1515
public static final String bucket_z1 = "sdk-z1";
16-
public static final String token_z1 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:iC0aCzDNRvbm84Y8eNqQcf91YYY=:eyJzY29wZSI6InNkay16MSIsImRlYWRsaW5lIjoxNTkzNDk5NTE3fQ==";
16+
public static final String token_z1 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:WYvuul25V_gUskDyy16eTI9KH_Y=:eyJzY29wZSI6Ind4YXBwdGVzdCIsImRlYWRsaW5lIjoxNTk0MjI0NzYyfQ==";
1717
//华南上传凭证
1818
public static final String bucket_z2 = "sdk-z2";
19-
public static final String token_z2 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:593xYJbCtm53J-Sn0YmPaMV84zk=:eyJzY29wZSI6InNkay16MiIsImRlYWRsaW5lIjoxNTkzNDk5NTE3fQ==";
19+
public static final String token_z2 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:WYvuul25V_gUskDyy16eTI9KH_Y=:eyJzY29wZSI6Ind4YXBwdGVzdCIsImRlYWRsaW5lIjoxNTk0MjI0NzYyfQ==";
2020
//北美上传凭证
2121
public static final String bucket_na0 = "sdk-na0";
22-
public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:0AwL9XyCCT3nF2KE_NnwdRVAu64=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTU5MzQ5OTUxN30=";
22+
public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:WYvuul25V_gUskDyy16eTI9KH_Y=:eyJzY29wZSI6Ind4YXBwdGVzdCIsImRlYWRsaW5lIjoxNTk0MjI0NzYyfQ==";
2323
public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
2424

2525
//dns prefetch token
26-
public static final String uptoken_prefetch = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:6DI77dUwjkGlcX1Ad1weNvdopX8=:eyJzY29wZSI6InRlc3QiLCJkZWFkbGluZSI6MTU5MDkzOTk1Mn0=";
26+
public static final String uptoken_prefetch = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:WYvuul25V_gUskDyy16eTI9KH_Y=:eyJzY29wZSI6Ind4YXBwdGVzdCIsImRlYWRsaW5lIjoxNTk0MjI0NzYyfQ==";
2727

2828
/**
2929
* 华东机房

0 commit comments

Comments
 (0)