Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1450)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2196273002: Zine: support multiple sections in the ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java ('K') | « chrome/android/java_sources.gni ('k') | chrome/browser/android/ntp/ntp_snippets_bridge.h » ('j') | chrome/browser/android/ntp/ntp_snippets_bridge.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9a43670be3724ec50e037d1b25b742d0e09e57ba..c1653ebc3edf034d1beb2e550af1f3b1ffee198e 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
@@ -13,6 +13,7 @@ import org.chromium.base.metrics.RecordHistogram;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.ntp.NewTabPageView.NewTabPageManager;
import org.chromium.chrome.browser.ntp.snippets.CategoryStatus;
+import org.chromium.chrome.browser.ntp.snippets.KnownCategories;
import org.chromium.chrome.browser.ntp.snippets.SnippetArticleListItem;
import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
import org.chromium.chrome.browser.ntp.snippets.SnippetsSource.SnippetsObserver;
@@ -73,9 +74,9 @@ public class NewTabPageAdapterTest {
assertEquals(NewTabPageListItem.VIEW_TYPE_SPACING, ntpa.getItemViewType(3));
List<SnippetArticleListItem> snippets = createDummySnippets();
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
- List<NewTabPageListItem> loadedItems = new ArrayList<>(ntpa.getItemsForTesting());
+ List<NewTabPageListItem> loadedItems = new ArrayList<>(ntpa.getItems());
assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, ntpa.getItemViewType(0));
assertEquals(NewTabPageListItem.VIEW_TYPE_HEADER, ntpa.getItemViewType(1));
assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 1));
@@ -83,10 +84,10 @@ public class NewTabPageAdapterTest {
NewTabPageListItem.VIEW_TYPE_SPACING, ntpa.getItemViewType(loadedItems.size() - 1));
// The adapter should ignore any new incoming data.
- mSnippetsObserver.onSnippetsReceived(
- Arrays.asList(new SnippetArticleListItem[] {new SnippetArticleListItem(
- "foo", "title1", "pub1", "txt1", "foo", "bar", 0, 0, 0)}));
- assertEquals(loadedItems, ntpa.getItemsForTesting());
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES,
+ Arrays.asList(new SnippetArticleListItem[] { new SnippetArticleListItem(
+ "foo", "title1", "pub1", "txt1", "foo", "bar", 0, 0, 0) }));
+ assertEquals(loadedItems, ntpa.getItems());
}
/**
@@ -100,7 +101,8 @@ public class NewTabPageAdapterTest {
new NewTabPageAdapter(mNewTabPageManager, null, mSnippetsBridge, null);
// If we don't get anything, we should be in the same situation as the initial one.
- mSnippetsObserver.onSnippetsReceived(new ArrayList<SnippetArticleListItem>());
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES,
+ new ArrayList<SnippetArticleListItem>());
assertEquals(4, ntpa.getItemCount());
assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, ntpa.getItemViewType(0));
assertEquals(NewTabPageListItem.VIEW_TYPE_HEADER, ntpa.getItemViewType(1));
@@ -109,8 +111,8 @@ public class NewTabPageAdapterTest {
// We should load new snippets when we get notified about them.
List<SnippetArticleListItem> snippets = createDummySnippets();
- mSnippetsObserver.onSnippetsReceived(snippets);
- List<NewTabPageListItem> loadedItems = new ArrayList<>(ntpa.getItemsForTesting());
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
+ List<NewTabPageListItem> loadedItems = new ArrayList<>(ntpa.getItems());
assertEquals(NewTabPageListItem.VIEW_TYPE_ABOVE_THE_FOLD, ntpa.getItemViewType(0));
assertEquals(NewTabPageListItem.VIEW_TYPE_HEADER, ntpa.getItemViewType(1));
assertEquals(snippets, loadedItems.subList(2, loadedItems.size() - 1));
@@ -118,10 +120,11 @@ public class NewTabPageAdapterTest {
NewTabPageListItem.VIEW_TYPE_SPACING, ntpa.getItemViewType(loadedItems.size() - 1));
// The adapter should ignore any new incoming data.
- mSnippetsObserver.onSnippetsReceived(
+ mSnippetsObserver.onSuggestionsReceived(
+ KnownCategories.ARTICLES,
Arrays.asList(new SnippetArticleListItem[] {new SnippetArticleListItem(
"foo", "title1", "pub1", "txt1", "foo", "bar", 0, 0, 0)}));
- assertEquals(loadedItems, ntpa.getItemsForTesting());
+ assertEquals(loadedItems, ntpa.getItems());
}
/**
@@ -134,22 +137,25 @@ public class NewTabPageAdapterTest {
new NewTabPageAdapter(mNewTabPageManager, null, mSnippetsBridge, null);
List<SnippetArticleListItem> snippets = createDummySnippets();
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
assertEquals(3 + snippets.size(), ntpa.getItemCount());
// If we get told that snippets are enabled, we just leave the current
// ones there and not clear.
- mSnippetsObserver.onCategoryStatusChanged(CategoryStatus.AVAILABLE);
+ mSnippetsObserver.onCategoryStatusChanged(KnownCategories.ARTICLES,
+ CategoryStatus.AVAILABLE);
assertEquals(3 + snippets.size(), ntpa.getItemCount());
// When snippets are disabled, we clear them and we should go back to
// the situation with the status card.
- mSnippetsObserver.onCategoryStatusChanged(CategoryStatus.SIGNED_OUT);
+ mSnippetsObserver.onCategoryStatusChanged(KnownCategories.ARTICLES,
+ CategoryStatus.SIGNED_OUT);
assertEquals(4, ntpa.getItemCount());
// The adapter should now be waiting for new snippets.
- mSnippetsObserver.onCategoryStatusChanged(CategoryStatus.AVAILABLE);
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onCategoryStatusChanged(KnownCategories.ARTICLES,
+ CategoryStatus.AVAILABLE);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
assertEquals(3 + snippets.size(), ntpa.getItemCount());
}
@@ -165,28 +171,31 @@ public class NewTabPageAdapterTest {
List<SnippetArticleListItem> snippets = createDummySnippets();
// By default, status is INITIALIZING, so we can load snippets
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
assertEquals(3 + snippets.size(), ntpa.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));
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
assertEquals(3 + snippets.size() - 1, ntpa.getItemCount());
// When snippets are disabled, we should not be able to load them
- mSnippetsObserver.onCategoryStatusChanged(CategoryStatus.SIGNED_OUT);
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onCategoryStatusChanged(KnownCategories.ARTICLES,
+ CategoryStatus.SIGNED_OUT);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
assertEquals(4, ntpa.getItemCount());
// INITIALIZING lets us load snippets still.
- mSnippetsObserver.onCategoryStatusChanged(CategoryStatus.INITIALIZING);
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onCategoryStatusChanged(KnownCategories.ARTICLES,
+ CategoryStatus.INITIALIZING);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
assertEquals(3 + snippets.size(), ntpa.getItemCount());
// The adapter should now be waiting for new snippets.
- mSnippetsObserver.onCategoryStatusChanged(CategoryStatus.AVAILABLE);
- mSnippetsObserver.onSnippetsReceived(snippets);
+ mSnippetsObserver.onCategoryStatusChanged(KnownCategories.ARTICLES,
+ CategoryStatus.AVAILABLE);
+ mSnippetsObserver.onSuggestionsReceived(KnownCategories.ARTICLES, snippets);
assertEquals(3 + snippets.size(), ntpa.getItemCount());
}
« chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java ('K') | « chrome/android/java_sources.gni ('k') | chrome/browser/android/ntp/ntp_snippets_bridge.h » ('j') | chrome/browser/android/ntp/ntp_snippets_bridge.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698