You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/09 01:36:40 UTC
[07/12] incubator-weex git commit: + [android] add ut case
+ [android] add ut case
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9fed9bbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9fed9bbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9fed9bbc
Branch: refs/heads/0.14-dev
Commit: 9fed9bbcc4002a509cce0317b2a75fe0911e2b30
Parents: f6f295b
Author: Rowandjj <rj...@gmail.com>
Authored: Thu Jun 8 16:13:15 2017 +0800
Committer: Rowandjj <rj...@gmail.com>
Committed: Thu Jun 8 16:13:15 2017 +0800
----------------------------------------------------------------------
.../ui/component/list/DefaultDragHelper.java | 1 +
.../weex/ui/component/list/WXListComponent.java | 6 -
.../component/list/DefaultDragHelperTest.java | 119 +++++++++++++++++++
3 files changed, 120 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9fed9bbc/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java
index ed878bf..50c4bb7 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/DefaultDragHelper.java
@@ -34,6 +34,7 @@ import java.util.Map;
/**
* Description:
+ * Drag-drop support for list
* <p>
* Created by rowandjj(chuyi)<br/>
*/
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9fed9bbc/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
index 2360e06..9b36be4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXListComponent.java
@@ -78,11 +78,6 @@ public class WXListComponent extends BasicListComponent<BounceRecyclerView> {
}
@Override
- public void onBindViewHolder(final ListBaseViewHolder holder, int position) {
- super.onBindViewHolder(holder, position);
- }
-
- @Override
protected BounceRecyclerView generateListView(Context context, int orientation) {
return new BounceRecyclerView(context,mLayoutType,mColumnCount,mColumnGap,orientation);
@@ -242,5 +237,4 @@ public class WXListComponent extends BasicListComponent<BounceRecyclerView> {
getHostView().removeHeaderView(child);
}
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9fed9bbc/android/sdk/src/test/java/com/taobao/weex/ui/component/list/DefaultDragHelperTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/ui/component/list/DefaultDragHelperTest.java b/android/sdk/src/test/java/com/taobao/weex/ui/component/list/DefaultDragHelperTest.java
new file mode 100644
index 0000000..d26418d
--- /dev/null
+++ b/android/sdk/src/test/java/com/taobao/weex/ui/component/list/DefaultDragHelperTest.java
@@ -0,0 +1,119 @@
+package com.taobao.weex.ui.component.list;
+
+import com.taobao.weappplus_sdk.BuildConfig;
+import com.taobao.weex.WXSDKInstanceTest;
+import com.taobao.weex.dom.TestDomObject;
+import com.taobao.weex.dom.WXDomObject;
+import com.taobao.weex.dom.WXListDomObject;
+import com.taobao.weex.ui.SimpleComponentHolder;
+import com.taobao.weex.ui.component.ComponentTest;
+import com.taobao.weex.ui.component.WXComponent;
+import com.taobao.weex.ui.component.WXDiv;
+import com.taobao.weex.ui.component.WXDivTest;
+import com.taobao.weex.ui.component.WXVContainer;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Matchers.anyMap;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Description:
+ * <p>
+ * Created by rowandjj(chuyi)<br/>
+ */
+@RunWith(RobolectricGradleTestRunner.class)
+@Config(constants = BuildConfig.class, sdk = 19)
+@PowerMockIgnore( {"org.mockito.*", "org.robolectric.*", "android.*"})
+public class DefaultDragHelperTest {
+
+ WXListComponent listComponent;
+
+ WXCell fakeCell;
+
+ private DragHelper mFakeDragHelper;
+
+ private EventTrigger mockedEventTrigger;
+
+ private WXComponent c1;
+ private WXComponent c2;
+ private WXComponent c3;
+
+ private List<WXComponent> mFakeDataSource;
+
+ public static WXListComponent create(WXVContainer parent) throws IllegalAccessException, InstantiationException, InvocationTargetException {
+ return create(parent,new WXListDomObject());
+ }
+
+ public static WXListComponent create(WXVContainer parent, WXDomObject dom) throws IllegalAccessException, InstantiationException, InvocationTargetException {
+ return (WXListComponent) new SimpleComponentHolder(WXListComponent.class).createInstance(WXSDKInstanceTest.createInstance(), dom, parent);
+ }
+
+ @Before
+ public void setUp() throws Exception {
+ WXDiv div = WXDivTest.create();
+ ComponentTest.create(div);
+ listComponent = create(div);
+ ComponentTest.create(listComponent);
+
+ fakeCell = new WXCell(WXSDKInstanceTest.createInstance(),new TestDomObject(),null,false);
+
+ c1 = new WXCell(WXSDKInstanceTest.createInstance(),new TestDomObject(),null,false);
+ c2 = new WXCell(WXSDKInstanceTest.createInstance(),new TestDomObject(),null,false);
+ c3 = new WXCell(WXSDKInstanceTest.createInstance(),new TestDomObject(),null,false);
+
+ mFakeDataSource = new ArrayList<>();
+ mFakeDataSource.add(c1);
+ mFakeDataSource.add(c2);
+ mFakeDataSource.add(c3);
+
+ mockedEventTrigger = mock(EventTrigger.class);
+
+ mFakeDragHelper = new DefaultDragHelper(mFakeDataSource,listComponent.getHostView().getInnerView(), mockedEventTrigger);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ listComponent.destroy();
+ }
+
+ @Test
+ public void onDragStart() throws Exception {
+ WXComponent c = new WXCell(WXSDKInstanceTest.createInstance(),new TestDomObject(),null,false);
+ mFakeDragHelper.onDragStart(c,3);
+ verify(mockedEventTrigger).triggerEvent(eq("dragstart"),anyMap());
+ }
+
+ @Test
+ public void onDragEnd() throws Exception {
+ WXComponent c = new WXCell(WXSDKInstanceTest.createInstance(),new TestDomObject(),null,false);
+ mFakeDragHelper.onDragEnd(c,1,2);
+ verify(mockedEventTrigger).triggerEvent(eq("dragend"),anyMap());
+ }
+
+ @Test
+ public void onDragging() throws Exception {
+ assertEquals(mFakeDataSource.get(0),c1);
+ assertEquals(mFakeDataSource.get(1),c2);
+
+ mFakeDragHelper.onDragging(0,1);
+
+ assertEquals(mFakeDataSource.get(0),c2);
+ assertEquals(mFakeDataSource.get(1),c1);
+ }
+
+
+}
\ No newline at end of file