chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationTestBase.java - Issue 1485743002: Push API: test that default notification is shown on Android when needed.

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/javatests/src/org/chromium/chrome/browser/notifications/NotificationTestBase.java

Issue 1485743002: Push API: test that default notification is shown on Android when needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@PushMessagingInstrumentationTest

Patch Set: Address peter's comments. Created 5 years 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/src/org/chromium/chrome/browser/push_messaging/PushMessagingServiceObserver.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java » ('j') | chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationTestBase.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationTestBase.java

index 01053384b6628de29fdc860d20abbae18d556fb1..b72b5d262091665f9ce7d76edfb985bd7e3b08eb 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationTestBase.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationTestBase.java

@@ -9,10 +9,9 @@

import android.app.Notification;

import org.chromium.base.ThreadUtils;

-import org.chromium.chrome.browser.ChromeActivity;

import org.chromium.chrome.browser.preferences.website.ContentSetting;

import org.chromium.chrome.browser.preferences.website.PushNotificationInfo;

-import org.chromium.chrome.test.ChromeActivityTestCaseBase;

+import org.chromium.chrome.test.ChromeTabbedActivityTestBase;

import org.chromium.chrome.test.util.TestHttpServerClient;

import org.chromium.chrome.test.util.browser.notifications.MockNotificationManagerProxy;

import org.chromium.chrome.test.util.browser.notifications.MockNotificationManagerProxy.NotificationEntry;

@@ -27,7 +26,7 @@

* Web Notifications are only supported on Android JellyBean and beyond.

-public class NotificationTestBase extends ChromeActivityTestCaseBase<ChromeActivity> {

+public class NotificationTestBase extends ChromeTabbedActivityTestBase {

/** The maximum time to wait for a criteria to become valid. */

private static final long MAX_TIME_TO_POLL_MS = scaleTimeout(6000);

@@ -36,10 +35,6 @@

private MockNotificationManagerProxy mMockNotificationManager;

- protected NotificationTestBase() {

- super(ChromeActivity.class);

- }

/**

* Returns the origin of the HTTP server the test is being ran on.