📰 Add an action button that can be used in sections

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

Index: chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
index 779707497126d88dd6424ec0e614eb52dbef1405..dac3b860f5c8fdc70849f4257dd3a9c14f81b4be 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java
@@ -112,7 +112,9 @@ public void testSnippetLoading() {
         List<NewTabPageListItem> loadedItems = new ArrayList<>(mNtpAdapter.getItems());
         assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, mNtpAdapter.getItemViewType(0));
         assertEquals(NewTabPageListItem.VIEW_TYPE_HEADER, mNtpAdapter.getItemViewType(1));
-        assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 1));
+        assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 2));
+        assertEquals(NewTabPageListItem.VIEW_TYPE_ACTION,
+                mNtpAdapter.getItemViewType(loadedItems.size() - 2));
         assertEquals(NewTabPageListItem.VIEW_TYPE_SPACING,
                 mNtpAdapter.getItemViewType(loadedItems.size() - 1));
 
@@ -146,7 +148,9 @@ public void testSnippetLoadingInitiallyEmpty() {
         List<NewTabPageListItem> loadedItems = new ArrayList<>(mNtpAdapter.getItems());
         assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, mNtpAdapter.getItemViewType(0));
         assertEquals(NewTabPageListItem.VIEW_TYPE_HEADER, mNtpAdapter.getItemViewType(1));
-        assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 1));
+        assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 2));
+        assertEquals(NewTabPageListItem.VIEW_TYPE_ACTION,
+                mNtpAdapter.getItemViewType(loadedItems.size() - 2));
         assertEquals(NewTabPageListItem.VIEW_TYPE_SPACING,
                 mNtpAdapter.getItemViewType(loadedItems.size() - 1));
 
@@ -166,13 +170,13 @@ public void testSnippetLoadingInitiallyEmpty() {
     public void testSnippetClearing() {
         List<SnippetArticleListItem> snippets = createDummySnippets();
         mSnippetsSource.setSnippetsForCategory(KnownCategories.ARTICLES, snippets);
-        assertEquals(3 + snippets.size(), mNtpAdapter.getItemCount());
+        assertEquals(4 + snippets.size(), mNtpAdapter.getItemCount());

[PEConn, 2016/08/08 18:13:12]

Can this be a constant?

[dgn, 2016/08/09 13:00:42]

Done.

 
         // If we get told that snippets are enabled, we just leave the current
         // ones there and not clear.
         mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
                 CategoryStatus.AVAILABLE);
-        assertEquals(3 + snippets.size(), mNtpAdapter.getItemCount());
+        assertEquals(4 + snippets.size(), mNtpAdapter.getItemCount());
 
         // When snippets are disabled, we clear them and we should go back to
         // the situation with the status card.
@@ -184,7 +188,7 @@ public void testSnippetClearing() {
         mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
                 CategoryStatus.AVAILABLE);
         mSnippetsSource.setSnippetsForCategory(KnownCategories.ARTICLES, snippets);
-        assertEquals(3 + snippets.size(), mNtpAdapter.getItemCount());
+        assertEquals(4 + snippets.size(), mNtpAdapter.getItemCount());
     }
 
     /**
@@ -197,13 +201,13 @@ public void testSnippetLoadingBlock() {
 
         // By default, status is INITIALIZING, so we can load snippets
         mSnippetsSource.setSnippetsForCategory(KnownCategories.ARTICLES, snippets);
-        assertEquals(3 + snippets.size(), mNtpAdapter.getItemCount());
+        assertEquals(4 + snippets.size(), mNtpAdapter.getItemCount());
 
         // If we have snippets, we should not load the new list.
         snippets.add(new SnippetArticleListItem("https://site.com/url1", "title1", "pub1", "txt1",
                 "https://site.com/url1", "https://amp.site.com/url1", 0, 0, 0));
         mSnippetsSource.setSnippetsForCategory(KnownCategories.ARTICLES, snippets);
-        assertEquals(3 + snippets.size() - 1, mNtpAdapter.getItemCount());
+        assertEquals(4 + snippets.size() - 1, mNtpAdapter.getItemCount());
 
         // When snippets are disabled, we should not be able to load them
         mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
@@ -215,13 +219,13 @@ public void testSnippetLoadingBlock() {
         mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
                 CategoryStatus.INITIALIZING);
         mSnippetsSource.setSnippetsForCategory(KnownCategories.ARTICLES, snippets);
-        assertEquals(3 + snippets.size(), mNtpAdapter.getItemCount());
+        assertEquals(4 + snippets.size(), mNtpAdapter.getItemCount());
 
         // The adapter should now be waiting for new snippets.
         mSnippetsSource.setStatusForCategory(KnownCategories.ARTICLES,
                 CategoryStatus.AVAILABLE);
         mSnippetsSource.setSnippetsForCategory(KnownCategories.ARTICLES, snippets);
-        assertEquals(3 + snippets.size(), mNtpAdapter.getItemCount());
+        assertEquals(4 + snippets.size(), mNtpAdapter.getItemCount());
     }
 
     /**