Merge pull request mozilla-b2g#26849 from viorelaioia/sms_nofification

Bug 1112583 - Add a test to verify that a received call notification is ...

Author: Florin Strugariu

tests/python/gaia-ui-tests/gaiatest/apps/messages/regions/activities.py

@@ -24,6 +24,8 @@ class Activities(Base):
     _add_to_contact_button_locator = (By.XPATH, '//*[text()="Add to an existing contact"]')
     _create_new_contact_button_locator = (By.CSS_SELECTOR, 'button[data-l10n-id="createNewContact"]')
     _forward_message_button_locator = (By.CSS_SELECTOR, 'button[data-l10n-id="forward"]')
+    _delete_message_button_locator = (By.CSS_SELECTOR, 'form[data-type="action"] button[data-l10n-id="delete"]')
+    _confirm_delete_message_locator = (By.CSS_SELECTOR, 'button.danger')
 
     def __init__(self, marionette):
         Base.__init__(self, marionette)
@@ -63,3 +65,14 @@ def tap_forward_message(self):
         self.marionette.find_element(*self._forward_message_button_locator).tap()
         from gaiatest.apps.messages.regions.new_message import NewMessage
         return NewMessage(self.marionette)
+
+    def tap_delete_message(self):
+        delete_message_button = self.marionette.find_element(*self._delete_message_button_locator)
+        Wait(self.marionette).until(expected.element_displayed(delete_message_button))
+        delete_message_button.tap()
+
+    def confirm_delete_message(self):
+        confirm_delete_message = self.marionette.find_element(*self._confirm_delete_message_locator)
+        Wait(self.marionette).until(expected.element_displayed(confirm_delete_message))
+        confirm_delete_message.tap()
+        Wait(self.marionette).until(expected.element_not_displayed(confirm_delete_message))

tests/python/gaia-ui-tests/gaiatest/tests/functional/messages/manifest.ini

@@ -54,3 +54,6 @@ skip-if = device == "desktop"
 [test_sms_auto_save_draft.py]
 # Bug 1103106 - Assertion failure: !mWillChangeBudgetCalculated
 skip-if = device == "desktop" && os == "linux" && debug
+
+[test_sms_notification_removed_when_sms_deleted.py]
+skip-if = device == "desktop"

tests/python/gaia-ui-tests/gaiatest/tests/functional/messages/test_sms_notification_removed_when_sms_deleted.py

@@ -0,0 +1,57 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import time
+try:
+    from marionette.wait import Wait
+except:
+    from marionette_driver import Wait
+from gaiatest import GaiaTestCase
+from gaiatest.apps.messages.app import Messages
+from gaiatest.apps.system.app import System
+
+
+class TestSmsNotificationRemovedWhenSMSDeleted(GaiaTestCase):
+
+    def test_sms_notification_removed_when_sms_deleted(self):
+        """
+        https://moztrap.mozilla.org/manage/case/8778/
+        """
+
+        _text_message_content = "Automated Test %s" % str(time.time())
+
+        # launch messages app
+        messages = Messages(self.marionette)
+        messages.launch()
+
+        # Send a SMS to the device
+        self.data_layer.send_sms(self.testvars['local_phone_numbers'][0], _text_message_content)
+
+        system = System(self.marionette)
+
+        # We will wait upto 300 seconds for the SMS to arrive due to network latency
+        system.wait_for_notification_toaster_displayed(timeout=300,
+                    message="Notification did not appear. SMS database dump: %s " % self.data_layer.get_all_sms())
+        system.wait_for_notification_toaster_not_displayed()
+
+        self.apps.switch_to_displayed_app()
+
+        # Tap on the latest received SMS
+        message_thread = messages.tap_first_received_message()
+        Wait(self.marionette).until(lambda m: len(message_thread.received_messages) > 0)
+        messages_number = len(message_thread.all_messages)
+        last_received_message = message_thread.received_messages[-1]
+
+        # Delete latest received SMS
+        activities = last_received_message.long_press_message()
+        activities.tap_delete_message()
+        activities.confirm_delete_message()
+
+        Wait(self.marionette).until(lambda m: len(message_thread.all_messages) == messages_number - 1)
+
+        self.marionette.switch_to_frame()
+
+        # Check that SMS notification no longer appears in utility tray
+        utility_tray = system.open_utility_tray()
+        self.assertEqual(0, len(utility_tray.notifications))