wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 874985 - Part 1: Robustify existing test methods. r=gbrown

Browse Source
This commit is contained in:
Brian Nicholson 2013-11-15 22:59:16 -08:00
parent 1bcc3feb09
commit 7b3c098ad0
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mobile/android/base/tests/BaseTest.java
View File

@ -674,15 +674,22 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
} }
public void back() { public void back() {
Actions.EventExpecter pageShowExpecter = mActions.expectGeckoEvent("Content:PageShow");
if (devType.equals("tablet")) { if (devType.equals("tablet")) {
Element backBtn = mDriver.findElement(getActivity(), "back"); Element backBtn = mDriver.findElement(getActivity(), "back");
backBtn.click(); backBtn.click();
} else { } else {
mActions.sendSpecialKey(Actions.SpecialKey.BACK); mActions.sendSpecialKey(Actions.SpecialKey.BACK);
} }
pageShowExpecter.blockForEvent();
pageShowExpecter.unregisterListener();
} }
public void forward() { public void forward() {
Actions.EventExpecter pageShowExpecter = mActions.expectGeckoEvent("Content:PageShow");
if (devType.equals("tablet")) { if (devType.equals("tablet")) {
Element fwdBtn = mDriver.findElement(getActivity(), "forward"); Element fwdBtn = mDriver.findElement(getActivity(), "forward");
fwdBtn.click(); fwdBtn.click();
@ -695,7 +702,11 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
} else { } else {
mSolo.clickOnText("^Forward$"); mSolo.clickOnText("^Forward$");
} }
ensureMenuClosed();
} }
pageShowExpecter.blockForEvent();
pageShowExpecter.unregisterListener();
} }
public void reload() { public void reload() {
@ -711,6 +722,7 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
} else { } else {
mSolo.clickOnText("^Reload$"); mSolo.clickOnText("^Reload$");
} }
ensureMenuClosed();
} }
} }
@ -729,6 +741,15 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
bookmarkBtn.click(); bookmarkBtn.click();
} }
} }
ensureMenuClosed();
}
// On some devices, the menu may not be dismissed after clicking on an
// item. Close it here.
private void ensureMenuClosed() {
if (mSolo.searchText("^New Tab$")) {
mActions.sendSpecialKey(Actions.SpecialKey.BACK);
}
} }
} }
} }