Bug 1383713 - [robocop] Find toolbar first and use it to find menu button. r?JanH,nechen
MozReview-Commit-ID: 3b6HijVb9nB
--- a/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
+++ b/mobile/android/tests/browser/robocop/src/org/mozilla/gecko/tests/BaseTest.java
@@ -16,16 +16,17 @@ import org.mozilla.gecko.Actions;
import org.mozilla.gecko.Element;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.GeckoThread;
import org.mozilla.gecko.R;
import org.mozilla.gecko.RobocopUtils;
import org.mozilla.gecko.Tab;
import org.mozilla.gecko.Tabs;
+import org.mozilla.gecko.toolbar.BrowserToolbar;
import org.mozilla.gecko.util.GeckoBundle;
import android.content.ContentValues;
import android.content.res.AssetManager;
import android.database.Cursor;
import android.os.Build;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
@@ -419,17 +420,18 @@ abstract class BaseTest extends BaseRobo
mSolo.clickOnText(itemName);
}
}
}
public final void selectMenuItem(String menuItemName) {
// build the item name ready to be used
String itemName = "^" + menuItemName + "$";
- final View menuView = mSolo.getView(R.id.menu);
+ final BrowserToolbar toolbar = (BrowserToolbar) mSolo.getView(R.id.browser_toolbar);
+ final View menuView = toolbar.findViewById(R.id.menu);
mAsserter.isnot(menuView, null, "Menu view is not null");
mSolo.clickOnView(menuView, true);
mAsserter.ok(waitForEnabledText(itemName), "Waiting for menu item " + itemName, itemName + " is present and enabled");
mSolo.clickOnText(itemName);
}
public final void verifyHomePagerHidden() {
final View homePagerContainer = mSolo.getView(R.id.home_screen_container);