chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java - Issue 23530057: Merge 222950 "Adding a dialog on click of "add to homescreen" me..."

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java

Issue 23530057: Merge 222950 "Adding a dialog on click of "add to homescreen" me..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1629/src/

Patch Set: Created 7 years, 3 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/src/org/chromium/chrome/browser/ShortcutHelper.java ('k') | chrome/browser/android/shortcut_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

===================================================================

--- chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java (revision 223100)

+++ chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.java (working copy)

@@ -28,6 +28,7 @@

+ "<meta name=\"mobile-web-app-capable\" content=\"yes\" />"

+ "<title>" + WEBAPP_TITLE + "</title>"

+ "</head><body>Webapp capable</body></html>");

+ private static final String EDITED_WEBAPP_TITLE = "Webapp shortcut edited";

private static final String SECOND_WEBAPP_TITLE = "Webapp shortcut #2";

private static final String SECOND_WEBAPP_HTML = UrlUtils.encodeHtmlDataUri(

@@ -82,7 +83,7 @@

@Feature("{Webapp}")

public void testAddWebappShortcuts() throws InterruptedException {

// Add a webapp shortcut and make sure the intent's parameters make sense.

- addShortcutToURL(WEBAPP_HTML);

+ addShortcutToURL(WEBAPP_HTML, "");

Intent firedIntent = mTestObserver.firedIntent;

assertEquals(WEBAPP_TITLE, firedIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME));

@@ -93,7 +94,7 @@

// Add a second shortcut and make sure it matches the second webapp's parameters.

mTestObserver.reset();

- addShortcutToURL(SECOND_WEBAPP_HTML);

+ addShortcutToURL(SECOND_WEBAPP_HTML, "");

Intent newFiredIntent = mTestObserver.firedIntent;

assertEquals(SECOND_WEBAPP_TITLE,

newFiredIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME));

@@ -107,7 +108,7 @@

@MediumTest

@Feature("{Webapp}")

public void testAddBookmarkShortcut() throws InterruptedException {

- addShortcutToURL(NORMAL_HTML);

+ addShortcutToURL(NORMAL_HTML, "");

// Make sure the intent's parameters make sense.

Intent firedIntent = mTestObserver.firedIntent;

@@ -119,7 +120,25 @@

assertNull(launchIntent.getComponent());

}

- private void addShortcutToURL(String url) throws InterruptedException {

+ @MediumTest

+ @Feature("{Webapp}")

+ public void testAddWebappShortcutsWithoutTitleEdit() throws InterruptedException {

+ // Add a webapp shortcut to check unedited title.

+ addShortcutToURL(WEBAPP_HTML, "");

+ Intent firedIntent = mTestObserver.firedIntent;

+ assertEquals(WEBAPP_TITLE, firedIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME));

+ }

+ @MediumTest

+ @Feature("{Webapp}")

+ public void testAddWebappShortcutsWithTitleEdit() throws InterruptedException {

+ // Add a webapp shortcut to check edited title.

+ addShortcutToURL(WEBAPP_HTML, EDITED_WEBAPP_TITLE);

+ Intent firedIntent = mTestObserver.firedIntent;

+ assertEquals(EDITED_WEBAPP_TITLE , firedIntent.getStringExtra(Intent.EXTRA_SHORTCUT_NAME));

+ }

+ private void addShortcutToURL(String url, final String title) throws InterruptedException {

loadUrlWithSanitization(url);

assertTrue(waitForActiveShellToBeDoneLoading());

@@ -127,7 +146,7 @@

getInstrumentation().runOnMainSync(new Runnable() {

@Override

public void run() {

- ShortcutHelper.addShortcut(mActivity.getActiveTab());

+ ShortcutHelper.addShortcut(mActivity.getActiveTab(), title);

}

});