Merge lp:~elopio/messaging-app/swipe_to_delete into lp:messaging-app

[Leo Arias]

Removed the tests that swipe to the left. Updated the tests to use the swipe_to_delete helper from the toolkit.

The new version of ubuntu ui toolkit that's ready in a silo to land removed the swipe to delete from left to right. We need to update the test.

Are there any related MPs required for this MP to build/function as expected? Please list.

No. But there's a branch in progress that will throw a nice exception if we try to do the swipe to the left on the tests: https://code.launchpad.net/~elopio/ubuntu-ui-toolkit/deprecate_swipe_to_left/+merge/223008

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

Yes.

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

Yes. I ran the tests with the new toolkit.

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?

Just the autopilot tests of the messaging app, in the phone and in utopic desktop. No other things will be affected by this change.

If you changed the UI, was the change specified/approved by design?

No UI changes.

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

No packaging changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/223/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/869
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/791/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1596
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1596/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8430
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/701/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/931
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/931/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/223/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/225/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/898
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/816/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1641
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1641/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8476
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/956
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/956/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/225/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/messaging-app/swipe_to_delete]

116. By Leo Arias on 2014-06-17

Merged with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/227/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/923
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/839/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/21
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1673
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8504
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/734/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/979
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/979/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/227/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/messaging-app/swipe_to_delete]

117. By Leo Arias on 2014-06-17

Merged with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/230/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/962
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/869/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8544
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/753/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1009
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1009/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/230/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but the failure is not related to the changes in this MR.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and tests work fine on the device.

review: Approve

=== modified file 'tests/autopilot/messaging_app/emulators.py'
--- tests/autopilot/messaging_app/emulators.py	2014-06-10 19:19:10 +0000
+++ tests/autopilot/messaging_app/emulators.py	2014-06-17 17:53:30 +0000
@@ -46,7 +46,7 @@
         :parameter phone_number: the phone_number of message thread
 
         """
-        return self.wait_select_single("ThreadDelegate",
+        return self.wait_select_single(ThreadDelegate,
                                        phoneNumber=phone_number)
 
     def get_message(self, text):
@@ -57,7 +57,7 @@
         """
 
         time.sleep(2)  # message is not always found on slow emulator
-        for message in self.select_many('MessageDelegate'):
+        for message in self.select_many(MessageDelegate):
             for item in self.select_many('Label'):
                 if "text" in item.get_properties():
                     if item.get_properties()['text'] == text:
@@ -329,68 +329,26 @@
         """Click the header action 'Cancel' on Messages view"""
         self.get_header().click_custom_back_button()
 
-    def delete_thread(self, phone_number, direction='right'):
-        """Delete thread containing specified phone number
+    def delete_thread(self, phone_number):
+        """Delete thread containing specified phone number.
 
         :parameter phone_number: phone number of thread to delete
         :parameter direction: right or left, the direction to swipe to delete
         """
-
         thread = self.get_thread_from_number(phone_number)
-        delete = self.swipe_to_delete(thread, direction=direction)
-        delete_button = delete.wait_select_single('QQuickImage', visible=True)
-        self.pointing_device.click_object(delete_button)
-        thread.wait_until_destroyed()
-
-    def delete_message(self, text, direction='right'):
-        """Deletes message with specified text
-
-        :parameter text: the text of the message you want to delete
-        :parameter direction: right or left, the direction to swipe to delete
+        thread.swipe_to_delete()
+        thread.confirm_removal()
+
+    def delete_message(self, text):
+        """Deletes message with specified text.
+
+        :parameter text: the text of the message you want to delete.
+        :parameter direction: right or left, the direction to swipe to delete.
+
         """
-
         message = self.get_message(text)
