📰 Tweak the suggestion ranks for UMA to handle fetchMore

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.SuggestionsRanker;
 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.
  */
@@ skipping 76 matching lines @@
         mViewRenderer.renderAndCompare(mRecyclerView.getChildAt(firstOfSecondCategory + 1),
                 "short_minimal_snippet_narrow");
         mViewRenderer.renderAndCompare(mRecyclerView, "snippets_narrow");
     }
 
     private void setupTestData() {
         @CategoryInt
         int fullCategory = 0;
         @CategoryInt
         int minimalCategory = 1;
-        SnippetArticle shortSnippet = new SnippetArticle(
-                fullCategory,
-                "id1",
-                "Snippet",
-                "Publisher",
-                "Preview Text",
-                "www.google.com",
-                1466614774,  // Timestamp
-                10f,  // Score
-                0);  // Position
+        SnippetArticle shortSnippet = new SnippetArticle(fullCategory, "id1", "Snippet",
+                "Publisher", "Preview Text", "www.google.com",
+                1466614774, // Timestamp
+                10f); // Score
         shortSnippet.setThumbnailBitmap(BitmapFactory.decodeResource(getActivity().getResources(),
                 R.drawable.signin_promo_illustration));
 
-        SnippetArticle longSnippet = new SnippetArticle(
-                fullCategory,
-                "id2",
+        SnippetArticle longSnippet = new SnippetArticle(fullCategory, "id2",
                 new String(new char[20]).replace("\0", "Snippet "),
                 new String(new char[20]).replace("\0", "Publisher "),
-                new String(new char[80]).replace("\0", "Preview Text "),
-                "www.google.com",
-                1466614074,  // Timestamp
-                20f,  // Score
-                1);  // Position
+                new String(new char[80]).replace("\0", "Preview Text "), "www.google.com",
+                1466614074, // Timestamp
+                20f); // Score
 
-        SnippetArticle minimalSnippet = new SnippetArticle(
-                minimalCategory,
-                "id3",
-                new String(new char[20]).replace("\0", "Bookmark "),
-                "Publisher",
-                "This should not be displayed",
-                "www.google.com",
-                1466614774,  // Timestamp
-                10f,  // Score
-                0);  // Position
+        SnippetArticle minimalSnippet = new SnippetArticle(minimalCategory, "id3",
+                new String(new char[20]).replace("\0", "Bookmark "), "Publisher",
+                "This should not be displayed", "www.google.com",
+                1466614774, // Timestamp
+                10f); // Score
 
-        SnippetArticle minimalSnippet2 = new SnippetArticle(
-                minimalCategory,
-                "id4",
-                "Bookmark",
-                "Publisher",
-                "This should not be displayed",
-                "www.google.com",
-                1466614774,  // Timestamp
-                10f,  // Score
-                0);  // Position
+        SnippetArticle minimalSnippet2 = new SnippetArticle(minimalCategory, "id4", "Bookmark",
+                "Publisher", "This should not be displayed", "www.google.com",
+                1466614774, // Timestamp
+                10f); // Score
 
         mSnippetsSource.setInfoForCategory(
                 fullCategory, new SuggestionsCategoryInfo(fullCategory, "Section Title",
                                       ContentSuggestionsCardLayout.FULL_CARD, false, false, false,
                                       true, "No suggestions"));
         mSnippetsSource.setStatusForCategory(fullCategory, CategoryStatus.AVAILABLE);
         mSnippetsSource.setSuggestionsForCategory(
                 fullCategory, Arrays.asList(shortSnippet, longSnippet));
 
         mSnippetsSource.setInfoForCategory(
@@ skipping 19 matching lines @@
         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 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(
@@ skipping 33 matching lines @@
         public void navigateToBookmarks() {
             throw new UnsupportedOperationException();
         }
 
         @Override
         public void navigateToRecentTabs() {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public void trackSnippetsPageImpression(int[] categories, int[] suggestionsPerCategory) {}
-
-        @Override
-        public void trackSnippetImpression(SnippetArticle article) {}
-
-        @Override
-        public void trackSnippetMenuOpened(SnippetArticle article) {}
-
-        @Override
-        public void trackSnippetCategoryActionImpression(int category, int position) {}
-
-        @Override
-        public void trackSnippetCategoryActionClick(int category, int position) {}
-
-        @Override
-        public void openSnippet(
-                int windowOpenDisposition, SnippetArticle article, int categoryIndex) {
+        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) {
@@ skipping 61 matching lines @@
 
         @Override
         public boolean isCurrentPage() {
             return true;
         }
 
         @Override
         public ContextMenuManager getContextMenuManager() {
             return mContextMenuManager;
         }
+
+        public SuggestionsMetricsReporter getSuggestionsMetricsReporter() {
+            return mSuggestionsMetricsReporter;
+        }
+    }
+
+    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) {}
     }
 }