@@ -40,12 +40,14 @@ class AlertTest(TestCommon, unittest.TestCase): Tests to see if an accessible with an 'alert' role is in the document''' base_url = "http://codetalks.org/" path = "/source/widgets/alert/alert.html" + _failed_asserts = [] - def _wait_for_alert_show(self, focus): + + def _wait_for_alert_show(self, subtest ,focus): events = [ '<event type="object-add">' '<source><accessible role="alert"/>' - '</source></event>', + '</source></event>', '<event type="system-alert">' '<source><accessible role="alert"/>' '</source></event>'] @@ -56,57 +58,94 @@ class AlertTest(TestCommon, unittest.TestCase): '</source></event>') got_events = self.selenium.wait_accessible_events(events) - self.failUnless(len(got_events) == len(events), - 'Expected:\n%s\nGot:\n%s\n' % ('\n'.join(events), - '\n'.join(got_events))) + try: + self.failUnless(len(got_events) == len(events), + 'Did not get the right events for "%s"\n' + 'Expected:\n%s\nGot:\n%s\n' % (subtest, + '\n'.join(events), + '\n'.join(got_events))) + except AssertionError, e: + self._failed_asserts.append(e) - def _assert_no_alert_showing(self): - self.assertEqual( - self.selenium.get_accessible_match( - '<accessible role="alert" state="regexp:^((?!invisible).)*$" />'), '') + def _assert_no_alert_showing(self, subtest): + try: + self.assertEqual( + self.selenium.get_accessible_match( + '<accessible role="alert" state="regexp:.*focusable.*" />'), + '', 'Found unexpected focusable "alert" accessible in "%s" test' % subtest) + except AssertionError, e: + self._failed_asserts.append(e) - def _assert_alert_showing(self): - self.assertNotEqual( - self.selenium.get_accessible_match( - '<accessible role="alert" state="regexp:^((?!invisible).)*$" />'), '') + def _assert_alert_showing(self, subtest): + try: + self.assertNotEqual( + self.selenium.get_accessible_match( + '<accessible role="alert" state="regexp:.*focusable.*" />'), + '', + 'Failed to find focusable "alert" accessible in "%s" test' % subtest) + except AssertionError, e: + self._failed_asserts.append(e) def runTest(self): sel = self.selenium - self._assert_no_alert_showing() + self._assert_no_alert_showing('') + + # Create and Focus + subtest = 'Create and Focus' sel.click("//button[@onclick='createRemoveAlert(FOCUS_TEXT, true);']") - self._wait_for_alert_show(True) - self._assert_alert_showing() + self._wait_for_alert_show(subtest, True) + self._assert_alert_showing(subtest) sel.click("//a[@onclick='createRemoveAlert();']") - self._assert_no_alert_showing() + self._assert_no_alert_showing(subtest) + + # Create - no Focus + subtest = 'Create - no Focus' sel.click("//button[@onclick='createRemoveAlert(NOFOCUS_TEXT, false);']") - self._wait_for_alert_show(False) - self._assert_alert_showing() + self._wait_for_alert_show(subtest, False) + self._assert_alert_showing(subtest) sel.click("//a[@onclick='createRemoveAlert();']") - self._assert_no_alert_showing() + self._assert_no_alert_showing(subtest) + + # Show (via visibility style) and Focus + subtest = 'Show (via visibility style) and Focus' sel.click("//button[@onclick=\"toggleAlert('alertVis', true);\"]") -# self._wait_for_alert_show(True) - self._assert_alert_showing() - a = sel.get_accessible_doc() + self._wait_for_alert_show(subtest, True) + self._assert_alert_showing(subtest) sel.click("link=close") - self._assert_no_alert_showing() + self._assert_no_alert_showing(subtest) + + + # Show (via visibility style) - no Focus + subtest = 'Show (via visibility style) - no Focus' sel.click("//button[@onclick=\"toggleAlert('alertVis');\"]") - self._wait_for_alert_show(False) - self._assert_alert_showing() + self._wait_for_alert_show(subtest, False) + self._assert_alert_showing(subtest) sel.click("link=close") - self._assert_no_alert_showing() + self._assert_no_alert_showing(subtest) + + # Show (via display style) and Focus + subtest = 'Show (via display style) and Focus' sel.click("//button[@onclick=\"toggleAlert('alertDisp', true);\"]") -# self._wait_for_alert_show(True) - self._assert_alert_showing() + self._wait_for_alert_show(subtest, True) + self._assert_alert_showing(subtest) sel.click("//div[@id='alertDisp']/div/a") - self._assert_no_alert_showing() + self._assert_no_alert_showing(subtest) + + # Show (via display style) - no Focus + subtest = 'Show (via display style) - no Focus' sel.click("//button[@onclick=\"toggleAlert('alertDisp');\"]") - self._wait_for_alert_show(False) - self._assert_alert_showing() + self._wait_for_alert_show(subtest, False) + self._assert_alert_showing(subtest) sel.click("//div[@id='alertDisp']/div/a") - self._assert_no_alert_showing() - #self.failUnless(result) + self._assert_no_alert_showing(subtest) + + # Fail if we had any assertion failures. + self.failUnless( + self._failed_asserts == [], + 'Failed assertions:\n%s' \ + % '\n'.join(map(str, self._failed_asserts))) #if __name__ == "__main__": # unittest.main() tests/alert_test.py ec4552589c29331aa5d3449dce754fc24631ca54 Eitan Isaacson eitan@ascender.com http://github.com/eeejay/specular/commit/16bc857fb79a5e003b5198b26d9a91f749c28ea5 16bc857fb79a5e003b5198b26d9a91f749c28ea5 2008-10-16T13:03:32-07:00 2008-10-16T13:03:32-07:00 Yet another refactor. Carry out the test and show all failed assertions at the end. 9b21028801c6702ffe9fc460467aa8ce05bdac4c Eitan Isaacson eitan@ascender.com