Skip to content

Commit fd584fc

Browse files
author
YangSen-qn
committed
Merge branch 'master' into refactor
# Conflicts: # library/build.gradle # library/src/androidTest/java/com/qiniu/android/TestConfig.java # library/src/androidTest/java/com/qiniu/android/common/AutoZoneTest.java
2 parents e79859d + 23fca5a commit fd584fc

File tree

7 files changed

+124
-29
lines changed

7 files changed

+124
-29
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jdk:
99
android:
1010
components:
1111
#- tools
12-
#- platform-tools
13-
#- tools
12+
- platform-tools
13+
- tools
1414

1515
# The BuildTools version used by your project
1616
- build-tools-29.0.2
@@ -37,7 +37,7 @@ before_script:
3737
script:
3838
- ./gradlew build
3939
- ./gradlew :library:createDebugAndroidTestCoverageReport --info --stacktrace
40-
- ./gradlew connectedAndroidTest --info
40+
- ./gradlew connectedAndroidTest --info --stacktrace
4141

4242
after_success:
4343
- bash <(curl -s https://codecov.io/bash)

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#Changelog
2+
# 7.6.5
3+
* 优化Dns local cache
24

35
# 7.6.4
46
* 修复io异常

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ https://github.com/qiniudemo/qiniu-lab-android
2525
| 7.0.7 | Android 2.2+ | android-async-http 1.4.8 |
2626

2727
### 注意
28-
* 推荐使用最新版：7.6.4
29-
* 7.4.6是在7.6.4版本上降低okhttp版本，其他功能不变，AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
28+
* 推荐使用最新版：7.6.5
29+
* AndroidNetwork.getMobileDbm()可以获取手机信号强度，需要如下权限(API>=18时生效)
3030
```
3131
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
3232
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

‎library/library.iml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
3232
<exclude-output />
3333
<content url="file://$MODULE_DIR$">
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3734
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4342
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
4545
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />

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

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
package com.qiniu.android;
2+
3+
import android.test.AndroidTestCase;
4+
import android.util.Log;
5+
6+
import com.qiniu.android.http.ResponseInfo;
7+
import com.qiniu.android.storage.Configuration;
8+
import com.qiniu.android.storage.UpCompletionHandler;
9+
import com.qiniu.android.storage.UploadManager;
10+
11+
import junit.framework.Assert;
12+
13+
import org.json.JSONObject;
14+
15+
import java.io.File;
16+
import java.io.IOException;
17+
import java.util.concurrent.CountDownLatch;
18+
import java.util.concurrent.TimeUnit;
19+
20+
public class ComplexUploadSceneTest extends AndroidTestCase {
21+
22+
private final CountDownLatch signal = new CountDownLatch(1);
23+
24+
public void testMutiUpload(){
25+
26+
final int maxCount = 10;
27+
28+
final TestParam param = new TestParam();
29+
param.completeCount = 0;
30+
param.successCount = 0;
31+
32+
for (int i = 0; i < maxCount; i++) {
33+
template((i + 1) * 100, new CompleteHandler() {
34+
@Override
35+
public void complete(boolean isSuccess) {
36+
37+
synchronized (param){
38+
param.completeCount += 1;
39+
if (isSuccess){
40+
param.successCount += 1;
41+
}
42+
if (param.completeCount == maxCount){
43+
signal.countDown();
44+
}
45+
}
46+
}
47+
});
48+
}
49+
50+
try {
51+
signal.await(); // wait for callback
52+
} catch (InterruptedException e) {
53+
}
54+
55+
Log.d("ComplexUploadSceneTest", "complex_upload successCount: " + param.successCount);
56+
assertTrue("Pass", param.successCount == param.completeCount);
57+
}
58+
59+
private void template(int size, final CompleteHandler completeHandler){
60+
61+
final String keyUp = "android_complex_upload_" + size + "k";
62+
File file = null;
63+
try {
64+
file = TempFile.createFile(size);
65+
} catch (IOException e) {
66+
completeHandler.complete(false);
67+
return;
68+
}
69+
70+
Configuration configuration = new Configuration.Builder()
71+
.useHttps(true)
72+
.build();
73+
UploadManager manager = new UploadManager(configuration);
74+
75+
manager.put(file, keyUp, TestConfig.token_na0, new UpCompletionHandler() {
76+
@Override
77+
public void complete(String key, ResponseInfo info, JSONObject response) {
78+
if (info.isOK() && info.reqId != null && keyUp.equals(key)){
79+
completeHandler.complete(true);
80+
} else {
81+
completeHandler.complete(false);
82+
}
83+
}
84+
}, null);
85+
}
86+
87+
private interface CompleteHandler{
88+
void complete(boolean isSuccess);
89+
}
90+
91+
92+
private class TestParam{
93+
int successCount = 0;
94+
int completeCount = 0;
95+
}
96+
97+
}

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

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,22 @@
77
* Created by bailong on 14/10/12.
88
*/
99
public final class TestConfig {
10-
// 华东上传凭证
11-
public static final String bucket_z0 = "zone0-space";
12-
public static final String token_z0 = "jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:DtOhccYARFhzC4cpxtPaclI5sPU=:eyJzY29wZSI6InpvbmUwLXNwYWNlIiwiZGVhZGxpbmUiOjE1OTczOTMzOTYsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
13-
// 华北上传凭证
14-
public static final String bucket_z1 = "zone1-space";
15-
public static final String token_z1 = "jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:mWEhowqz4sG301DXU6CB3IO7Zss=:eyJzY29wZSI6InpvbmUxLXNwYWNlIiwiZGVhZGxpbmUiOjE1OTczOTMzOTYsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
16-
// 华南上传凭证
17-
public static final String bucket_z2 = "zone2-space";
18-
public static final String token_z2 = "jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:fGU4puSFnDWhRjTTmOyNkhFcxYE=:eyJzY29wZSI6InpvbmUyLXNwYWNlIiwiZGVhZGxpbmUiOjE1OTczOTMzOTYsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
19-
// 北美上传凭证
20-
public static final String bucket_na0 = "zone-na0-space";
21-
public static final String token_na0 = "jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:Bt4b0a7mBSdvlPrERMM02uv66BM=:eyJzY29wZSI6InpvbmUtbmEwLXNwYWNlIiwiZGVhZGxpbmUiOjE1OTczOTMzOTYsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
22-
// 东南亚上传凭证
23-
public static final String bucket_as0 = "zone-as0-space";
24-
public static final String token_as0 = "jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:eJsEzd2oeyRvP89-8nJ1Uvz-R3E=:eyJzY29wZSI6InpvbmUtYXMwLXNwYWNlIiwiZGVhZGxpbmUiOjE1OTczOTMzOTYsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKX0ifQ==";
25-
public static final String invalidBucketToken = "jH983zIUFIP1OVumiBVGeAfiLYJvwrF45S-t22eu:0LQHe4TLjIla-aYkTsBeE0zQSQE=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNTk3MzkzMzk2LCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSl9In0=";
26-
27-
10+
// TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
11+
//华东上传凭证
12+
public static final String bucket_z0 = "sdk-z0";
13+
public static final String token_z0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:fO65e-s-sRrcNiWkZ3qcrCLM3pM=:eyJzY29wZSI6InNkay16MCIsImRlYWRsaW5lIjoxNTk3MjAyMDYwfQ==";
14+
//华北上传凭证
15+
public static final String bucket_z1 = "sdk-z1";
16+
public static final String token_z1 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:KHpcWxGAAut9zJjGaHEqEbjlf-c=:eyJzY29wZSI6InNkay16MSIsImRlYWRsaW5lIjoxNTk3MjAyMDgzfQ==";
17+
//华南上传凭证
18+
public static final String bucket_z2 = "sdk-z2";
19+
public static final String token_z2 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:yt7nub2-FOkK2zwodXSgxinpboE=:eyJzY29wZSI6InNkay16MiIsImRlYWRsaW5lIjoxNTk3MjAyMTAwfQ==";
20+
//北美上传凭证
21+
public static final String bucket_na0 = "sdk-na0";
22+
public static final String token_na0 = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW:J9AbA4jVl4BtsAFg9XooZaa2Iyk=:eyJzY29wZSI6InNkay1uYTAiLCJkZWFkbGluZSI6MTU5NzIwMjExNX0=";
23+
2824
// -----------
29-
public static final String ak = "QWYn5TFQsLLU1pL5MFEmX3s5DmHdUThav9WyOWOm";
25+
public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
3026

3127

3228
//测试通用的token

‎library/src/main/java/com/qiniu/android/common/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
public final class Constants {
5-
public static final String VERSION = "7.6.4";
5+
public static final String VERSION = "7.6.5";
66

77
public static final String UTF_8 = "utf-8";
88
}

0 commit comments

Comments
 (0)