📰 Merge the has_fetch_more and has_reload actions

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.ntp.cards;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ skipping 77 matching lines @@
 
         // Set empty variation params for the test.
         CardsVariationParameters.setTestVariationParams(new HashMap<String, String>());
     }
 
     @Test
     @Feature({"Ntp"})
     @EnableFeatures(ChromeFeatureList.NTP_SUGGESTIONS_SECTION_DISMISSAL)
     public void testDismissSibling() {
         List<SnippetArticle> snippets = createDummySuggestions(3, TEST_CATEGORY_ID);
-        SuggestionsSection section = createSectionWithReloadAction(true);
+        SuggestionsSection section = createSectionWithFetchAction(true);
 
         section.setStatus(CategoryStatus.AVAILABLE);
         assertNotNull(section.getActionItemForTesting());
 
         // Without snippets.
         assertEquals(ItemViewType.HEADER, section.getItemViewType(0));
         assertEquals(Collections.emptySet(), section.getItemDismissalGroup(0));
         assertEquals(ItemViewType.STATUS, section.getItemViewType(1));
         assertEquals(setOf(1, 2), section.getItemDismissalGroup(1));
         assertEquals(ItemViewType.ACTION, section.getItemViewType(2));
         assertEquals(setOf(1, 2), section.getItemDismissalGroup(2));
 
         // With snippets.
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         assertEquals(ItemViewType.HEADER, section.getItemViewType(0));
         assertEquals(Collections.emptySet(), section.getItemDismissalGroup(0));
         assertEquals(ItemViewType.SNIPPET, section.getItemViewType(1));
         assertEquals(Collections.singleton(1), section.getItemDismissalGroup(1));
     }
 
     @Test
     @Feature({"Ntp"})
     @EnableFeatures({})
     public void testDismissSiblingWithSectionDismissalDisabled() {
         List<SnippetArticle> snippets = createDummySuggestions(3, TEST_CATEGORY_ID);
-        SuggestionsSection section = createSectionWithReloadAction(true);
+        SuggestionsSection section = createSectionWithFetchAction(true);
 
         section.setStatus(CategoryStatus.AVAILABLE);
         assertNotNull(section.getActionItemForTesting());
 
         // Without snippets.
         assertEquals(ItemViewType.HEADER, section.getItemViewType(0));
         assertEquals(Collections.emptySet(), section.getItemDismissalGroup(0));
         assertEquals(ItemViewType.STATUS, section.getItemViewType(1));
         assertEquals(Collections.emptySet(), section.getItemDismissalGroup(1));
         assertEquals(ItemViewType.ACTION, section.getItemViewType(2));
         assertEquals(Collections.emptySet(), section.getItemDismissalGroup(2));
 
         // With snippets.
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         assertEquals(ItemViewType.HEADER, section.getItemViewType(0));
         assertEquals(Collections.emptySet(), section.getItemDismissalGroup(0));
         assertEquals(ItemViewType.SNIPPET, section.getItemViewType(1));
         assertEquals(Collections.singleton(1), section.getItemDismissalGroup(1));
     }
 
     @Test
     @Feature({"Ntp"})
     public void testAddSuggestionsNotification() {
         final int suggestionCount = 5;
         List<SnippetArticle> snippets = createDummySuggestions(suggestionCount,
                 TEST_CATEGORY_ID);
 
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         // Simulate initialisation by the adapter. Here we don't care about the notifications, since
         // the RecyclerView will be updated through notifyDataSetChanged.
         section.setStatus(CategoryStatus.AVAILABLE);
         reset(mParent);
 
         assertEquals(2, section.getItemCount()); // When empty, we have the header and status card.
         assertEquals(ItemViewType.STATUS, section.getItemViewType(1));
 
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         verify(mParent).onItemRangeInserted(section, 1, suggestionCount);
         verify(mParent).onItemRangeRemoved(section, 1 + suggestionCount, 1);
     }
 
     @Test
     @Feature({"Ntp"})
     public void testSetStatusNotification() {
         final int suggestionCount = 5;
         List<SnippetArticle> snippets = createDummySuggestions(suggestionCount,
                 TEST_CATEGORY_ID);
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
 
         // Simulate initialisation by the adapter. Here we don't care about the notifications, since
         // the RecyclerView will be updated through notifyDataSetChanged.
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         reset(mParent);
 
         // We don't clear suggestions when the status is AVAILABLE.
         section.setStatus(CategoryStatus.AVAILABLE);
         verifyNoMoreInteractions(mParent);
 
         // We clear existing suggestions when the status is not AVAILABLE, and show the status card.
         section.setStatus(CategoryStatus.SIGNED_OUT);
         verify(mParent).onItemRangeRemoved(section, 1, suggestionCount);
         verify(mParent).onItemRangeInserted(section, 1, 1);
 
         // A loading state item triggers showing the loading item.
         section.setStatus(CategoryStatus.AVAILABLE_LOADING);
         verify(mParent).onItemRangeInserted(section, 2, 1);
 
         section.setStatus(CategoryStatus.AVAILABLE);
         verify(mParent).onItemRangeRemoved(section, 2, 1);
     }
 
     @Test
     @Feature({"Ntp"})
     public void testRemoveUnknownSuggestion() {
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         section.setStatus(CategoryStatus.AVAILABLE);
         section.removeSuggestionById("foobar");
     }
 
     @Test
     @Feature({"Ntp"})
     public void testRemoveSuggestionNotification() {
         final int suggestionCount = 2;
         List<SnippetArticle> snippets = createDummySuggestions(suggestionCount,
                 TEST_CATEGORY_ID);
 
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         section.setStatus(CategoryStatus.AVAILABLE);
         reset(mParent);
 
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
 
         section.removeSuggestionById(snippets.get(1).mIdWithinCategory);
         verify(mParent).onItemRangeRemoved(section, 2, 1);
 
         section.removeSuggestionById(snippets.get(0).mIdWithinCategory);
         verify(mParent).onItemRangeRemoved(section, 1, 1);
         verify(mParent).onItemRangeInserted(section, 1, 1);
 
         assertEquals(2, section.getItemCount());
         assertEquals(ItemViewType.STATUS, section.getItemViewType(1));
     }
 
     @Test
     @Feature({"Ntp"})
     public void testRemoveSuggestionNotificationWithButton() {
         final int suggestionCount = 2;
         List<SnippetArticle> snippets = createDummySuggestions(suggestionCount,
                 TEST_CATEGORY_ID);
 
         SuggestionsCategoryInfo info =
-                new CategoryInfoBuilder(TEST_CATEGORY_ID)
-                .withMoreAction()
-                .withReloadAction()
-                .showIfEmpty()
-                .build();
+                new CategoryInfoBuilder(TEST_CATEGORY_ID).withFetchAction().showIfEmpty().build();
         SuggestionsSection section = createSection(info);
         section.setStatus(CategoryStatus.AVAILABLE);
         reset(mParent);
         assertEquals(3, section.getItemCount()); // We have the header and status card and a button.
 
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         assertEquals(4, section.getItemCount());
 
         section.removeSuggestionById(snippets.get(0).mIdWithinCategory);
         verify(mParent).onItemRangeRemoved(section, 1, 1);
 
         section.removeSuggestionById(snippets.get(1).mIdWithinCategory);
         verify(mParent, times(2)).onItemRangeRemoved(section, 1, 1);
         verify(mParent).onItemRangeInserted(section, 1, 1); // Only the status card is added.
         assertEquals(3, section.getItemCount());
         assertEquals(ItemViewType.STATUS, section.getItemViewType(1));
         assertEquals(ItemViewType.ACTION, section.getItemViewType(2));
     }
 
     @Test
     @Feature({"Ntp"})
     @EnableFeatures({ChromeFeatureList.NTP_SUGGESTIONS_SECTION_DISMISSAL})
     public void testDismissSection() {
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         section.setStatus(CategoryStatus.AVAILABLE);
         reset(mParent);
         assertEquals(2, section.getItemCount());
 
         @SuppressWarnings("unchecked")
         Callback<String> callback = mock(Callback.class);
         section.dismissItem(1, callback);
         verify(mDelegate).dismissSection(section);
         verify(callback).onResult(section.getHeaderText());
     }
 
     @Test
     @Feature({"Ntp"})
     public void testOfflineStatus() {
         final int suggestionCount = 3;
         final List<SnippetArticle> snippets = createDummySuggestions(suggestionCount,
                 TEST_CATEGORY_ID);
         assertNull(snippets.get(0).getOfflinePageOfflineId());
         assertNull(snippets.get(1).getOfflinePageOfflineId());
         assertNull(snippets.get(2).getOfflinePageOfflineId());
 
         final OfflinePageItem item0 = createOfflinePageItem(snippets.get(0).mUrl, 0L);
         final OfflinePageItem item1 = createOfflinePageItem(snippets.get(1).mUrl, 1L);
 
         mBridge.setIsOfflinePageModelLoaded(true);
         mBridge.setItems(Arrays.asList(item0, item1));
 
-        SuggestionsSection section = createSectionWithReloadAction(true);
+        SuggestionsSection section = createSectionWithFetchAction(true);
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
 
         // Check that we pick up the correct information.
         assertEquals(Long.valueOf(0L), snippets.get(0).getOfflinePageOfflineId());
         assertEquals(Long.valueOf(1L), snippets.get(1).getOfflinePageOfflineId());
         assertNull(snippets.get(2).getOfflinePageOfflineId());
 
         final OfflinePageItem item2 = createOfflinePageItem(snippets.get(2).mUrl, 2L);
 
         mBridge.setItems(Arrays.asList(item1, item2));
@@ skipping 35 matching lines @@
         assertEquals(Long.valueOf(0L), suggestions.get(0).getOfflinePageOfflineId());
         assertNull(suggestions.get(1).getOfflinePageOfflineId());
     }
 
     @Test
     @Feature({"Ntp"})
     public void testViewAllActionPriority() {
         // When all the actions are enabled, ViewAll always has the priority and is shown.
 
         // Spy so that VerifyAction can check methods being called.
-        SuggestionsCategoryInfo info =
-                spy(new CategoryInfoBuilder(TEST_CATEGORY_ID)
-                        .withMoreAction()
-                        .withReloadAction()
-                        .withViewAllAction()
-                        .showIfEmpty()
-                        .build());
+        SuggestionsCategoryInfo info = spy(new CategoryInfoBuilder(TEST_CATEGORY_ID)
+                                                   .withFetchAction()
+                                                   .withViewAllAction()
+                                                   .showIfEmpty()
+                                                   .build());
         SuggestionsSection section = createSection(info);
 
         assertTrue(section.getActionItemForTesting().isVisible());
         verifyAction(section, ActionItem.ACTION_VIEW_ALL);
 
         section.setSuggestions(createDummySuggestions(3, TEST_CATEGORY_ID),
                 CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
 
         assertTrue(section.getActionItemForTesting().isVisible());
         verifyAction(section, ActionItem.ACTION_VIEW_ALL);
     }
 
     @Test
     @Feature({"Ntp"})
-    public void testReloadAndFetchMoreActionPriority() {
-        // When both Reload and FetchMore are enabled, FetchMore runs when we have suggestions, and
-        // Reload when we don't.
+    public void testFetchActionPriority() {

[dgn, 2017/02/01 13:27:58]

Not sure if I should remove the suggestion count dependent part of these tests.
Internally we don't care about it anymore.

[Bernhard Bauer, 2017/02/01 14:11:06]

Yeah, I think that would make sense… It is intentional after all and not just
the case that we happen to show the button if there are suggestions and also
happen to show if there aren't.

[dgn, 2017/02/01 18:01:52]

Done.

+        // When only FetchMore is enabled, it shows whether we have suggestions or not.
 
         // Spy so that VerifyAction can check methods being called.
-        SuggestionsCategoryInfo info =
-                spy(new CategoryInfoBuilder(TEST_CATEGORY_ID)
-                        .withMoreAction()
-                        .withReloadAction()
-                        .showIfEmpty()
-                        .build());
+        SuggestionsCategoryInfo info = spy(
+                new CategoryInfoBuilder(TEST_CATEGORY_ID).withFetchAction().showIfEmpty().build());
         SuggestionsSection section = createSection(info);
 
         assertTrue(section.getActionItemForTesting().isVisible());
-        verifyAction(section, ActionItem.ACTION_RELOAD);
+        verifyAction(section, ActionItem.ACTION_FETCH);
 
         section.setSuggestions(createDummySuggestions(3, TEST_CATEGORY_ID),
                 CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
 
         assertTrue(section.getActionItemForTesting().isVisible());
-        verifyAction(section, ActionItem.ACTION_FETCH_MORE);
+        verifyAction(section, ActionItem.ACTION_FETCH);
     }
 
     @Test
-    @Feature({"Ntp"})
-    public void testReloadActionPriority() {
-        // When only Reload is enabled, it only shows when we have no suggestions.
-
-        // Spy so that VerifyAction can check methods being called.
-        SuggestionsCategoryInfo info = spy(
-                new CategoryInfoBuilder(TEST_CATEGORY_ID).withReloadAction().showIfEmpty().build());
-        SuggestionsSection section = createSection(info);
-
-        assertTrue(section.getActionItemForTesting().isVisible());
-        verifyAction(section, ActionItem.ACTION_RELOAD);
-
-        section.setSuggestions(createDummySuggestions(3, TEST_CATEGORY_ID),
-                CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
-
-        assertFalse(section.getActionItemForTesting().isVisible());
-        verifyAction(section, ActionItem.ACTION_NONE);
-    }
-
-    @Test
-    @Feature({"Ntp"})
-    public void testFetchMoreActionPriority() {
-        // When only FetchMore is enabled, it only shows when we have suggestions.
-
-        // Spy so that VerifyAction can check methods being called.
-        SuggestionsCategoryInfo info = spy(
-                new CategoryInfoBuilder(TEST_CATEGORY_ID).withMoreAction().showIfEmpty().build());
-        SuggestionsSection section = createSection(info);
-
-        assertFalse(section.getActionItemForTesting().isVisible());
-        verifyAction(section, ActionItem.ACTION_NONE);
-
-        section.setSuggestions(createDummySuggestions(3, TEST_CATEGORY_ID),
-                CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
-
-        assertTrue(section.getActionItemForTesting().isVisible());
-        verifyAction(section, ActionItem.ACTION_FETCH_MORE);
-    }
-
-    @Test
     @Feature({"Ntp"})
     public void testNoAction() {
         // Test where no action is enabled.
 
         // Spy so that VerifyAction can check methods being called.
         SuggestionsCategoryInfo info =
                 spy(new CategoryInfoBuilder(TEST_CATEGORY_ID).showIfEmpty().build());
         SuggestionsSection section = createSection(info);
 
         assertFalse(section.getActionItemForTesting().isVisible());
         verifyAction(section, ActionItem.ACTION_NONE);
 
         section.setSuggestions(createDummySuggestions(3, TEST_CATEGORY_ID),
                 CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
 
         assertFalse(section.getActionItemForTesting().isVisible());
         verifyAction(section, ActionItem.ACTION_NONE);
     }
 
     @Test
     @Feature({"Ntp"})
     public void testFetchMoreProgressDisplay() {
         final int suggestionCount = 3;
         SuggestionsCategoryInfo info = spy(
-                new CategoryInfoBuilder(TEST_CATEGORY_ID).withMoreAction().showIfEmpty().build());
+                new CategoryInfoBuilder(TEST_CATEGORY_ID).withFetchAction().showIfEmpty().build());
         SuggestionsSection section = createSection(info);
         section.setSuggestions(createDummySuggestions(suggestionCount, TEST_CATEGORY_ID),
                 CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         assertFalse(section.getProgressItemForTesting().isVisible());
 
         // Tap the button
-        verifyAction(section, ActionItem.ACTION_FETCH_MORE);
+        verifyAction(section, ActionItem.ACTION_FETCH);
         assertTrue(section.getProgressItemForTesting().isVisible());
 
         // Simulate receiving suggestions.
         section.setSuggestions(createDummySuggestions(suggestionCount, TEST_CATEGORY_ID),
                 CategoryStatus.AVAILABLE, /* replaceExisting = */ false);
         assertFalse(section.getProgressItemForTesting().isVisible());
     }
 
     /**
      * Tests that the UI updates on updated suggestions.
@@ skipping 205 matching lines @@
                 /* replaceExisting = */ true);
 
         // All previous snippets should be in place.
         verifySnippets(section, snippets);
     }
 
     @Test
     @Feature({"Ntp"})
     public void testCardIsNotifiedWhenBecomingFirst() {
         List<SnippetArticle> suggestions = createDummySuggestions(5, /* categoryId = */ 42);
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         section.setSuggestions(suggestions, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         reset(mParent);
 
         // Remove the first card. The second one should get the update.
         section.removeSuggestionById(suggestions.get(0).mIdWithinCategory);
         verify(mParent).onItemRangeChanged(section, 1, 1, PartialUpdateId.CARD_BACKGROUND);
     }
 
     @Test
     @Feature({"Ntp"})
     public void testCardIsNotifiedWhenBecomingLast() {
         List<SnippetArticle> suggestions = createDummySuggestions(5, /* categoryId = */ 42);
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         section.setSuggestions(suggestions, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         reset(mParent);
 
         // Remove the last card. The penultimate one should get the update.
         section.removeSuggestionById(suggestions.get(4).mIdWithinCategory);
         verify(mParent).onItemRangeChanged(section, 4, 1, PartialUpdateId.CARD_BACKGROUND);
     }
 
     @Test
     @Feature({"Ntp"})
     public void testCardIsNotifiedWhenBecomingSoleCard() {
         List<SnippetArticle> suggestions = createDummySuggestions(2, /* categoryId = */ 42);
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         section.setSuggestions(suggestions, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         reset(mParent);
 
         // Remove the last card. The penultimate one should get the update.
         section.removeSuggestionById(suggestions.get(1).mIdWithinCategory);
         verify(mParent).onItemRangeChanged(section, 1, 1, PartialUpdateId.CARD_BACKGROUND);
     }
 
     @Test
     @Feature({"Ntp"})
     @EnableFeatures(ChromeFeatureList.NTP_SUGGESTIONS_SECTION_DISMISSAL)
     public void testGetItemDismissalGroupWithSuggestions() {
         List<SnippetArticle> suggestions = createDummySuggestions(5, TEST_CATEGORY_ID);
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         section.setSuggestions(suggestions, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
 
         assertThat(section.getItemDismissalGroup(1).size(), is(1));
         assertThat(section.getItemDismissalGroup(1), contains(1));
     }
 
     @Test
     @Feature({"Ntp"})
     @EnableFeatures(ChromeFeatureList.NTP_SUGGESTIONS_SECTION_DISMISSAL)
     public void testGetItemDismissalGroupWithActionItem() {
-        SuggestionsSection section = createSectionWithReloadAction(true);
+        SuggestionsSection section = createSectionWithFetchAction(true);
         assertThat(section.getItemDismissalGroup(1).size(), is(2));
         assertThat(section.getItemDismissalGroup(1), contains(1, 2));
     }
 
     @Test
     @Feature({"Ntp"})
     @EnableFeatures(ChromeFeatureList.NTP_SUGGESTIONS_SECTION_DISMISSAL)
     public void testGetItemDismissalGroupWithoutActionItem() {
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
         assertThat(section.getItemDismissalGroup(1).size(), is(1));
         assertThat(section.getItemDismissalGroup(1), contains(1));
     }
 
     @Test
     @Feature({"Ntp"})
     public void testCardIsNotifiedWhenNotTheLastAnymore() {
         List<SnippetArticle> suggestions = createDummySuggestions(5, /* categoryId = */ 42);
-        SuggestionsSection section = createSectionWithReloadAction(false);
+        SuggestionsSection section = createSectionWithFetchAction(false);
 
         section.setSuggestions(suggestions, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
         reset(mParent);
 
         section.setSuggestions(createDummySuggestions(2, /* categoryId = */ 42, "new"),
                 CategoryStatus.AVAILABLE, /* replaceExisting = */ false);
         verify(mParent).onItemRangeChanged(section, 5, 1, PartialUpdateId.CARD_BACKGROUND);
     }
 
     private SuggestionsSection createSectionWithSuggestions(List<SnippetArticle> snippets) {
-        SuggestionsSection section = createSectionWithReloadAction(true);
+        SuggestionsSection section = createSectionWithFetchAction(true);
         section.setStatus(CategoryStatus.AVAILABLE);
         section.setSuggestions(snippets, CategoryStatus.AVAILABLE, /* replaceExisting = */ true);
 
         // Reset any notification invocations on the parent from setting the initial list
         // of suggestions.
         reset(mParent);
         return section;
     }
 
     @SafeVarargs
     private static <T> Set<T> setOf(T... elements) {
         Set<T> set = new TreeSet<T>();
         set.addAll(Arrays.asList(elements));
         return set;
     }
 
-    private SuggestionsSection createSectionWithReloadAction(boolean hasReloadAction) {
+    private SuggestionsSection createSectionWithFetchAction(boolean hasReloadAction) {
         CategoryInfoBuilder builder = new CategoryInfoBuilder(TEST_CATEGORY_ID).showIfEmpty();
-        if (hasReloadAction) builder.withReloadAction();
+        if (hasReloadAction) builder.withFetchAction();
         return createSection(builder.build());
     }
 
     private SuggestionsSection createSection(SuggestionsCategoryInfo info) {
         SuggestionsSection section = new SuggestionsSection(
                 mDelegate, mUiDelegate, mock(SuggestionsRanker.class), mBridge, info);
         section.setParent(mParent);
         return section;
     }
 
     private OfflinePageItem createOfflinePageItem(String url, long offlineId) {
         return new OfflinePageItem(url, offlineId, "", "", "", 0, 0, 0, 0);
     }
 
     private static void verifyAction(SuggestionsSection section, @ActionItem.Action int action) {
         SuggestionsSource suggestionsSource = mock(SuggestionsSource.class);
         SuggestionsUiDelegate manager = mock(SuggestionsUiDelegate.class);
         SuggestionsNavigationDelegate navDelegate = mock(SuggestionsNavigationDelegate.class);
         when(manager.getSuggestionsSource()).thenReturn(suggestionsSource);
         when(manager.getNavigationDelegate()).thenReturn(navDelegate);
         when(manager.getMetricsReporter()).thenReturn(mock(SuggestionsMetricsReporter.class));
 
         if (action != ActionItem.ACTION_NONE) {
             section.getActionItemForTesting().performAction(manager);
         }
 
         verify(section.getCategoryInfo(),
                 (action == ActionItem.ACTION_VIEW_ALL ? times(1) : never()))
                 .performViewAllAction(navDelegate);
-        verify(suggestionsSource,
-                action == ActionItem.ACTION_RELOAD || action == ActionItem.ACTION_FETCH_MORE
-                        ? times(1)
-                        : never())
+        verify(suggestionsSource, (action == ActionItem.ACTION_FETCH ? times(1) : never()))
                 .fetchSuggestions(anyInt(), any(String[].class));
     }
 
     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;
         for (SnippetArticle snippet : snippets) {
             assertEquals(snippet, section.getSuggestionAt(index++));
         }
     }
 }