messaging-app

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

delete_multiple
Merge into trunk

Proposed by Leo Arias on 2014-03-14

Status:	Merged
Approved by:	Tiago Salem Herrmann on 2014-03-14
Approved revision:	83
Merged at revision:	78
Proposed branch:	lp:~elopio/messaging-app/delete_multiple
Merge into:	lp:messaging-app
Diff against target:	374 lines (+147/-58) 5 files modified src/qml/MainPage.qml (+2/-1) src/qml/MessageDelegate.qml (+7/-5) src/qml/Messages.qml (+5/-3) tests/autopilot/messaging_app/emulators.py (+84/-1) tests/autopilot/messaging_app/tests/test_messaging.py (+49/-48)
To merge this branch:	bzr merge lp:~elopio/messaging-app/delete_multiple
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-03-14	Approve on 2014-03-14
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-03-14
Review via email: mp+210983@code.launchpad.net

Commit message

Refactor the test_delete_multiple_messages to make it readable and maintainable.

lp:~elopio/messaging-app/delete_multiple updated on 2014-03-14

77. By Leo Arias on 2014-03-14: Updated two more indexes.
78. By Leo Arias on 2014-03-14: More indexes improvements.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

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

review: Approve (continuous-integration)

lp:~elopio/messaging-app/delete_multiple updated on 2014-03-14

79. By Leo Arias on 2014-03-14: Simplify the test, send only three messages, delete only two.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

FAILED: Continuous integration, rev:78
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3902
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3487/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-trusty-i386-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3935
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3935/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3489
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3489/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5828/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4763

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

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

review: Approve (continuous-integration)

lp:~elopio/messaging-app/delete_multiple updated on 2014-03-14

80. By Leo Arias on 2014-03-14: Refactored the test to make it readable and maintainable.
81. By Leo Arias on 2014-03-14: Updated the copyright years.
82. By Leo Arias on 2014-03-14: Added docstring.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

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

review: Needs Fixing (continuous-integration)

lp:~elopio/messaging-app/delete_multiple updated on 2014-03-14

83. By Leo Arias on 2014-03-14: Prepend.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-03-14:

looks good.
thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Leo Arias

Sam Short

Ubuntu Phablet Team

 === modified file 'src/qml/MainPage.qml'
 --- src/qml/MainPage.qml	2014-02-13 17:28:20 +0000
 +++ src/qml/MainPage.qml	2014-03-14 14:23:02 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2012-2013 Canonical Ltd.
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
+  *
   * This file is part of messaging-app.
