From c3c74023b3c172483cb302b5c700d6cdbf21821a Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Fri, 7 Feb 2014 14:49:35 -0500 Subject: [PATCH] Bug 958517 - Create a 'Page' menu and move some of the URL context menu actions there (test changes) r=lucasr --- mobile/android/base/tests/StringHelper.java | 1 + mobile/android/base/tests/testClearPrivateData.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/tests/StringHelper.java b/mobile/android/base/tests/StringHelper.java index 11b866ef9364..a0f2450ecea9 100644 --- a/mobile/android/base/tests/StringHelper.java +++ b/mobile/android/base/tests/StringHelper.java @@ -166,6 +166,7 @@ public class StringHelper { // Android 3.0+ public static final String TOOLS_LABEL = "Tools"; + public static final String PAGE_LABEL = "Page"; // Android 2.3 and lower only public static final String MORE_LABEL = "More"; diff --git a/mobile/android/base/tests/testClearPrivateData.java b/mobile/android/base/tests/testClearPrivateData.java index edbb22f3cae3..6111c8b62f9f 100644 --- a/mobile/android/base/tests/testClearPrivateData.java +++ b/mobile/android/base/tests/testClearPrivateData.java @@ -107,9 +107,16 @@ public class testClearPrivateData extends PixelTest { //Verify if there are settings to be clear if so clear them from the URL bar context menu public void checkOption(String option, String button) { - final View toolbarView = mSolo.getView("browser_toolbar"); - mSolo.clickLongOnView(toolbarView); - mAsserter.ok(waitForText(StringHelper.CONTEXT_MENU_ITEMS_IN_URL_BAR[2]), "Waiting for the pop-up to open", "Pop up was openend"); + if (mDevice.version.equals("2.x")) { + // Use the context menu in pre-11 + final View toolbarView = mSolo.getView("browser_toolbar"); + mSolo.clickLongOnView(toolbarView); + mAsserter.ok(waitForText(StringHelper.CONTEXT_MENU_ITEMS_IN_URL_BAR[2]), "Waiting for the pop-up to open", "Pop up was opened"); + } else { + // Use the Page menu in 11+ + selectMenuItem(StringHelper.PAGE_LABEL); + mAsserter.ok(waitForText(StringHelper.CONTEXT_MENU_ITEMS_IN_URL_BAR[2]), "Waiting for the submenu to open", "Submenu was opened"); + } mSolo.clickOnText(StringHelper.CONTEXT_MENU_ITEMS_IN_URL_BAR[2]); mAsserter.ok(waitForText(option), "Verify that the option: " + option + " is in the list", "The option is in the list. There are settings to clear"); mSolo.clickOnButton(button);