You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/10/17 08:25:59 UTC

[46/50] incubator-weex git commit: * [android] fix unit android test log mocked

* [android] fix unit android test log mocked


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d3c5dddc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d3c5dddc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d3c5dddc

Branch: refs/heads/release-0.16
Commit: d3c5dddc7bc839b13eada0d678c83656de5fe9b8
Parents: cbfb1a9
Author: atomtong <to...@qq.com>
Authored: Tue Oct 17 11:22:25 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Oct 17 15:48:46 2017 +0800

----------------------------------------------------------------------
 android/sdk/build.gradle                                         | 1 +
 android/sdk/src/test/java/com/taobao/weex/utils/WXUtilsTest.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d3c5dddc/android/sdk/build.gradle
----------------------------------------------------------------------
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 0be69fb..a49a05f 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -127,6 +127,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
     testOptions {
+        unitTests.returnDefaultValues = true
         unitTests.all {
             maxHeapSize = "1024m"
             jvmArgs += ['-XX:-UseSplitVerifier', '-noverify','-Xverify:none']/* fix VerifyError  */

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d3c5dddc/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 e981c69..5b6d273 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
@@ -19,6 +19,7 @@
 package com.taobao.weex.utils;
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.taobao.weappplus_sdk.BuildConfig;
 import com.taobao.weex.WXEnvironment;
@@ -49,7 +50,7 @@ import static org.mockito.Matchers.any;
 @RunWith(PowerMockRunner.class)
 @Config(constants = BuildConfig.class, sdk = 19)
 @PowerMockIgnore( {"org.mockito.*", "org.robolectric.*", "android.*"})
-@PrepareForTest( {WXEnvironment.class, WXViewUtils.class, WXSDKInstance.class, TextUtils.class})
+@PrepareForTest( {WXEnvironment.class, WXViewUtils.class, WXSDKInstance.class, TextUtils.class, Log.class, WXUtils.class, WXLogUtils.class})
 public class WXUtilsTest extends TestCase {
 
     public static final float TEST_DENSITY = 3.0f;