Repository: incubator-weex Updated Branches: refs/heads/0.13-dev 42f2a85e7 -> b36852d18
[android] fix wx unit test Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c935fea6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c935fea6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c935fea6 Branch: refs/heads/0.13-dev Commit: c935fea6393ed38d3f4ddcdb8e0e7d46538297c5 Parents: 17961aa Author: è¡ä¹ <yiyuan.zhan...@alibaba-inc.com> Authored: Wed May 3 11:50:08 2017 +0800 Committer: è¡ä¹ <yiyuan.zhan...@alibaba-inc.com> Committed: Wed May 3 11:50:08 2017 +0800 ---------------------------------------------------------------------- .../java/com/taobao/weex/utils/WXUtilsTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c935fea6/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java b/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java index 9976b69..e981c69 100644 --- a/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java +++ b/android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java @@ -110,27 +110,27 @@ public class WXUtilsTest extends TestCase { @Test public void testGetFloatWX() throws Exception { - Float test_float = WXUtils.getFloat("100wx"); + Float test_float = WXUtils.getFloatByViewport("100wx", TEST_VIEW_PORT); Float want = 100 * TEST_DENSITY * TEST_VIEW_PORT / TEST_SCREEN_WIDTH; assertEquals(test_float, want , 0.01); - test_float = WXUtils.getFloat("100px"); + test_float = WXUtils.getFloatByViewport("100px", TEST_VIEW_PORT); want = 100F; assertEquals(test_float, want); - test_float = WXUtils.getFloat("100.2"); + test_float = WXUtils.getFloatByViewport("100.2", TEST_VIEW_PORT); want = 100.2F; assertEquals(test_float, want); - test_float = WXUtils.getFloat(100.2F); + test_float = WXUtils.getFloatByViewport(100.2F, TEST_VIEW_PORT); want = 100.2F; assertEquals(test_float, want, 0.0001); - test_float = WXUtils.getFloat(100.2D); + test_float = WXUtils.getFloatByViewport(100.2D, TEST_VIEW_PORT); want = 100.2F; assertEquals(test_float, want, 0.0001); - test_float = WXUtils.getFloat("NaN"); + test_float = WXUtils.getFloatByViewport("NaN", TEST_VIEW_PORT); want = Float.NaN; assertEquals(test_float, want); } @@ -138,7 +138,7 @@ public class WXUtilsTest extends TestCase { @Test public void testGetIntWX() throws Exception { Integer test_int = WXUtils.getInt("100wx"); - Integer want = (int)(100 * TEST_DENSITY * TEST_VIEW_PORT / TEST_SCREEN_WIDTH); + Integer want = (int)(100 * TEST_DENSITY * 750 / TEST_SCREEN_WIDTH); assertEquals(test_int, want); test_int = WXUtils.getInt("100px"); @@ -161,7 +161,7 @@ public class WXUtilsTest extends TestCase { @Test public void testGetDoubleWX() throws Exception { Double test_double = WXUtils.getDouble("100.32wx"); - Double want = (100.32D * TEST_DENSITY * TEST_VIEW_PORT / TEST_SCREEN_WIDTH); + Double want = (100.32D * TEST_DENSITY * 750 / TEST_SCREEN_WIDTH); assertEquals(test_double, want, 0.01); test_double = WXUtils.getDouble("100px");
