[Suggestions] Remove TreeNode.getSuggestionAt() in favor of a visitor.

chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java

Index: chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java
index 1d421c8243f0389836c4095f6f59e7c21febee61..76fbb65821a02354b97902f635f59b90416d667a 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/SuggestionsSectionTest.java
@@ -43,6 +43,7 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.DisableHistogramsRule;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageViewHolder.UpdateLayoutParamsCallback;
+import org.chromium.chrome.browser.ntp.cards.SuggestionsSection.SuggestionsList;
 import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
 import org.chromium.chrome.browser.ntp.snippets.SnippetArticle;
 import org.chromium.chrome.browser.ntp.snippets.SuggestionsSource;
@@ -485,11 +486,12 @@ public class SuggestionsSectionTest {
         verify(mParent).onItemRangeRemoved(section, 2, 3);
         verify(mParent).onItemRangeInserted(section, 2, 2);
         assertEquals(3, section.getSuggestionsCount());
-        assertEquals(snippets.get(0), section.getSuggestionAt(1));
-        assertNotEquals(snippets.get(1), section.getSuggestionAt(2));
-        assertEquals(newSnippets.get(0), section.getSuggestionAt(2));
-        assertNotEquals(snippets.get(2), section.getSuggestionAt(3));
-        assertEquals(newSnippets.get(1), section.getSuggestionAt(3));
+        SuggestionsList suggestionList = section.getSuggestionListForTesting();
+        assertEquals(snippets.get(0), suggestionList.getSuggestionAt(0));
+        assertNotEquals(snippets.get(1), suggestionList.getSuggestionAt(1));
+        assertEquals(newSnippets.get(0), suggestionList.getSuggestionAt(1));
+        assertNotEquals(snippets.get(2), suggestionList.getSuggestionAt(2));
+        assertEquals(newSnippets.get(1), suggestionList.getSuggestionAt(2));
 
         assertTrue(section.isDataStale());
     }
@@ -518,10 +520,11 @@ public class SuggestionsSectionTest {
         verify(mParent).onItemRangeRemoved(section, 3, 2);
         verify(mParent).onItemRangeInserted(section, 3, 1);
         assertEquals(3, section.getSuggestionsCount());
-        assertEquals(snippets.get(0), section.getSuggestionAt(1));
-        assertEquals(snippets.get(1), section.getSuggestionAt(2));
-        assertNotEquals(snippets.get(2), section.getSuggestionAt(3));
-        assertEquals(newSnippets.get(0), section.getSuggestionAt(3));
+        SuggestionsList suggestionList = section.getSuggestionListForTesting();

[dgn, 2017/05/24 11:30:31]

isn't it possible to use visitor to check that?

[Bernhard Bauer, 2017/05/25 12:27:54]

Sure, done.

+        assertEquals(snippets.get(0), suggestionList.getSuggestionAt(0));
+        assertEquals(snippets.get(1), suggestionList.getSuggestionAt(1));
+        assertNotEquals(snippets.get(2), suggestionList.getSuggestionAt(2));
+        assertEquals(newSnippets.get(0), suggestionList.getSuggestionAt(2));
 
         assertTrue(section.isDataStale());
     }
@@ -549,8 +552,9 @@ public class SuggestionsSectionTest {
         verify(mParent).onItemRangeRemoved(section, 3, 2);
         verify(mParent, never()).onItemRangeInserted(any(TreeNode.class), anyInt(), anyInt());
         assertEquals(2, section.getSuggestionsCount());
-        assertEquals(snippets.get(0), section.getSuggestionAt(1));
-        assertEquals(snippets.get(1), section.getSuggestionAt(2));
+        SuggestionsList suggestionList = section.getSuggestionListForTesting();
+        assertEquals(snippets.get(0), suggestionList.getSuggestionAt(0));
+        assertEquals(snippets.get(1), suggestionList.getSuggestionAt(1));
 
         assertTrue(section.isDataStale());
     }
@@ -573,8 +577,9 @@ public class SuggestionsSectionTest {
         bindViewHolders(section, 1, 3);
 
         // Remove last two items.
-        section.removeSuggestionById(section.getSuggestionAt(3).mIdWithinCategory);
-        section.removeSuggestionById(section.getSuggestionAt(2).mIdWithinCategory);
+        SuggestionsList suggestionList = section.getSuggestionListForTesting();
+        section.removeSuggestionById(suggestionList.getSuggestionAt(2).mIdWithinCategory);
+        section.removeSuggestionById(suggestionList.getSuggestionAt(1).mIdWithinCategory);
         reset(mParent);
 
         assertEquals(1, section.getSuggestionsCount());
@@ -584,7 +589,7 @@ public class SuggestionsSectionTest {
         verify(mParent, never()).onItemRangeRemoved(any(TreeNode.class), anyInt(), anyInt());
         verify(mParent, never()).onItemRangeInserted(any(TreeNode.class), anyInt(), anyInt());
         assertEquals(1, section.getSuggestionsCount());
-        assertEquals(snippets.get(0), section.getSuggestionAt(1));
+        assertEquals(snippets.get(0), suggestionList.getSuggestionAt(0));
 
         assertTrue(section.isDataStale());
     }
@@ -793,10 +798,11 @@ public class SuggestionsSectionTest {
 
     private static void verifySnippets(SuggestionsSection section, List<SnippetArticle> snippets) {
         assertEquals(snippets.size(), section.getSuggestionsCount());
-        // Indices in section are off-by-one (index 0 is the header).
-        int index = 1;
+        SuggestionsList suggestionsList = section.getSuggestionListForTesting();
+
+        int index = 0;
         for (SnippetArticle snippet : snippets) {
-            assertEquals(snippet, section.getSuggestionAt(index++));
+            assertEquals(snippet, suggestionsList.getSuggestionAt(index++));
         }
     }
 }