🏠 Extract the ContentSuggestionManager interface from NTP

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/snippets/ArticleSnippetsTest.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.snippets;
 
 import android.graphics.BitmapFactory;
 import android.support.test.filters.MediumTest;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import org.chromium.base.Callback;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;
 import org.chromium.chrome.browser.favicon.FaviconHelper.IconAvailabilityCallback;
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
-import org.chromium.chrome.browser.ntp.ContextMenuManager;
-import org.chromium.chrome.browser.ntp.LogoBridge.LogoObserver;
-import org.chromium.chrome.browser.ntp.MostVisitedItem;
 import org.chromium.chrome.browser.ntp.NewTabPage.DestructionObserver;
-import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
 import org.chromium.chrome.browser.ntp.UiConfig;
 import org.chromium.chrome.browser.ntp.cards.ActionItem;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageAdapter;
 import org.chromium.chrome.browser.ntp.cards.NewTabPageRecyclerView;
 import org.chromium.chrome.browser.ntp.cards.SuggestionsCategoryInfo;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
-import org.chromium.chrome.browser.profiles.MostVisitedSites.MostVisitedURLsObserver;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.suggestions.SuggestionsMetricsReporter;
+import org.chromium.chrome.browser.suggestions.SuggestionsNavigationDelegate;
 import org.chromium.chrome.browser.suggestions.SuggestionsRanker;
+import org.chromium.chrome.browser.suggestions.SuggestionsUiDelegate;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.RenderUtils.ViewRenderer;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Set;
 
 /**
  * Tests for the appearance of Article Snippets.
  */
 public class ArticleSnippetsTest extends ChromeActivityTestCaseBase<ChromeActivity> {
     private ViewRenderer mViewRenderer;
 
-    private NewTabPageManager mNtpManager;
+    private SuggestionsUiDelegate mNtpManager;
     private FakeSuggestionsSource mSnippetsSource;
     private NewTabPageRecyclerView mRecyclerView;
     private NewTabPageAdapter mAdapter;
 
     private FrameLayout mContentView;
     private UiConfig mUiConfig;
 
     public ArticleSnippetsTest() {
         super(ChromeActivity.class);
     }
@@ skipping 13 matching lines @@
                 getActivity().setContentView(mContentView);
 
                 mRecyclerView = (NewTabPageRecyclerView) getActivity().getLayoutInflater()
                         .inflate(R.layout.new_tab_page_recycler_view, mContentView, false);
                 mContentView.addView(mRecyclerView);
 
                 View aboveTheFold = new View(getActivity());
 
                 mRecyclerView.setAboveTheFoldView(aboveTheFold);
                 mAdapter = new NewTabPageAdapter(mNtpManager, aboveTheFold, mUiConfig,
-                        OfflinePageBridge.getForProfile(Profile.getLastUsedProfile()));
+                        OfflinePageBridge.getForProfile(Profile.getLastUsedProfile()),
+                        /*contextMenuManager=*/null);

[Bernhard Bauer, 2017/01/18 16:58:14]

Could you add spaces around the variable name and equals sign? It looks a bit
cramped to me otherwise.

[dgn, 2017/01/18 18:00:27]

Done.

                 mRecyclerView.setAdapter(mAdapter);
             }
         });
 
         getInstrumentation().waitForIdleSync();
 
         int first = mAdapter.getFirstCardPosition();
         mViewRenderer.renderAndCompare(mRecyclerView.getChildAt(first), "short_snippet");
         mViewRenderer.renderAndCompare(mRecyclerView.getChildAt(first + 1), "long_snippet");
 
@@ skipping 87 matching lines @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mNtpManager = new MockNewTabPageManager();
         mSnippetsSource = new FakeSuggestionsSource();
     }
 
     /**
      * A NewTabPageManager to initialize our Adapter.
      */
-    private class MockNewTabPageManager implements NewTabPageManager {
-        // TODO(dgn): provide a RecyclerView if we need to test the context menu.
-        private ContextMenuManager mContextMenuManager =
-                new ContextMenuManager(getActivity(), this, null);
+    private class MockNewTabPageManager implements SuggestionsUiDelegate {
         private SuggestionsMetricsReporter mSuggestionsMetricsReporter =
                 new DummySuggestionsMetricsReporter();
 
         @Override
         public void getLocalFaviconImageForURL(
                 final String url, int size, final FaviconImageCallback faviconCallback) {
             // Run the callback asynchronously incase the caller made that assumption.
             ThreadUtils.postOnUiThread(new Runnable(){
                 @Override
                 public void run() {
                     // Return an arbitrary drawable.
                     faviconCallback.onFaviconAvailable(
                             BitmapFactory.decodeResource(getActivity().getResources(),
                             R.drawable.star_green),
                             url);
                 }
             });
         }
 
         @Override
-        public void removeMostVisitedItem(MostVisitedItem item) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void openMostVisitedItem(int windowDisposition, MostVisitedItem item) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean isLocationBarShownInNTP() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean isVoiceSearchEnabled() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean isFakeOmniboxTextEnabledTablet() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void navigateToBookmarks() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void navigateToRecentTabs() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void openSnippet(int windowOpenDisposition, SnippetArticle article) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void focusSearchBox(boolean beginVoiceSearch, String pastedText) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void setMostVisitedURLsObserver(MostVisitedURLsObserver observer, int numResults) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
         public void getLargeIconForUrl(String url, int size, LargeIconCallback callback) {
             throw new UnsupportedOperationException();
         }
 
         @Override
         public void ensureIconIsAvailable(String pageUrl, String iconUrl, boolean isLargeIcon,
                 boolean isTemporary, IconAvailabilityCallback callback) {
             throw new UnsupportedOperationException();
         }
 
         @Override
         public void getUrlsAvailableOffline(Set<String> pageUrls, Callback<Set<String>> callback) {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public void onLogoClicked(boolean isAnimatedLogoShowing) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void getSearchProviderLogo(LogoObserver logoObserver) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void onLoadingComplete(MostVisitedItem[] mostVisitedItems) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean isOpenInNewWindowEnabled() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean isOpenInIncognitoEnabled() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void navigateToDownloadManager() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void onLearnMoreClicked() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
         public SuggestionsSource getSuggestionsSource() {
             return mSnippetsSource;
         }
 
         @Override
         public void addDestructionObserver(DestructionObserver destructionObserver) {}
 
         @Override
-        public boolean isCurrentPage() {
-            return true;
+        public SuggestionsMetricsReporter getMetricsReporter() {
+            return mSuggestionsMetricsReporter;
         }
 
         @Override
-        public ContextMenuManager getContextMenuManager() {
-            return mContextMenuManager;
-        }
-
-        public SuggestionsMetricsReporter getSuggestionsMetricsReporter() {
-            return mSuggestionsMetricsReporter;
+        public SuggestionsNavigationDelegate getNavigationDelegate() {
+            return null;
         }
     }
 
     private static class DummySuggestionsMetricsReporter implements SuggestionsMetricsReporter {
         @Override
         public void onPageShown(int[] categories, int[] suggestionsPerCategory) {}
 
         @Override
         public void onSuggestionShown(SnippetArticle suggestion) {}
 
         @Override
         public void onSuggestionOpened(SnippetArticle suggestion, int windowOpenDisposition) {}
 
         @Override
         public void onSuggestionMenuOpened(SnippetArticle suggestion) {}
 
         @Override
         public void onMoreButtonShown(@CategoryInt ActionItem category) {}
 
         @Override
         public void onMoreButtonClicked(@CategoryInt ActionItem category) {}
 
         @Override
         public void setRanker(SuggestionsRanker suggestionsRanker) {}
     }
 }