-        delete = self.swipe_to_delete(message, direction=direction)
-        delete_button = delete.wait_select_single('QQuickImage', visible=True)
-        self.pointing_device.click_object(delete_button)
-        message.wait_until_destroyed()
-
-    def swipe_to_delete(self, obj, direction='right', offset=.1):
-        """Swipe and objet left or right
-
-        :parameter direction: right or left, the direction to swipe
-        :parameter offset: the ammount of space to offset at start of swipe
-        """
-
-        x, y, w, h = obj.globalRect
-
-        s_rx = x + (w * offset)
-        e_rx = w
-
-        s_lx = w - (w * offset)
-        e_lx = w * offset
-
-        sy = y + (h / 2)
-
-        if (direction == 'right'):
-            self.pointing_device.drag(s_rx, sy, e_rx, sy)
-            # wait for animation
-            time.sleep(.5)
-            return self.wait_select_single('QQuickItem',
-                                           objectName='confirmRemovalDialog',
-                                           visible=True)
-        elif (direction == 'left'):
-            self.pointing_device.drag(s_lx, sy, e_lx, sy)
-            # wait for animation
-            time.sleep(.5)
-            return self.wait_select_single('QQuickItem',
-                                           objectName='confirmRemovalDialog',
-                                           visible=True)
-        else:
-            raise EmulatorException(
-                'Invalid direction "{0}" used on swipe to delete function '
-                'direction can be right or left'.format(direction)
-            )
+        message.swipe_to_delete()
+        message.confirm_removal()
 
 
 class PageWithBottomEdge(MainView):
@@ -429,7 +387,7 @@
     @autopilot_logging.log_action(logger.info)
     def open_thread(self, participants):
         thread = self.select_single(
-            'ThreadDelegate', objectName='thread{}'.format(participants))
+            ThreadDelegate, objectName='thread{}'.format(participants))
         self.pointing_device.click_object(thread)
         root = self.get_root_instance()
         return root.wait_select_single(Messages, threadId=thread.threadId)
@@ -489,3 +447,20 @@
                 'Label', objectName='messageText').text
             messages.append((date, text))
         return messages
+
+
+class ThreadDelegate(toolkit_emulators.Empty):
+    """Autopilot helper for ThreadDelegate."""
+
+
+class MessageDelegate(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    """Autopilot helper for the MessageDelegate."""
+
+    def swipe_to_delete(self):
+        self._get_internal_list_item().swipe_to_delete()
+
+    def _get_internal_list_item(self):
+        return self.select_single(toolkit_emulators.Empty)
+
+    def confirm_removal(self):
+        self._get_internal_list_item().confirm_removal()

=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
--- tests/autopilot/messaging_app/tests/test_messaging.py	2014-06-06 21:32:41 +0000
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2014-06-17 17:53:30 +0000
@@ -452,42 +452,6 @@
         self.main_view.delete_message(message)
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
-    def test_delete_message_thread_swipe_left(self):
-        """Verify we can delete a message thread by swiping left"""
-        # receive an sms message
-        helpers.receive_sms('0815', 'hello to Ubuntu')
-
-        # verify that we got the message
-        self.assertThat(self.thread_list.count, Eventually(Equals(1)))
-
-        # delete thread by swiping
-        self.main_view.delete_thread('0815', direction='right')
-        self.assertThat(self.thread_list.count, Eventually(Equals(0)))
-
-    def test_delete_message_swipe_left(self):
-        """Verify we can delete a message by swiping left"""
-        self.main_view.start_new_message()
-        self.assertThat(self.thread_list.visible, Eventually(Equals(False)))
-
-        # type address number
-        phone_num = '555-555-4321'
-        self.main_view.type_contact_phone_num(phone_num)
-        # type message
-        message = 'delete me okay'
-        self.main_view.type_message(message)
-
-        # send
-        self.main_view.click_send_button()
-
-        # verify that we get a bubble with our message
-        list_view = self.main_view.get_multiple_selection_list_view()
-        self.assertThat(list_view.count, Eventually(Equals(1)))
-        self.main_view.get_message(message)
-
-        #delete message
-        self.main_view.delete_message(message, direction='left')
-        self.assertThat(list_view.count, Eventually(Equals(0)))
-
 
 class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):