You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2017/09/13 09:41:27 UTC
[03/12] incubator-weex git commit: * [android] Update FlatGUI testcase
* [android] Update FlatGUI testcase
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/878c3a9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/878c3a9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/878c3a9e
Branch: refs/heads/0.16-dev
Commit: 878c3a9ea589cb77a87b9fd61d57aef8e089ddbe
Parents: bc6ea40
Author: YorkShen <sh...@gmail.com>
Authored: Fri Aug 25 16:40:26 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Sep 13 16:54:07 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/WXDivTest.java | 12 +++++-------
.../com/taobao/weex/ui/component/WXTextTest.java | 18 +++++++++---------
2 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/878c3a9e/android/sdk/src/test/java/com/taobao/weex/ui/component/WXDivTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/ui/component/WXDivTest.java b/android/sdk/src/test/java/com/taobao/weex/ui/component/WXDivTest.java
index 53b52c3..3aa9674 100644
--- a/android/sdk/src/test/java/com/taobao/weex/ui/component/WXDivTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/ui/component/WXDivTest.java
@@ -18,6 +18,8 @@
*/
package com.taobao.weex.ui.component;
+import static org.junit.Assert.assertEquals;
+
import com.taobao.weappplus_sdk.BuildConfig;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.WXSDKInstanceTest;
@@ -25,21 +27,15 @@ import com.taobao.weex.dom.TestDomObject;
import com.taobao.weex.dom.WXDomObject;
import com.taobao.weex.dom.WXEvent;
import com.taobao.weex.dom.flex.Spacing;
-
+import com.taobao.weex.ui.flat.FlatGUIIContext;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-import org.robolectric.RobolectricTestRunner;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import static org.junit.Assert.*;
-
/**
* Created by gulin on 16/2/24.
*/
@@ -65,6 +61,7 @@ public class WXDivTest {
public void setUp() throws Exception {
WXSDKInstance instance = Mockito.mock(WXSDKInstance.class);
Mockito.when(instance.getContext()).thenReturn(RuntimeEnvironment.application);
+ Mockito.when(instance.getFlatUIContext()).thenReturn(new FlatGUIIContext());
WXDomObject divDom = new WXDomObject();
WXDomObject spy = Mockito.spy(divDom);
@@ -80,6 +77,7 @@ public class WXDivTest {
public void testAddChild(){
WXSDKInstance instance = Mockito.mock(WXSDKInstance.class);
Mockito.when(instance.getContext()).thenReturn(RuntimeEnvironment.application);
+ Mockito.when(instance.getFlatUIContext()).thenReturn(new FlatGUIIContext());
WXDomObject testDom = Mockito.mock(WXDomObject.class);
Mockito.when(testDom.getPadding()).thenReturn(new Spacing());
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/878c3a9e/android/sdk/src/test/java/com/taobao/weex/ui/component/WXTextTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/ui/component/WXTextTest.java b/android/sdk/src/test/java/com/taobao/weex/ui/component/WXTextTest.java
index 0181457..a12095e 100644
--- a/android/sdk/src/test/java/com/taobao/weex/ui/component/WXTextTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/ui/component/WXTextTest.java
@@ -18,6 +18,11 @@
*/
package com.taobao.weex.ui.component;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import com.taobao.weappplus_sdk.BuildConfig;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
@@ -27,7 +32,9 @@ import com.taobao.weex.dom.WXDomObject;
import com.taobao.weex.dom.WXTextDomObject;
import com.taobao.weex.dom.flex.Spacing;
import com.taobao.weex.ui.SimpleComponentHolder;
-
+import com.taobao.weex.ui.flat.FlatGUIIContext;
+import java.util.HashMap;
+import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,14 +43,6 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
/**
* Created by gulin on 16/2/4.
*/
@@ -60,6 +59,7 @@ public class WXTextTest {
WXEnvironment.sApplication = RuntimeEnvironment.application;
WXSDKInstance instance = Mockito.mock(WXSDKInstance.class);
Mockito.when(instance.getContext()).thenReturn(RuntimeEnvironment.application);
+ Mockito.when(instance.getFlatUIContext()).thenReturn(new FlatGUIIContext());
mParentDomObj = Mockito.spy(new WXDomObject());
Mockito.when(mParentDomObj.getPadding()).thenReturn(new Spacing());