Import Android SDK Platform P [4697573]
/google/data/ro/projects/android/fetch_artifact \
--bid 4697573 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4697573.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: If80578c3c657366cc9cf75f8db13d46e2dd4e077
diff --git a/androidx/recyclerview/widget/ItemTouchHelperTest.java b/androidx/recyclerview/widget/ItemTouchHelperTest.java
new file mode 100644
index 0000000..9c90d24
--- /dev/null
+++ b/androidx/recyclerview/widget/ItemTouchHelperTest.java
@@ -0,0 +1,326 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.recyclerview.widget;
+
+import static androidx.recyclerview.widget.ItemTouchHelper.END;
+import static androidx.recyclerview.widget.ItemTouchHelper.LEFT;
+import static androidx.recyclerview.widget.ItemTouchHelper.RIGHT;
+import static androidx.recyclerview.widget.ItemTouchHelper.START;
+import static androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.os.Build;
+import android.support.test.filters.LargeTest;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.Suppress;
+import android.support.test.runner.AndroidJUnit4;
+import android.view.Gravity;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.core.util.Pair;
+import androidx.testutils.PollingCheck;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class ItemTouchHelperTest extends BaseRecyclerViewInstrumentationTest {
+
+ private static class RecyclerViewState {
+ public TestAdapter mAdapter;
+ public TestLayoutManager mLayoutManager;
+ public WrappedRecyclerView mWrappedRecyclerView;
+ }
+
+ private LoggingCalback mCalback;
+
+ private LoggingItemTouchHelper mItemTouchHelper;
+
+ private Boolean mSetupRTL;
+
+ public ItemTouchHelperTest() {
+ super(false);
+ }
+
+ private RecyclerViewState setupRecyclerView() throws Throwable {
+ RecyclerViewState rvs = new RecyclerViewState();
+ rvs.mWrappedRecyclerView = inflateWrappedRV();
+ rvs.mAdapter = new TestAdapter(10);
+ rvs.mLayoutManager = new TestLayoutManager() {
+ @Override
+ public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+ detachAndScrapAttachedViews(recycler);
+ layoutRange(recycler, 0, Math.min(5, state.getItemCount()));
+ layoutLatch.countDown();
+ }
+
+ @Override
+ public boolean canScrollHorizontally() {
+ return false;
+ }
+
+ @Override
+ public boolean supportsPredictiveItemAnimations() {
+ return false;
+ }
+ };
+ rvs.mWrappedRecyclerView.setFakeRTL(mSetupRTL);
+ rvs.mWrappedRecyclerView.setAdapter(rvs.mAdapter);
+ rvs.mWrappedRecyclerView.setLayoutManager(rvs.mLayoutManager);
+ return rvs;
+ }
+
+ private RecyclerViewState setupItemTouchHelper(final RecyclerViewState rvs, int dragDirs,
+ int swipeDirs) throws Throwable {
+ mCalback = new LoggingCalback(dragDirs, swipeDirs);
+ mItemTouchHelper = new LoggingItemTouchHelper(mCalback);
+ mActivityRule.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mItemTouchHelper.attachToRecyclerView(rvs.mWrappedRecyclerView);
+ }
+ });
+
+ return rvs;
+ }
+
+ @Test
+ public void swipeLeft() throws Throwable {
+ basicSwipeTest(LEFT, LEFT | RIGHT, -getActivity().getWindow().getDecorView().getWidth());
+ }
+
+ @Test
+ public void swipeRight() throws Throwable {
+ basicSwipeTest(RIGHT, LEFT | RIGHT, getActivity().getWindow().getDecorView().getWidth());
+ }
+
+ @Test
+ public void swipeStart() throws Throwable {
+ basicSwipeTest(START, START | END, -getActivity().getWindow().getDecorView().getWidth());
+ }
+
+ @Test
+ public void swipeEnd() throws Throwable {
+ basicSwipeTest(END, START | END, getActivity().getWindow().getDecorView().getWidth());
+ }
+
+ // Test is disabled as it is flaky.
+ @Suppress
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR1)
+ @Test
+ public void swipeStartInRTL() throws Throwable {
+ mSetupRTL = true;
+ basicSwipeTest(START, START | END, getActivity().getWindow().getDecorView().getWidth());
+ }
+
+ @SdkSuppress(minSdkVersion = Build.VERSION_CODES.JELLY_BEAN_MR1)
+ @Test
+ public void swipeEndInRTL() throws Throwable {
+ mSetupRTL = true;
+ basicSwipeTest(END, START | END, -getActivity().getWindow().getDecorView().getWidth());
+ }
+
+ @Test
+ public void attachToNullRecycleViewDuringLongPress() throws Throwable {
+ final RecyclerViewState rvs = setupItemTouchHelper(setupRecyclerView(), END, 0);
+ rvs.mLayoutManager.expectLayouts(1);
+ setRecyclerView(rvs.mWrappedRecyclerView);
+ rvs.mLayoutManager.waitForLayout(1);
+
+ final RecyclerView.ViewHolder target = mRecyclerView
+ .findViewHolderForAdapterPosition(1);
+ target.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ mItemTouchHelper.attachToRecyclerView(null);
+ return false;
+ }
+ });
+ TouchUtils.longClickView(getInstrumentation(), target.itemView);
+ }
+
+ @Test
+ public void attachToAnotherRecycleViewDuringLongPress() throws Throwable {
+ final RecyclerViewState rvs2 = setupRecyclerView();
+ rvs2.mLayoutManager.expectLayouts(1);
+ mActivityRule.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ getActivity().getContainer().addView(rvs2.mWrappedRecyclerView);
+ }
+ });
+ rvs2.mLayoutManager.waitForLayout(1);
+
+ final RecyclerViewState rvs = setupItemTouchHelper(setupRecyclerView(), END, 0);
+ rvs.mLayoutManager.expectLayouts(1);
+ setRecyclerView(rvs.mWrappedRecyclerView);
+ rvs.mLayoutManager.waitForLayout(1);
+
+ final RecyclerView.ViewHolder target = mRecyclerView
+ .findViewHolderForAdapterPosition(1);
+ target.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ mItemTouchHelper.attachToRecyclerView(rvs2.mWrappedRecyclerView);
+ return false;
+ }
+ });
+ TouchUtils.longClickView(getInstrumentation(), target.itemView);
+ assertEquals(0, mCalback.mHasDragFlag.size());
+ }
+
+ public void basicSwipeTest(int dir, int swipeDirs, int targetX) throws Throwable {
+ final RecyclerViewState rvs = setupItemTouchHelper(setupRecyclerView(), 0, swipeDirs);
+ rvs.mLayoutManager.expectLayouts(1);
+ setRecyclerView(rvs.mWrappedRecyclerView);
+ rvs.mLayoutManager.waitForLayout(1);
+
+ final RecyclerView.ViewHolder target = mRecyclerView
+ .findViewHolderForAdapterPosition(1);
+ TouchUtils.dragViewToX(getInstrumentation(), target.itemView, Gravity.CENTER, targetX);
+
+ PollingCheck.waitFor(1000, new PollingCheck.PollingCheckCondition() {
+ @Override
+ public boolean canProceed() {
+ return mCalback.getSwipe(target) != null;
+ }
+ });
+ final SwipeRecord swipe = mCalback.getSwipe(target);
+ assertNotNull(swipe);
+ assertEquals(dir, swipe.dir);
+ assertEquals(1, mItemTouchHelper.mRecoverAnimations.size());
+ assertEquals(1, mItemTouchHelper.mPendingCleanup.size());
+ // get rid of the view
+ rvs.mLayoutManager.expectLayouts(1);
+ rvs.mAdapter.deleteAndNotify(1, 1);
+ rvs.mLayoutManager.waitForLayout(1);
+ waitForAnimations();
+ assertEquals(0, mItemTouchHelper.mRecoverAnimations.size());
+ assertEquals(0, mItemTouchHelper.mPendingCleanup.size());
+ assertTrue(mCalback.isCleared(target));
+ }
+
+ private void waitForAnimations() throws InterruptedException {
+ while (mRecyclerView.getItemAnimator().isRunning()) {
+ Thread.sleep(100);
+ }
+ }
+
+ private static class LoggingCalback extends SimpleCallback {
+
+ private List<MoveRecord> mMoveRecordList = new ArrayList<MoveRecord>();
+
+ private List<SwipeRecord> mSwipeRecords = new ArrayList<SwipeRecord>();
+
+ private List<RecyclerView.ViewHolder> mCleared = new ArrayList<RecyclerView.ViewHolder>();
+
+ public List<Pair<RecyclerView, RecyclerView.ViewHolder>> mHasDragFlag = new ArrayList<>();
+
+ LoggingCalback(int dragDirs, int swipeDirs) {
+ super(dragDirs, swipeDirs);
+ }
+
+ @Override
+ public boolean onMove(@NonNull RecyclerView recyclerView,
+ @NonNull RecyclerView.ViewHolder viewHolder,
+ @NonNull RecyclerView.ViewHolder target) {
+ mMoveRecordList.add(new MoveRecord(viewHolder, target));
+ return true;
+ }
+
+ @Override
+ public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
+ mSwipeRecords.add(new SwipeRecord(viewHolder, direction));
+ }
+
+ public MoveRecord getMove(RecyclerView.ViewHolder vh) {
+ for (MoveRecord move : mMoveRecordList) {
+ if (move.from == vh) {
+ return move;
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void clearView(@NonNull RecyclerView recyclerView,
+ @NonNull RecyclerView.ViewHolder viewHolder) {
+ super.clearView(recyclerView, viewHolder);
+ mCleared.add(viewHolder);
+ }
+
+ @Override
+ boolean hasDragFlag(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+ mHasDragFlag.add(new Pair<>(recyclerView, viewHolder));
+ return super.hasDragFlag(recyclerView, viewHolder);
+ }
+
+ public SwipeRecord getSwipe(RecyclerView.ViewHolder vh) {
+ for (SwipeRecord swipe : mSwipeRecords) {
+ if (swipe.viewHolder == vh) {
+ return swipe;
+ }
+ }
+ return null;
+ }
+
+ public boolean isCleared(RecyclerView.ViewHolder vh) {
+ return mCleared.contains(vh);
+ }
+ }
+
+ private static class LoggingItemTouchHelper extends ItemTouchHelper {
+
+ public LoggingItemTouchHelper(Callback callback) {
+ super(callback);
+ }
+ }
+
+ private static class SwipeRecord {
+
+ RecyclerView.ViewHolder viewHolder;
+
+ int dir;
+
+ public SwipeRecord(RecyclerView.ViewHolder viewHolder, int dir) {
+ this.viewHolder = viewHolder;
+ this.dir = dir;
+ }
+ }
+
+ private static class MoveRecord {
+
+ final int fromPos, toPos;
+
+ RecyclerView.ViewHolder from, to;
+
+ MoveRecord(RecyclerView.ViewHolder from, RecyclerView.ViewHolder to) {
+ this.from = from;
+ this.to = to;
+ fromPos = from.getAdapterPosition();
+ toPos = to.getAdapterPosition();
+ }
+ }
+}