Bug 1354458 - wait_for_condition() now replaced with wait().until() in unit tests
MozReview-Commit-ID: 2BwIcoCAnow
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_modal_dialogs.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_modal_dialogs.py
@@ -70,42 +70,46 @@ class TestTabModalAlerts(BaseAlertTestCa
alert = self.marionette.switch_to_alert()
alert.dismiss()
def test_confirm_accept(self):
self.marionette.find_element(By.ID, "tab-modal-confirm").click()
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
alert.accept()
- self.wait_for_condition(
- lambda mn: mn.find_element(By.ID, "confirm-result").text == "true")
+ Wait(self.marionette).until(
+ lambda mn: mn.find_element(By.ID, "confirm-result").text == "true",
+ message="Value of element 'confirm-result' is 'false'")
def test_confirm_dismiss(self):
self.marionette.find_element(By.ID, "tab-modal-confirm").click()
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
alert.dismiss()
- self.wait_for_condition(
- lambda mn: mn.find_element(By.ID, "confirm-result").text == "false")
+ Wait(self.marionette).until(
+ lambda mn: mn.find_element(By.ID, "confirm-result").text == "false",
+ message="Value of element 'confirm-result' is 'true'")
def test_prompt_accept(self):
self.marionette.find_element(By.ID, "tab-modal-prompt").click()
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
alert.accept()
- self.wait_for_condition(
- lambda mn: mn.find_element(By.ID, "prompt-result").text == "")
+ Wait(self.marionette).until(
+ lambda mn: mn.find_element(By.ID, "prompt-result").text == "",
+ message="Value of element 'prompt-result' is not empty")
def test_prompt_dismiss(self):
self.marionette.find_element(By.ID, "tab-modal-prompt").click()
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
alert.dismiss()
- self.wait_for_condition(
- lambda mn: mn.find_element(By.ID, "prompt-result").text == "null")
+ Wait(self.marionette).until(
+ lambda mn: mn.find_element(By.ID, "prompt-result").text == "null",
+ message="Value of element 'prompt-result' is not null")
def test_alert_opened_before_session_starts(self):
self.marionette.find_element(By.ID, "tab-modal-alert").click()
self.wait_for_alert()
# Restart the session to ensure we still find the formerly left-open dialog.
self.marionette.delete_session()
self.marionette.start_session()
@@ -154,54 +158,60 @@ class TestTabModalAlerts(BaseAlertTestCa
alert.accept()
def test_set_text_accept(self):
self.marionette.find_element(By.ID, "tab-modal-prompt").click()
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
alert.send_keys("Some text!")
alert.accept()
- self.wait_for_condition(
- lambda mn: mn.find_element(By.ID, "prompt-result").text == "Some text!")
+ Wait(self.marionette).until(
+ lambda mn: mn.find_element(By.ID, "prompt-result").text == "Some text!",
+ message="value of element 'prompt-result' is not 'Some text!'")
def test_set_text_dismiss(self):
self.marionette.find_element(By.ID, "tab-modal-prompt").click()
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
alert.send_keys("Some text!")
alert.dismiss()
- self.wait_for_condition(
- lambda mn: mn.find_element(By.ID, "prompt-result").text == "null")
+ Wait(self.marionette).until(
+ lambda mn: mn.find_element(By.ID, "prompt-result").text == "null",
+ message="Value of element 'prompt-result' is not null")
def test_onbeforeunload_dismiss(self):
start_url = self.marionette.get_url()
self.marionette.find_element(By.ID, "onbeforeunload-handler").click()
- self.wait_for_condition(
+ Wait(self.marionette).until(
lambda mn: mn.execute_script("""
return window.onbeforeunload !== null;
- """))
+ """),
+ message="Handler for 'onbeforeunload' has not been set")
self.marionette.navigate("about:blank")
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
self.assertTrue(alert.text.startswith("This page is asking you to confirm"))
alert.dismiss()
self.assertTrue(self.marionette.get_url().startswith(start_url))
def test_onbeforeunload_accept(self):
self.marionette.find_element(By.ID, "onbeforeunload-handler").click()
- self.wait_for_condition(
+ Wait(self.marionette).until(
lambda mn: mn.execute_script("""
return window.onbeforeunload !== null;
- """))
+ """),
+ message="Handler for 'onbeforeunload' has not been set")
self.marionette.navigate("about:blank")
self.wait_for_alert()
alert = self.marionette.switch_to_alert()
self.assertTrue(alert.text.startswith("This page is asking you to confirm"))
alert.accept()
- self.wait_for_condition(lambda mn: mn.get_url() == "about:blank")
+ Wait(self.marionette).until(
+ lambda mn: mn.get_url() == "about:blank",
+ message="The expected page 'about:blank' has not been loaded")
def test_unrelated_command_when_alert_present(self):
self.marionette.find_element(By.ID, "tab-modal-alert").click()
self.wait_for_alert()
with self.assertRaises(errors.UnexpectedAlertOpen):
self.marionette.find_element(By.ID, "click-result")