1 files changed, 11 insertions, 51 deletions

diff --git a/android/arch/paging/ContiguousPagedListTest.java b/android/arch/paging/ContiguousPagedListTest.java
index 43f556a8..ee7ea6a4 100644
--- a/android/arch/paging/ContiguousPagedListTest.java
+++ b/android/arch/paging/ContiguousPagedListTest.java
@@ -16,7 +16,6 @@
 
 package android.arch.paging;
 
-import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.mock;
@@ -110,7 +109,6 @@ public class ContiguousPagedListTest {
 
     private void verifyRange(int start, int count, NullPaddedList<Item> actual) {
         if (mCounted) {
-            //noinspection UnnecessaryLocalVariable
             int expectedLeading = start;
             int expectedTrailing = ITEMS.size() - start - count;
             assertEquals(ITEMS.size(), actual.size());
@@ -134,38 +132,6 @@ public class ContiguousPagedListTest {
         }
     }
 
-    @SuppressWarnings("SuspiciousSystemArraycopy")
-    private void verifyRange(int start, int count, PagedStorage<?, Item> actual) {
-        if (mCounted) {
-            Item[] expected = new Item[ITEMS.size()];
-            System.arraycopy(ITEMS.toArray(), start, expected, start, count);
-            assertArrayEquals(expected, actual.toArray());
-
-            //noinspection UnnecessaryLocalVariable
-            int expectedLeading = start;
-            int expectedTrailing = ITEMS.size() - start - count;
-            assertEquals(ITEMS.size(), actual.size());
-            assertEquals(ITEMS.size() - expectedLeading - expectedTrailing,
-                    actual.getStorageCount());
-            assertEquals(expectedLeading, actual.getLeadingNullCount());
-            assertEquals(expectedTrailing, actual.getTrailingNullCount());
-
-        } else {
-            Item[] expected = new Item[count];
-            System.arraycopy(ITEMS.toArray(), start, expected, 0, count);
-            assertArrayEquals(expected, actual.toArray());
-
-            assertEquals(count, actual.size());
-            assertEquals(actual.size(), actual.getStorageCount());
-            assertEquals(0, actual.getLeadingNullCount());
-            assertEquals(0, actual.getTrailingNullCount());
-        }
-    }
-
-    private void verifyRange(int start, int count, PagedList<Item> actual) {
-        verifyRange(start, count, actual.mStorage);
-    }
-
     private void verifyCallback(PagedList.Callback callback, int countedPosition,
             int uncountedPosition) {
         if (mCounted) {
@@ -188,7 +154,7 @@ public class ContiguousPagedListTest {
     }
 
 
-    private ContiguousPagedList<Integer, Item> createCountedPagedList(
+    private ContiguousPagedList<Item> createCountedPagedList(
             PagedList.Config config, int initialPosition) {
         TestSource source = new TestSource();
         return new ContiguousPagedList<>(
@@ -197,7 +163,7 @@ public class ContiguousPagedListTest {
                 initialPosition);
     }
 
-    private ContiguousPagedList<Integer, Item> createCountedPagedList(int initialPosition) {
+    private ContiguousPagedList<Item> createCountedPagedList(int initialPosition) {
         return createCountedPagedList(
                 new PagedList.Config.Builder()
                         .setInitialLoadSizeHint(40)
@@ -208,14 +174,8 @@ public class ContiguousPagedListTest {
     }
 
     @Test
-    public void construct() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(0);
-        verifyRange(0, 40, pagedList);
-    }
-
-    @Test
     public void append() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(0);
+        ContiguousPagedList<Item> pagedList = createCountedPagedList(0);
         PagedList.Callback callback = mock(PagedList.Callback.class);
         pagedList.addWeakCallback(null, callback);
         verifyRange(0, 40, pagedList);
@@ -232,7 +192,7 @@ public class ContiguousPagedListTest {
 
     @Test
     public void prepend() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(80);
+        ContiguousPagedList<Item> pagedList = createCountedPagedList(80);
         PagedList.Callback callback = mock(PagedList.Callback.class);
         pagedList.addWeakCallback(null, callback);
         verifyRange(60, 40, pagedList);
@@ -248,7 +208,7 @@ public class ContiguousPagedListTest {
 
     @Test
     public void outwards() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(50);
+        ContiguousPagedList<Item> pagedList = createCountedPagedList(50);
         PagedList.Callback callback = mock(PagedList.Callback.class);
         pagedList.addWeakCallback(null, callback);
         verifyRange(30, 40, pagedList);
@@ -271,7 +231,7 @@ public class ContiguousPagedListTest {
 
     @Test
     public void multiAppend() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(0);
+        ContiguousPagedList<Item> pagedList = createCountedPagedList(0);
         PagedList.Callback callback = mock(PagedList.Callback.class);
         pagedList.addWeakCallback(null, callback);
         verifyRange(0, 40, pagedList);
@@ -288,7 +248,7 @@ public class ContiguousPagedListTest {
 
     @Test
     public void distantPrefetch() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(
+        ContiguousPagedList<Item> pagedList = createCountedPagedList(
                 new PagedList.Config.Builder()
                         .setInitialLoadSizeHint(10)
                         .setPageSize(10)
@@ -314,7 +274,7 @@ public class ContiguousPagedListTest {
 
     @Test
     public void appendCallbackAddedLate() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(0);
+        ContiguousPagedList<Item> pagedList = createCountedPagedList(0);
         verifyRange(0, 40, pagedList);
 
         pagedList.loadAround(35);
@@ -322,7 +282,7 @@ public class ContiguousPagedListTest {
         verifyRange(0, 60, pagedList);
 
         // snapshot at 60 items
-        PagedList<Item> snapshot = (PagedList<Item>) pagedList.snapshot();
+        NullPaddedList<Item> snapshot = (NullPaddedList<Item>) pagedList.snapshot();
         verifyRange(0, 60, snapshot);
 
 
@@ -340,7 +300,7 @@ public class ContiguousPagedListTest {
 
     @Test
     public void prependCallbackAddedLate() {
-        ContiguousPagedList<Integer, Item> pagedList = createCountedPagedList(80);
+        ContiguousPagedList<Item> pagedList = createCountedPagedList(80);
         verifyRange(60, 40, pagedList);
 
         pagedList.loadAround(mCounted ? 65 : 5);
@@ -348,7 +308,7 @@ public class ContiguousPagedListTest {
         verifyRange(40, 60, pagedList);
 
         // snapshot at 60 items
-        PagedList<Item> snapshot = (PagedList<Item>) pagedList.snapshot();
+        NullPaddedList<Item> snapshot = (NullPaddedList<Item>) pagedList.snapshot();
         verifyRange(40, 60, snapshot);