+  *
@@ -83,6 +83,7 @@
          listDelegate: ThreadDelegate {
              id: threadDelegate
++            objectName: "thread%1".arg(participants)
              selectionMode: threadList.isInSelectionMode
              selected: threadList.isSelected(threadDelegate)
              removable: !selectionMode
 === modified file 'src/qml/MessageDelegate.qml'
 --- src/qml/MessageDelegate.qml	2014-02-18 21:12:44 +0000
 +++ src/qml/MessageDelegate.qml	2014-03-14 14:23:02 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2012-2013 Canonical Ltd.
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
+  *
   * This file is part of messaging-app.
+  *
@@ -97,7 +97,7 @@
          visible: running && !selectionMode
          // if temporarily failed or unknown status, then show the spinner
--        running: (textMessageStatus == HistoryThreadModel.MessageStatusUnknown ||
++        running: (textMessageStatus == HistoryThreadModel.MessageStatusUnknown ||
                    textMessageStatus == HistoryThreadModel.MessageStatusTemporarilyFailed) && !incoming
+     }
@@ -175,22 +175,24 @@
              Label {
                  id: date
++                objectName: 'messageDate'
                  anchors.top: senderName.bottom
                  height: paintedHeight
                  fontSize: "x-small"
                  color: textColor
                  text: {
--                    if (indicator.visible)
--                        i18n.tr("Sending...")
++                    if (indicator.visible)
++                        i18n.tr("Sending...")
                      else if (warningButton.visible)
                          i18n.tr("Failed")
--                    else
++                    else
                          DateUtils.friendlyDay(timestamp) + " " + Qt.formatDateTime(timestamp, "hh:mm AP")
+                 }
+             }
              Label {
                  id: messageText
++                objectName: 'messageText'
                  anchors.top: date.bottom
                  anchors.topMargin: units.gu(1)
                  anchors.left: parent.left
 === modified file 'src/qml/Messages.qml'
 --- src/qml/Messages.qml	2014-03-05 04:58:13 +0000
 +++ src/qml/Messages.qml	2014-03-14 14:23:02 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2012-2013 Canonical Ltd.
++ * Copyright 2012, 2013, 2014 Canonical Ltd.
+  *
   * This file is part of messaging-app.
+  *
@@ -93,7 +93,7 @@
                      Item {
                          height: childrenRect.height
                          width: popover.width
--                        ListItem.Standard {
++                        ListItem.Standard {
                              id: listItem
                              text: contactWatcher.isUnknown ? contactWatcher.phoneNumber : contactWatcher.alias
+                         }
@@ -375,6 +375,7 @@
      MultipleSelectionListView {
          id: messageList
++        objectName: "messageList"
          clip: true
          acceptAction.text: i18n.tr("Delete")
          anchors {
@@ -396,6 +397,7 @@
          highlightFollowsCurrentItem: false
          listDelegate: MessageDelegate {
              id: messageDelegate
++            objectName: "message%1".arg(index)
              incoming: senderId != "self"
              selected: messageList.isSelected(messageDelegate)
              removable: !messages.selectionMode
@@ -434,7 +436,7 @@
              if (messages.pendingMessage) {
                  messageList.contentY = 0
                  messages.pendingMessage = false
--            }
++            }
+         }
+     }
 === modified file 'tests/autopilot/messaging_app/emulators.py'
 --- tests/autopilot/messaging_app/emulators.py	2014-02-19 19:24:28 +0000
 +++ tests/autopilot/messaging_app/emulators.py	2014-03-14 14:23:02 +0000
@@ -1,5 +1,5 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--# Copyright 2013 Canonical
++# Copyright 2013, 2014 Canonical
+ #
  # This file is part of messaging-app.
+ #
@@ -18,11 +18,15 @@
  import tempfile
  import time
++from autopilot import logging as autopilot_logging
  from autopilot.input import Keyboard
  from autopilot.platform import model
  from ubuntuuitoolkit import emulators as toolkit_emulators
++logger = logging.getLogger(__name__)
++
++
  class EmulatorException(Exception):
          """Exception raised when there is an error with the emulator."""
@@ -394,3 +398,82 @@
          script_proxy.SetPath(script_dir)
          script_proxy.Run("sms.js")
          shutil.rmtree(script_dir)
++
++
++class MainPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
++    """Autopilot helper for the Main Page."""
++
++    def get_thread_count(self):
++        """Return the number of message threads."""
++        return self.select_single(
++            'MultipleSelectionListView', objectName='threadList').count
++
++    @autopilot_logging.log_action(logger.info)
++    def open_thread(self, participants):
++        thread = self.select_single(
++            'ThreadDelegate', objectName='thread{}'.format(participants))
++        self.pointing_device.click_object(thread)
++        return self.get_root_instance().wait_select_single(Messages)
++
++
++class Messages(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
++    """Autopilot helper for the Messages Page."""
++
++    def get_messages_count(self):
++        """Return the number of meesages."""
++        return self.select_single(
++            'MultipleSelectionListView', objectName='messageList').count
++
++    @autopilot_logging.log_action(logger.info)
++    def select_messages(self, *indexes):
++        """Select messages.
++
++        :param indexes: The indexes of the messages to select. The most
++            recently received message has the 0 index, and the oldest message
++            has the higher index.
++
++        """
++        first_message_delegate = self._get_message_delegate(indexes[0])
++        self._long_press(first_message_delegate)
++        for index in indexes[1:]:
++            message_delegate = self._get_message_delegate(index)
++            self.pointing_device.click_object(message_delegate)
++
++    def _get_message_delegate(self, index):
++        return self.wait_select_single(
++            'MessageDelegate', objectName='message{}'.format(index))
++
++    def _long_press(self, object_):
++        if model() == 'Desktop':
++            self.pointing_device.click_object(object_, press_duration=3)
++        else:
++            # Work around for http://pad.lv/1268782
++            self.pointing_device.move_to_object(object_)
++            self.pointing_device.press()
++            time.sleep(3)
++            self.pointing_device.release()
++
++    @autopilot_logging.log_action(logger.info)
++    def delete(self):
++        """Delete the selected messages."""
++        button = self.select_single(
++            'Button', objectName='DialogButtons.acceptButton')
++        self.pointing_device.click_object(button)
++
++    def get_messages(self):
++        """Return a list with the information of the messages.
++
++        Each item of the returned list is a tuple of (date, text).
++
++        """
++        messages = []
++        # TODO return the messages in the same order that they are displayed.
++        # --elopio - 2014-03-14
++        for index in range(self.get_messages_count()):
++            message_delegate = self._get_message_delegate(index)
++            date = message_delegate.select_single(
++                'Label', objectName='messageDate').text
++            text = message_delegate.select_single(
++                'Label', objectName='messageText').text
++            messages.append((date, text))
++        return messages
 === modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
 --- tests/autopilot/messaging_app/tests/test_messaging.py	2014-02-19 19:24:28 +0000
 +++ tests/autopilot/messaging_app/tests/test_messaging.py	2014-03-14 14:23:02 +0000
@@ -1,5 +1,5 @@
  # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
--# Copyright 2012 Canonical
++# Copyright 2012, 2014 Canonical
+ #
  # This file is part of messaging-app.
+ #
@@ -15,18 +15,17 @@
  import subprocess
  import time
--from autopilot.introspection import dbus
  from autopilot.matchers import Eventually
--from testtools.matchers import Equals
++from testtools.matchers import Equals, HasLength
  from testtools import skipIf
++from messaging_app import emulators
  from messaging_app.tests import MessagingAppTestCase
  @skipIf(os.uname()[2].endswith('maguro'),
          'tests cause Unity crashes on maguro')
--class TestMessaging(MessagingAppTestCase):
--    """Tests for the communication panel."""
++class BaseMessagingTestCase(MessagingAppTestCase):
      def setUp(self):
@@ -50,7 +49,7 @@
          subprocess.call(['pkill', 'history-daemon'])
          subprocess.call(['pkill', '-f', 'telephony-service-handler'])
--        super(TestMessaging, self).setUp()
++        super(BaseMessagingTestCase, self).setUp()
          # no initial messages
          self.thread_list = self.app.select_single(objectName='threadList')
@@ -58,7 +57,7 @@
          self.assertThat(self.thread_list.count, Equals(0))
      def tearDown(self):
--        super(TestMessaging, self).tearDown()
++        super(BaseMessagingTestCase, self).tearDown()
          # restore history
          try:
@@ -74,6 +73,10 @@
          # received"), don't make that stay around for the tests
          subprocess.call(['pkill', '-f', 'notify-osd'])
++
++class TestMessaging(BaseMessagingTestCase):
++    """Tests for the communication panel."""
++
      def test_write_new_message_to_group(self):
          recipient_list = ["123", "321"]
          self.main_view.click_new_message_button()
@@ -221,47 +224,6 @@
          self.main_view.get_message('{} 2'.format(message))
          self.main_view.get_message(message)
--    def test_delete_multiple_messages(self):
--        """Verify we can delete multiple messages"""
--        number = '5555559876'
--        message = 'delete me'
--        # send 5 messages
--        for num in range(1, 6):
--            self.main_view.receive_sms(number, '{} {}'.format(message, num))
--            time.sleep(1)
--        # verify messages show up in thread
--        self.assertThat(self.thread_list.count, Eventually(Equals(1)))
--
--        mess_thread = self.thread_list.wait_select_single('Label', text=number)
--        self.pointing_device.click_object(mess_thread)
--
--        # long press on message 5
--        bubble5 = self.main_view.get_label('delete me 5')
--        self.main_view.long_press(bubble5)
--
--        # tap message 2 - 4
--        for num in range(2, 5):
--            bubble = self.main_view.get_label(
--                '{} {}'.format(message, num)
--            )
--            self.pointing_device.click_object(bubble)
--
--        # delete messages 2 - 5
--        self.main_view.click_delete_dialog_button()
--
--        #verify message 2 - 5 are destroyed
--        for num in range(2, 6):
--            try:
--                bubble = self.main_view.get_label(
--                    '{} {}'.format(message, num)
--                )
--                bubble.wait_until_destroyed()
--            ## if the message is not there it was already destroyed
--            except dbus.StateNotFoundError:
--                pass
--        #verify message bubble 1 exists
--        self.main_view.get_label('delete me 1')
--
      def test_toolbar_delete_message(self):
          """Verify we can use the toolbar to delete a message"""
          self.main_view.click_new_message_button()
@@ -507,3 +469,42 @@
          #delete message
          self.main_view.delete_message(message, direction='left')
          self.assertThat(list_view.count, Eventually(Equals(0)))
++
++
++class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):
++
++    def setUp(self):
++        super(MessagingTestCaseWithExistingThread, self).setUp()
++        self.main_page = self.main_view.select_single(emulators.MainPage)
++        self.number = '5555559876'
++        self.messages = self.receive_messages()
++
++    def receive_messages(self):
++        # send 3 messages. Reversed because on the QML, the one with the
++        # 0 index is the latest received.
++        messages = []
++        message_indexes = list(reversed(range(3)))
++        for index in message_indexes:
++            message_text = 'test message {}'.format(index)
++            self.main_view.receive_sms(
++                self.number, message_text)
++            time.sleep(1)
++            # Prepend to make sure that the indexes match.
++            messages.insert(0, message_text)
++        # Wait for the thread.
++        self.assertThat(
++            self.main_page.get_thread_count, Eventually(Equals(1)))
++        return messages
++
++    def test_delete_multiple_messages(self):
++        """Verify we can delete multiple messages"""
++        messages_page = self.main_page.open_thread(self.number)
++
++        messages_page.select_messages(1, 2)
++        messages_page.delete()
++
++        remaining_messages = messages_page.get_messages()
++        self.assertThat(remaining_messages, HasLength(1))
++        _, remaining_message_text = remaining_messages[0]
++        self.assertEqual(
++            remaining_message_text, self.messages[0])

messaging-app

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

Commit message

Description of the change

Preview Diff

Subscribers