Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java |
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java |
index 3c25a62d517bb7dd68005afecdfd9c05baf06f75..f77397ea1bd6ce1774b157fef220b113a0b07598 100644 |
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java |
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java |
@@ -295,11 +295,13 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase { |
public void testContextMenuEntriesForImage() throws InterruptedException, TimeoutException { |
startCustomTabActivityWithIntent(createMinimalCustomTabIntent()); |
- final int expectedMenuSize = 9; |
+ final int expectedMenuSize = 11; |
Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActivityTab(), "logo"); |
assertEquals(expectedMenuSize, menu.size()); |
assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_send_message)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts)); |
assertNotNull(menu.findItem(R.id.contextmenu_copy_email_address)); |
assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text)); |
assertNotNull(menu.findItem(R.id.contextmenu_save_link_as)); |
@@ -314,6 +316,8 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase { |
assertTrue(menu.findItem(R.id.contextmenu_search_by_image).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_copy_link_address).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_send_message).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_copy_email_address).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_copy_link_text).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_save_link_as).isVisible()); |
@@ -330,12 +334,14 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase { |
public void testContextMenuEntriesForLink() throws InterruptedException, TimeoutException { |
startCustomTabActivityWithIntent(createMinimalCustomTabIntent()); |
- final int expectedMenuSize = 9; |
+ final int expectedMenuSize = 11; |
Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActivityTab(), |
"aboutLink"); |
assertEquals(expectedMenuSize, menu.size()); |
assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_send_message)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts)); |
assertNotNull(menu.findItem(R.id.contextmenu_copy_email_address)); |
assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text)); |
assertNotNull(menu.findItem(R.id.contextmenu_save_link_as)); |
@@ -349,6 +355,8 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase { |
assertTrue(menu.findItem(R.id.contextmenu_save_link_as).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_share_image).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_send_message).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_copy_email_address).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible()); |
assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible()); |
@@ -357,6 +365,44 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase { |
} |
/** |
+ * Test the entries in the context menu shown when long clicking an mailto url. |
+ * @SmallTest |
+ * @RetryOnFailure |
+ */ |
+ @DisabledTest |
+ public void testContextMenuEntriesForMailto() throws InterruptedException, TimeoutException { |
+ startCustomTabActivityWithIntent(createMinimalCustomTabIntent()); |
+ |
+ final int expectedMenuSize = 11; |
+ Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActivityTab(), "email"); |
+ assertEquals(expectedMenuSize, menu.size()); |
+ |
+ assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_send_message)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_copy_email_address)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_save_link_as)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_save_image)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_share_image)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_open_image)); |
+ assertNotNull(menu.findItem(R.id.contextmenu_save_video)); |
+ |
+ assertTrue(menu.findItem(R.id.contextmenu_send_message).isVisible()); |
+ assertTrue(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()); |
+ assertTrue(menu.findItem(R.id.contextmenu_copy_email_address).isVisible()); |
+ |
+ assertFalse(menu.findItem(R.id.contextmenu_copy_link_address).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_share_image).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_search_by_image).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_copy_link_text).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_save_link_as).isVisible()); |
+ assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible()); |
+ } |
+ |
+ /** |
* Test the entries in the app menu. |
*/ |
@SmallTest |