Chromium Code Reviews| Index: chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerIntentTest.java |
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerIntentTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerIntentTest.java |
| new file mode 100644 |
| index 0000000000000000000000000000000000000000..19a96ee7f3ca752a8646b539968e20e259dfb473 |
| --- /dev/null |
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationUIManagerIntentTest.java |
| @@ -0,0 +1,115 @@ |
| +// 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.notifications; |
| + |
| +import android.app.Notification; |
| +import android.content.Context; |
| +import android.content.Intent; |
| +import android.test.suitebuilder.annotation.MediumTest; |
| + |
| +import org.chromium.base.library_loader.LibraryLoader; |
| +import org.chromium.base.test.util.Feature; |
| +import org.chromium.chrome.browser.ChromeActivity; |
| +import org.chromium.chrome.browser.preferences.Preferences; |
| +import org.chromium.chrome.browser.preferences.website.SingleCategoryPreferences; |
| +import org.chromium.chrome.browser.preferences.website.SingleWebsitePreferences; |
| +import org.chromium.chrome.test.ChromeActivityTestCaseBase; |
| +import org.chromium.chrome.test.util.ActivityUtils; |
| + |
| +/** |
| + * Instrumentation tests for the Notification UI Manager implementation on Android. |
| + * |
| + * Exercises the handling of intents and explicitly does not do anything in startMainActivity so |
| + * that the responsibility for correct initialization, e.g. loading the native library, lies with |
| + * the code exercised by this test. |
| + */ |
| +public class NotificationUIManagerIntentTest extends ChromeActivityTestCaseBase<ChromeActivity> { |
| + /** |
| + * Name of the Intent extra holding the notification id. This is set by the framework when a |
| + * notification preferences intent has been triggered from there, which could be one of the |
| + * setting gears in system UI. |
| + */ |
| + public static final String EXTRA_NOTIFICATION_ID = "notification_id"; |
| + |
| + public NotificationUIManagerIntentTest() { |
| + super(ChromeActivity.class); |
| + } |
| + |
| + @Override |
| + public void startMainActivity() throws InterruptedException { |
| + // Don't do anything here. The responsibility for correct initialization, e.g. loading the |
| + // native library, lies with the code exercised by this test. |
| + } |
| + |
| + /** |
| + * Tests the scenario where the user clicks "App settings" in the Android App notifications |
| + * screen. In this scenario the intent does not have the tag extra which holds the origin. This |
| + * means that the preferences cannot be shown for a specific site, and Chrome falls back to |
| + * showing the notification preferences for all sites. |
| + */ |
| + @MediumTest |
| + @Feature({"Browser", "Notifications"}) |
| + public void testLaunchNotificationPreferencesForCategory() throws Exception { |
| + assertFalse("The native library should not be loaded yet", LibraryLoader.isInitialized()); |
| + |
| + final Context context = getInstrumentation().getTargetContext().getApplicationContext(); |
| + |
| + final Intent intent = |
| + new Intent(Intent.ACTION_MAIN) |
| + .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES) |
| + .setClassName("org.chromium.chrome", "com.google.android.apps.chrome.Main") |
|
Ted C
2016/03/09 17:49:32
Instead of hardcoding these, I would try:
org.chr
Michael van Ouwerkerk
2016/03/09 18:40:43
Heh. I had that. Peter asked for this change, and
|
| + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); |
| + |
| + Preferences activity = ActivityUtils.waitForActivity( |
| + getInstrumentation(), Preferences.class, new Runnable() { |
| + @Override |
| + public void run() { |
| + context.startActivity(intent); |
| + } |
| + }); |
| + assertNotNull("Could not find the Preferences activity", activity); |
| + |
| + SingleCategoryPreferences fragment = |
| + ActivityUtils.waitForFragmentToAttach(activity, SingleCategoryPreferences.class); |
| + assertNotNull("Could not find the SingleCategoryPreferences fragment", fragment); |
| + } |
| + |
| + /** |
| + * Tests the scenario where the user clicks the settings gear on a notification that was flipped |
| + * through a long press. In this scenario the intent has the tag extra which holds the origin |
| + * that created the notification. Chrome will show the preferences for this specific site. |
| + */ |
| + @MediumTest |
| + @Feature({"Browser", "Notifications"}) |
| + public void testLaunchNotificationPreferencesForWebsite() throws Exception { |
| + assertFalse("The native library should not be loaded yet", LibraryLoader.isInitialized()); |
| + |
| + final Context context = getInstrumentation().getTargetContext().getApplicationContext(); |
| + |
| + final Intent intent = |
| + new Intent(Intent.ACTION_MAIN) |
| + .addCategory(Notification.INTENT_CATEGORY_NOTIFICATION_PREFERENCES) |
| + .setClassName("org.chromium.chrome", "com.google.android.apps.chrome.Main") |
| + .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK) |
| + .putExtra(EXTRA_NOTIFICATION_ID, NotificationUIManager.PLATFORM_ID) |
| + .putExtra(NotificationConstants.EXTRA_NOTIFICATION_TAG, |
| + NotificationUIManager.makePlatformTag( |
| + 42L /* persistentNotificationId */, "https://example.com", |
| + null /* tag */)); |
| + |
| + Preferences activity = ActivityUtils.waitForActivity( |
| + getInstrumentation(), Preferences.class, new Runnable() { |
| + @Override |
| + public void run() { |
| + context.startActivity(intent); |
| + } |
| + }); |
| + assertNotNull("Could not find the Preferences activity", activity); |
| + |
| + SingleWebsitePreferences fragment = |
| + ActivityUtils.waitForFragmentToAttach(activity, SingleWebsitePreferences.class); |
| + assertNotNull("Could not find the SingleWebsitePreferences fragment", fragment); |
| + } |
| +} |