From d378e5047b62c5e49045f34ae5258bd6cc6a25bb Mon Sep 17 00:00:00 2001 From: Sxci Date: Tue, 10 Jan 2017 13:32:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E6=95=B0=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=BA=A2=E5=87=BA=20[ci=20skip]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/androidTest/java/com/qiniu/android/EtagTest.java | 8 ++++++++ library/src/main/java/com/qiniu/android/utils/Etag.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/library/src/androidTest/java/com/qiniu/android/EtagTest.java b/library/src/androidTest/java/com/qiniu/android/EtagTest.java index 84b819dce..d229e9df9 100644 --- a/library/src/androidTest/java/com/qiniu/android/EtagTest.java +++ b/library/src/androidTest/java/com/qiniu/android/EtagTest.java @@ -3,6 +3,7 @@ import android.test.AndroidTestCase; import com.qiniu.android.common.Constants; +import com.qiniu.android.storage.Configuration; import com.qiniu.android.utils.Etag; import junit.framework.Assert; @@ -40,6 +41,13 @@ public void testFile() throws IOException { f = TempFile.createFile(9 * 1024); Assert.assertEquals("ljgVjMtyMsOgIySv79U8Qz4TrUO4", Etag.file(f)); TempFile.remove(f); + } + public void testLongToInt() { + long len = 2323435710l; + int b = (int) ((len + Configuration.BLOCK_SIZE - 1) / Configuration.BLOCK_SIZE); + Assert.assertEquals("预计会溢出", 554, b); + int a = (int) (len + Configuration.BLOCK_SIZE - 1) / Configuration.BLOCK_SIZE; + Assert.assertNotSame("预计会溢出", 554, a); } } diff --git a/library/src/main/java/com/qiniu/android/utils/Etag.java b/library/src/main/java/com/qiniu/android/utils/Etag.java index d796fee76..dfe9eb26a 100644 --- a/library/src/main/java/com/qiniu/android/utils/Etag.java +++ b/library/src/main/java/com/qiniu/android/utils/Etag.java @@ -81,7 +81,7 @@ public static String stream(InputStream in, long len) throws IOException { return "Fto5o-5ea0sNMlW_75VgGJCv2AcJ"; } byte[] buffer = new byte[64 * 1024]; - byte[][] blocks = new byte[(int) (len + Configuration.BLOCK_SIZE - 1) / Configuration.BLOCK_SIZE][]; + byte[][] blocks = new byte[(int) ((len + Configuration.BLOCK_SIZE - 1) / Configuration.BLOCK_SIZE)][]; for (int i = 0; i < blocks.length; i++) { long left = len - (long) Configuration.BLOCK_SIZE * i; long read = left > Configuration.BLOCK_SIZE ? Configuration.BLOCK_SIZE : left; From e29e66666b675b752fa148e1c355d9a45385b3f9 Mon Sep 17 00:00:00 2001 From: Sxci Date: Tue, 10 Jan 2017 15:09:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E4=BF=AE[ci=20skip]?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/src/androidTest/java/com/qiniu/android/EtagTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/androidTest/java/com/qiniu/android/EtagTest.java b/library/src/androidTest/java/com/qiniu/android/EtagTest.java index d229e9df9..0dc4fa8d2 100644 --- a/library/src/androidTest/java/com/qiniu/android/EtagTest.java +++ b/library/src/androidTest/java/com/qiniu/android/EtagTest.java @@ -46,7 +46,7 @@ public void testFile() throws IOException { public void testLongToInt() { long len = 2323435710l; int b = (int) ((len + Configuration.BLOCK_SIZE - 1) / Configuration.BLOCK_SIZE); - Assert.assertEquals("预计会溢出", 554, b); + Assert.assertEquals("不应该溢出", 554, b); int a = (int) (len + Configuration.BLOCK_SIZE - 1) / Configuration.BLOCK_SIZE; Assert.assertNotSame("预计会溢出", 554, a); }