From 79e10fb7a86d6796cf7bffc39314ec90901c7291 Mon Sep 17 00:00:00 2001 From: longbai Date: Fri, 9 Oct 2015 14:54:07 +0800 Subject: [PATCH 1/7] update sdk --- library/build.gradle | 8 ++++---- library/library.iml | 11 ++++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index f40b4578f..029ebce45 100755 --- a/library/build.gradle +++ b/library/build.gradle @@ -20,12 +20,12 @@ String version = versionName() int code = versionNameToCode(version) android { - compileSdkVersion 22 - buildToolsVersion '22.0.1' + compileSdkVersion 23 + buildToolsVersion '23.0.1' defaultConfig { //applicationId "com.qiniu.android" - minSdkVersion 8 - targetSdkVersion 22 + minSdkVersion 9 + targetSdkVersion 23 versionCode code versionName version } diff --git a/library/library.iml b/library/library.iml index 5382e41c4..12202722d 100644 --- a/library/library.iml +++ b/library/library.iml @@ -37,13 +37,13 @@ - + - + @@ -65,6 +65,7 @@ + @@ -84,13 +85,17 @@ + + + - + + \ No newline at end of file From e5b1c71d09db2bd88e0de4139168ad4803162646 Mon Sep 17 00:00:00 2001 From: longbai Date: Fri, 9 Oct 2015 15:09:53 +0800 Subject: [PATCH 2/7] ajust port --- .travis.yml | 4 ++-- library/library.iml | 2 +- .../com/qiniu/android/http/ThreadSafeClientConnManager.java | 2 +- .../main/java/com/qiniu/android/storage/Configuration.java | 2 +- .../main/java/com/qiniu/android/storage/ResumeUploader.java | 4 ++-- .../main/java/com/qiniu/android/storage/UploadManager.java | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f22275807..f24dfd92f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ android: - tools # The BuildTools version used by your project - - build-tools-22.0.1 + - build-tools-23.0.1 # The SDK version used to compile your project - - android-22 + - android-23 # Specify at least one system image # if you need to run emulator(s) during your tests diff --git a/library/library.iml b/library/library.iml index 12202722d..61520f375 100644 --- a/library/library.iml +++ b/library/library.iml @@ -92,7 +92,7 @@ - + diff --git a/library/src/main/java/com/qiniu/android/http/ThreadSafeClientConnManager.java b/library/src/main/java/com/qiniu/android/http/ThreadSafeClientConnManager.java index 50d3bc6b6..fcf9aa461 100644 --- a/library/src/main/java/com/qiniu/android/http/ThreadSafeClientConnManager.java +++ b/library/src/main/java/com/qiniu/android/http/ThreadSafeClientConnManager.java @@ -19,7 +19,7 @@ public ThreadSafeClientConnManager(HttpParams params, SchemeRegistry schreg, Dns //在父类构造函数中调用 @Override - protected cz.msebera.android.httpclient.conn.ClientConnectionOperator createConnectionOperator(final SchemeRegistry schreg) { + protected cz.msebera.android.httpclient.conn.ClientConnectionOperator createConnectionOperator(final SchemeRegistry schreg) { DnsManager d = dns == null ? AsyncHttpClientMod.local.get() : dns; return new ClientConnectionOperator(schreg, d);// @ThreadSafe } diff --git a/library/src/main/java/com/qiniu/android/storage/Configuration.java b/library/src/main/java/com/qiniu/android/storage/Configuration.java index 3da2488b8..d02399812 100644 --- a/library/src/main/java/com/qiniu/android/storage/Configuration.java +++ b/library/src/main/java/com/qiniu/android/storage/Configuration.java @@ -165,7 +165,7 @@ public Builder() { this.upHostBackup = Zone.zone0.upHostBackup; this.upIp = Zone.zone0.upIp; this.upIp2 = Zone.zone0.upIp2; - this.upPort = 8888; + this.upPort = 80; } public Builder zone(Zone zone) { diff --git a/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java b/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java index 73e2140bd..b92934a72 100644 --- a/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java +++ b/library/src/main/java/com/qiniu/android/storage/ResumeUploader.java @@ -110,7 +110,7 @@ public void run() { */ private void makeBlock(String host, int offset, int blockSize, int chunkSize, ProgressHandler progress, CompletionHandler _completionHandler, UpCancellationSignal c) { - String url = format(Locale.ENGLISH, "http://%s/mkblk/%d", host, blockSize); + String url = format(Locale.ENGLISH, "http://%s:%d/mkblk/%d", host, config.upPort, blockSize); try { file.seek(offset); file.read(chunkBuffer, 0, chunkSize); @@ -155,7 +155,7 @@ private void makeFile(String host, CompletionHandler _completionHandler, UpCance } paramStr = "/" + StringUtils.join(str, "/"); } - String url = format(Locale.ENGLISH, "http://%s/mkfile/%d%s%s%s", host, size, mime, keyStr, paramStr); + String url = format(Locale.ENGLISH, "http://%s:%d/mkfile/%d%s%s%s", host, config.upPort, size, mime, keyStr, paramStr); String bodyStr = StringUtils.join(contexts, ","); byte[] data = bodyStr.getBytes(); diff --git a/library/src/main/java/com/qiniu/android/storage/UploadManager.java b/library/src/main/java/com/qiniu/android/storage/UploadManager.java index bb34f289c..2d7a292fd 100644 --- a/library/src/main/java/com/qiniu/android/storage/UploadManager.java +++ b/library/src/main/java/com/qiniu/android/storage/UploadManager.java @@ -9,8 +9,8 @@ /** * 七牛文件上传管理器 - * - * + *

+ *

* 一般默认可以使用这个类的方法来上传数据和文件。这个类自动检测文件的大小， * 只要超过了{@link Configuration#putThreshold} */ From 26fa137e86f8346511cb100d19520e2e00823dfc Mon Sep 17 00:00:00 2001 From: longbai Date: Fri, 9 Oct 2015 15:32:49 +0800 Subject: [PATCH 3/7] modify default dns to 119.29.29.29 --- CHANGELOG.md | 7 +++++++ .../src/main/java/com/qiniu/android/common/Constants.java | 2 +- .../main/java/com/qiniu/android/storage/Configuration.java | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9430d17f2..64cce05c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ #Changelog +## 7.0.8 (2015-08-05) + +### 调整 +* android-async-http 最低版本要求 1.4.9, 为了兼容 Android 6.0 感谢 Haoxiqiang +* 升级SDK环境 +* 默认http port 为80 + ## 7.0.7.1 (2015-08-05) ### 修正 diff --git a/library/src/main/java/com/qiniu/android/common/Constants.java b/library/src/main/java/com/qiniu/android/common/Constants.java index 7eb425a63..d95399562 100644 --- a/library/src/main/java/com/qiniu/android/common/Constants.java +++ b/library/src/main/java/com/qiniu/android/common/Constants.java @@ -2,7 +2,7 @@ public final class Constants { - public static final String VERSION = "7.0.7.1"; + public static final String VERSION = "7.0.8"; public static final String UTF_8 = "utf-8"; } diff --git a/library/src/main/java/com/qiniu/android/storage/Configuration.java b/library/src/main/java/com/qiniu/android/storage/Configuration.java index d02399812..ec8a434eb 100644 --- a/library/src/main/java/com/qiniu/android/storage/Configuration.java +++ b/library/src/main/java/com/qiniu/android/storage/Configuration.java @@ -109,7 +109,7 @@ private static DnsManager initDns(Builder builder) { IResolver r1 = AndroidDnsServer.defaultResolver(); IResolver r2 = null; try { - r2 = new Resolver(InetAddress.getByName("223.6.6.6")); + r2 = new Resolver(InetAddress.getByName("119.29.29.29")); } catch (IOException ex) { ex.printStackTrace(); } From 19bc162c06f8d3efef28726aa61e2f0dc05eb8d8 Mon Sep 17 00:00:00 2001 From: longbai Date: Fri, 9 Oct 2015 15:34:11 +0800 Subject: [PATCH 4/7] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64cce05c1..b250a5e44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * android-async-http 最低版本要求 1.4.9, 为了兼容 Android 6.0 感谢 Haoxiqiang * 升级SDK环境 * 默认http port 为80 +* 首选dns server 改为 119.29.29.29 ## 7.0.7.1 (2015-08-05) From 5fb16fc6569c505bd9adad0b8ba77f00a67acf86 Mon Sep 17 00:00:00 2001 From: longbai Date: Fri, 9 Oct 2015 15:34:32 +0800 Subject: [PATCH 5/7] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b250a5e44..707edf5a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ #Changelog -## 7.0.8 (2015-08-05) +## 7.0.8 (2015-10-09) ### 调整 * android-async-http 最低版本要求 1.4.9, 为了兼容 Android 6.0 感谢 Haoxiqiang From ac0eafec1955810b0e8369d6eab9f06b82d284a0 Mon Sep 17 00:00:00 2001 From: longbai Date: Sat, 10 Oct 2015 00:10:08 +0800 Subject: [PATCH 6/7] fixed test --- .../java/com/qiniu/android/CancelTest.java | 36 ++---- .../com/qiniu/android/FormUploadTest.java | 112 ++++++------------ .../java/com/qiniu/android/PortTest.java | 16 +-- .../com/qiniu/android/ResumeUploadTest.java | 56 ++++----- .../com/qiniu/android/TestFileRecorder.java | 32 ++--- 5 files changed, 79 insertions(+), 173 deletions(-) diff --git a/library/src/androidTest/java/com/qiniu/android/CancelTest.java b/library/src/androidTest/java/com/qiniu/android/CancelTest.java index 9af596eb2..53ec1fbff 100644 --- a/library/src/androidTest/java/com/qiniu/android/CancelTest.java +++ b/library/src/androidTest/java/com/qiniu/android/CancelTest.java @@ -33,7 +33,7 @@ public class CancelTest extends InstrumentationTestCase { private volatile boolean failed; private volatile UploadManager uploadManager; private volatile String key; - private volatile ResponseInfo info; + private volatile ResponseInfo info = null; private volatile JSONObject resp; private volatile UploadOptions options; @@ -133,22 +133,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(570, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isCancelled()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertFalse(info.isOK()); - Assert.assertTrue(info.isCancelled()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isCancelled()); Assert.assertNull(resp); TempFile.remove(tempFile); @@ -206,22 +197,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(570, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isCancelled()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertFalse(info.isOK()); - Assert.assertTrue(info.isCancelled()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isCancelled()); Assert.assertNull(resp); } diff --git a/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java b/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java index 8e128a85c..f8db4048b 100644 --- a/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java +++ b/library/src/androidTest/java/com/qiniu/android/FormUploadTest.java @@ -53,21 +53,12 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); Assert.assertNotNull(info.reqId); Assert.assertNotNull(resp); Assert.assertEquals("/", info.path); @@ -95,17 +86,14 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); + Assert.assertNotNull(info.reqId); Assert.assertEquals("/", info.path); Assert.assertNotNull(resp); @@ -131,11 +119,12 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - Assert.assertEquals(expectKey, key); - Assert.assertEquals(ResponseInfo.InvalidToken, info.statusCode); + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertEquals(info.toString(), ResponseInfo.InvalidToken, info.statusCode); Assert.assertNotNull(info.reqId); Assert.assertNull(resp); } @@ -157,11 +146,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - Assert.assertEquals(expectKey, key); - Assert.assertEquals(ResponseInfo.InvalidArgument, info.statusCode); + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertEquals(info.toString(), ResponseInfo.InvalidArgument, + info.statusCode); Assert.assertNull(resp); } @@ -184,11 +175,12 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - Assert.assertEquals(expectKey, key); - Assert.assertEquals(ResponseInfo.InvalidArgument, info.statusCode); + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertEquals(info.toString(), ResponseInfo.InvalidArgument, info.statusCode); Assert.assertNull(resp); } @@ -211,11 +203,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - Assert.assertEquals(expectKey, key); - Assert.assertEquals(ResponseInfo.InvalidArgument, info.statusCode); + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertEquals(info.toString(), ResponseInfo.InvalidArgument, + info.statusCode); Assert.assertNull(resp); } @@ -238,21 +232,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(130, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); Assert.assertNotNull(info.reqId); Assert.assertNotNull(resp); TempFile.remove(f); @@ -306,21 +292,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); Assert.assertNotNull(info.reqId); Assert.assertNotNull(resp); } @@ -350,21 +328,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); Assert.assertNotNull(info.reqId); Assert.assertNotNull(resp); } @@ -393,21 +363,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); Assert.assertNotNull(info.reqId); Assert.assertNotNull(resp); } diff --git a/library/src/androidTest/java/com/qiniu/android/PortTest.java b/library/src/androidTest/java/com/qiniu/android/PortTest.java index ad44bb2fa..1066a27b3 100644 --- a/library/src/androidTest/java/com/qiniu/android/PortTest.java +++ b/library/src/androidTest/java/com/qiniu/android/PortTest.java @@ -95,21 +95,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { private void check(final String expectKey) { try { signal.await(120, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); Assert.assertNotNull(info.reqId); Assert.assertNotNull(resp); } diff --git a/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java b/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java index 5a30e442c..b776b30f5 100644 --- a/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java +++ b/library/src/androidTest/java/com/qiniu/android/ResumeUploadTest.java @@ -24,11 +24,11 @@ public class ResumeUploadTest extends InstrumentationTestCase { final CountDownLatch signal = new CountDownLatch(1); private UploadManager uploadManager; private volatile String key; - private volatile ResponseInfo info; + private volatile ResponseInfo info = null; private volatile JSONObject resp; public void setUp() throws Exception { - Configuration config = new Configuration.Builder().upPort(9999).build(); + Configuration config = new Configuration.Builder().upPort(8888).build(); uploadManager = new UploadManager(config); } @@ -50,22 +50,16 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { }); try { - signal.await(500, TimeUnit.SECONDS); // wait for callback + signal.await(600, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + + Assert.assertEquals(info.toString(), expectKey, key); + + Assert.assertTrue(info.toString(), info.isOK()); + Assert.assertNotNull(info.reqId); Assert.assertNotNull(resp); TempFile.remove(f); @@ -87,19 +81,15 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(500, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } + + Assert.assertEquals(info.toString(), expectKey, key); + + Assert.assertTrue(info.toString(), info.isOK()); + Assert.assertEquals(expectKey, key); Assert.assertTrue(info.isOK()); Assert.assertNotNull(info.reqId); @@ -129,19 +119,15 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(500, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } + + Assert.assertEquals(info.toString(), expectKey, key); + + Assert.assertTrue(info.toString(), info.isOK()); + Assert.assertEquals(expectKey, key); Assert.assertTrue(info.isOK()); Assert.assertNotNull(info.reqId); diff --git a/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java b/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java index 9c426513f..69ae441a4 100644 --- a/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java +++ b/library/src/androidTest/java/com/qiniu/android/TestFileRecorder.java @@ -81,21 +81,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal.await(600, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isCancelled()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isCancelled()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isCancelled()); Assert.assertNull(resp); cancelled = false; @@ -125,21 +117,13 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { try { signal2.await(500, TimeUnit.SECONDS); // wait for callback + Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace(); } - // 尝试获取info信息。 - // key == null ： 没进入 complete ？ 什么导致的？ - if (!expectKey.equals(key)) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - if (info == null || !info.isOK()) { - //此处通不过， travis 会打印信息 - Assert.assertEquals("", info); - } - Assert.assertEquals(expectKey, key); - Assert.assertTrue(info.isOK()); + + Assert.assertEquals(info.toString(), expectKey, key); + Assert.assertTrue(info.toString(), info.isOK()); Assert.assertTrue(!failed); Assert.assertNotNull(resp); From c0bf54d5a1535c8053abef8c8d4427bf5ded70c3 Mon Sep 17 00:00:00 2001 From: longbai Date: Sat, 10 Oct 2015 11:08:36 +0800 Subject: [PATCH 7/7] increase test timeout --- .../src/androidTest/java/com/qiniu/android/PortTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/androidTest/java/com/qiniu/android/PortTest.java b/library/src/androidTest/java/com/qiniu/android/PortTest.java index 1066a27b3..6a237b330 100644 --- a/library/src/androidTest/java/com/qiniu/android/PortTest.java +++ b/library/src/androidTest/java/com/qiniu/android/PortTest.java @@ -68,8 +68,8 @@ public void test323K() throws Throwable { } @MediumTest - public void test4223K() throws Throwable { - fileTemplate(4223); + public void test800K() throws Throwable { + fileTemplate(800); } public void fileTemplate(int size) throws Throwable { @@ -94,7 +94,7 @@ public void complete(String k, ResponseInfo rinfo, JSONObject response) { private void check(final String expectKey) { try { - signal.await(120, TimeUnit.SECONDS); // wait for callback + signal.await(600, TimeUnit.SECONDS); // wait for callback Assert.assertNotNull("timeout", info); } catch (InterruptedException e) { e.printStackTrace();