commit 5a62037989cd8c30a48273389456f3f90920448d
author Steve McKay <smckay@google.com> Mon Sep 11 12:18:56 2017 -0700
committer Steve McKay <smckay@google.com> Tue Sep 12 12:27:17 2017 -0700
tree a709cb29317d9ded5e6b8bee97770c7711caa28d
parent 365e3cb1e103bff2303aa98fc8699e5e2eab1eb5

Replace selection interfaces w/ abstract classes.

Decouple selection tests from DocumentsUI package.

Bug: 64847011
Test: Passing.
Change-Id: Ic3ae145921aecbd0bca2bb673e9a522409e6fdbe

tests/unit/com/android/documentsui/selection/addons/GridModelTest.java

diff --git a/tests/unit/com/android/documentsui/selection/addons/GridModelTest.java b/tests/unit/com/android/documentsui/selection/addons/GridModelTest.java
index 239ea4d..93576a0 100644
--- a/tests/unit/com/android/documentsui/selection/addons/GridModelTest.java
+++ b/tests/unit/com/android/documentsui/selection/addons/GridModelTest.java
@@ -28,10 +28,10 @@
 import android.support.v7.widget.RecyclerView.OnScrollListener;
 import android.view.MotionEvent;
 
-import com.android.documentsui.dirlist.TestDocumentsAdapter;
-import com.android.documentsui.selection.SelectionHelper.SelectionPredicate;
-import com.android.documentsui.selection.addons.BandSelectionHelper;
-import com.android.documentsui.selection.addons.GridModel;
+import com.android.documentsui.selection.SelectionPredicates;
+import com.android.documentsui.selection.TestAdapter;
+import com.android.documentsui.selection.TestStableIdProvider;
+import com.android.documentsui.selection.addons.BandSelectionHelper.BandHost;
 
 import org.junit.After;
 import org.junit.Test;
@@ -50,21 +50,10 @@
     private static final int VIEW_PADDING_PX = 5;
     private static final int CHILD_VIEW_EDGE_PX = 100;
     private static final int VIEWPORT_HEIGHT = 500;
-    private static final SelectionPredicate CAN_SET_ANYTHING = new SelectionPredicate() {
-        @Override
-        public boolean canSetStateForId(String id, boolean nextState) {
-            return true;
-        }
-
-        @Override
-        public boolean canSetStateAtPosition(int position, boolean nextState) {
-            return true;
-        }
-    };
 
     private GridModel mModel;
     private TestHost mHost;
-    private TestDocumentsAdapter mAdapter;
+    private TestAdapter mAdapter;
     private Set<String> mLastSelection;
     private int mViewWidth;
 
@@ -234,7 +223,7 @@
 
     private void initData(final int numChildren, int numColumns) {
         mHost = new TestHost(numChildren, numColumns);
-        mAdapter = new TestDocumentsAdapter(new ArrayList<String>()) {
+        mAdapter = new TestAdapter() {
             @Override
             public String getStableId(int position) {
                 return Integer.toString(position);
@@ -248,9 +237,13 @@
 
         mViewWidth = VIEW_PADDING_PX + numColumns * (VIEW_PADDING_PX + CHILD_VIEW_EDGE_PX);
 
-        mModel = new GridModel(mHost, mAdapter, CAN_SET_ANYTHING);
+        mModel = new GridModel(
+                mHost,
+                new TestStableIdProvider(mAdapter),
+                SelectionPredicates.CAN_SET_ANYTHING);
+
         mModel.addOnSelectionChangedListener(
-                new GridModel.OnSelectionChangedListener() {
+                new GridModel.SelectionObserver() {
                     @Override
                     public void onSelectionChanged(Set<String> updatedSelection) {
                         mLastSelection = updatedSelection;
@@ -309,7 +302,7 @@
         mHost.mScrollListener.onScrolled(null, 0, dy);
     }
 
-    private static final class TestHost implements BandSelectionHelper.SelectionHost {
+    private static final class TestHost extends BandHost {
 
         private final int mNumColumns;
         private final int mNumRows;