chrome/android/junit/src/org/chromium/chrome/browser/ntp/cards/NewTabPageAdapterTest.java - Issue 2400783003: Ntp: show AllDismissedItem when all sections have been dismissed.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2400783003: Ntp: show AllDismissedItem when all sections have been dismissed. (Closed)

Patch Set: Address comments from treib, add tests. Created 4 years, 2 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

« no previous file with comments | « chrome/android/java_sources.gni ('k') | chrome/browser/android/ntp/ntp_snippets_bridge.h » ('j') | components/ntp_snippets/content_suggestions_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 a799d4ce8a7426f52f244062d412e0f85779e865..e94ec7e06884e713e0e81d7c9b464274f7bbb321 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

@@ -160,10 +160,9 @@ public class NewTabPageAdapterTest {

ItemsMatcher matcher = new ItemsMatcher(mAdapter, 0);

matcher.expect(NewTabPageItem.VIEW_TYPE_ABOVE_THE_FOLD);

for (SectionDescriptor descriptor : descriptors) matcher.expect(descriptor);

- if (descriptors.length > 0) {

- matcher.expect(NewTabPageItem.VIEW_TYPE_FOOTER);

- matcher.expect(NewTabPageItem.VIEW_TYPE_SPACING);

- }

+ if (descriptors.length == 0) matcher.expect(NewTabPageItem.VIEW_TYPE_ALL_DISMISSED);

Bernhard Bauer 2016/10/11 15:26:28 Nit: Use braces and separate lines here?

Michael van Ouwerkerk 2016/10/11 15:37:43 Done.

+ else matcher.expect(NewTabPageItem.VIEW_TYPE_FOOTER);

+ matcher.expect(NewTabPageItem.VIEW_TYPE_SPACING);

matcher.expectPosition(mAdapter.getItemCount());

}

@@ -360,7 +359,7 @@ public class NewTabPageAdapterTest {

@Test

@Feature({"Ntp"})

public void testProgressIndicatorDisplay() {

- int progressPos = mAdapter.getLastContentItemPosition() - 1;

+ int progressPos = mAdapter.getFooterPosition() - 1;

SuggestionsSection section = (SuggestionsSection) mAdapter.getGroup(progressPos);

List<NewTabPageItem> items = section.getItems();

ProgressItem progress = (ProgressItem) items.get(items.size() - 1);