Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-26 14:46:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 878587 - Fixes for testMasterPassword to diminish intermittent-failures caused by slow devices. r=jmaher

Browse Source
This commit is contained in:
Paul Feher 2013-05-10 10:56:53 +03:00
parent 9e90457cad
commit 55c12c531a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobile/android/base/tests/testMasterPassword.java.in
View File

@ -76,9 +76,10 @@ public class testMasterPassword extends PixelTest {
mSolo.clickOnButton("OK"); mSolo.clickOnButton("OK");
// Verify that the Master Password was set // Verify that the Master Password was set
waitForText("^Use master password$"); mSolo.searchText("Privacy & Security");
mAsserter.ok(mSolo.waitForText("^Use master password$"), "Checking if Use master password is present", "Use master password is present");
mSolo.clickOnText("^Use master password$"); mSolo.clickOnText("^Use master password$");
mAsserter.ok(mSolo.searchText("Remove Master Password"), "Checking if the password is enabled", "The password is enabled"); mAsserter.ok(mSolo.waitForText("Remove Master Password"), "Checking if the password is enabled", "The password is enabled");
clickOnButton("Cancel"); // Go back to settings menu clickOnButton("Cancel"); // Go back to settings menu
waitForText("^Settings$"); waitForText("^Settings$");
mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the Settings Menu mActions.sendSpecialKey(Actions.SpecialKey.BACK);// Close the Settings Menu
@ -114,7 +115,8 @@ public class testMasterPassword extends PixelTest {
mSolo.clickOnButton("OK"); mSolo.clickOnButton("OK");
// Verify that the Master Password was disabled // Verify that the Master Password was disabled
waitForText("^Use master password$"); mSolo.searchText("Privacy & Security");
mAsserter.ok(mSolo.waitForText("^Use master password$"), "Checking if Use master password is present", "Use master password is present");
mSolo.clickOnText("^Use master password$"); mSolo.clickOnText("^Use master password$");
mAsserter.ok(waitForText("^Create Master Password$"), "Checking if the password is disabled", "The password is disabled"); mAsserter.ok(waitForText("^Create Master Password$"), "Checking if the password is disabled", "The password is disabled");
clickOnButton("Cancel"); // Go back to settings menu clickOnButton("Cancel"); // Go back to settings menu
@ -191,6 +193,7 @@ public class testMasterPassword extends PixelTest {
doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed
for (String item:option) { for (String item:option) {
if (item.equals("Save")) { if (item.equals("Save")) {
mAsserter.ok(mSolo.waitForText("Save"), "Checking if Save option is present", "Save option is present");
mSolo.clickOnButton(item); mSolo.clickOnButton(item);
// Verify that the Master Password isn't deactivated when the password field is empty // Verify that the Master Password isn't deactivated when the password field is empty
@ -213,9 +216,11 @@ public class testMasterPassword extends PixelTest {
else { else {
clearPrivateData(); clearPrivateData();
doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed
mSolo.clickOnButton(item); mAsserter.ok(mSolo.waitForText("Don't save"), "Checking if Don't save option is present again", "Don't save option is present again");
mSolo.clickOnText("Don't save");
doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed again doorhangerDisplayed(LOGIN_URL);// Check that the doorhanger is displayed again
mSolo.clickOnButton(item); mAsserter.ok(mSolo.waitForText("Don't save"), "Checking if Don't save option is present again", "Don't save option is present again");
mSolo.clickOnText("Don't save");
waitForText("Browser Blank Page 01"); waitForText("Browser Blank Page 01");
} }
} }