messaging-app

Merge lp:~om26er/messaging-app/use_fixture into lp:messaging-app

use_fixture
Merge into trunk

Proposed by Omer Akram on 2014-07-02

Status:

Merged

Approved by:

Gustavo Pichorim Boiko on 2014-07-15

Approved revision:

140

Merged at revision:

140

Proposed branch:

lp:~om26er/messaging-app/use_fixture

Merge into:

lp:messaging-app

Diff against target:

489 lines (+137/-188)

4 files modified

tests/autopilot/messaging_app/emulators.py (+20/-0)
tests/autopilot/messaging_app/fixture_setup.py (+89/-0)
tests/autopilot/messaging_app/helpers.py (+2/-1)
tests/autopilot/messaging_app/tests/test_messaging.py (+26/-187)

To merge this branch:

bzr merge lp:~om26er/messaging-app/use_fixture

Undecided

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2014-07-02	Approve on 2014-07-15
Brendan Donegan (community)			Approve on 2014-07-11
Leo Arias (community)	code review		Approve on 2014-07-11
PS Jenkins bot	continuous-integration		Approve on 2014-07-11
Review via email: mp+225350@code.launchpad.net

Commit message

pull out the functions in setUp() and tearDown() into a fixture, to be consumed by other projects, wrote send_message helper.

Description of the change

pull out the functions in setUp() and tearDown() into a fixture, to be consumed by other projects. Also created a reusable helper to send a message.

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

None.

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?

Not needed.

Did you successfully run all tests found in your component's Test Plan on device or emulator?

tests are passing

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

None

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

None

lp:~om26er/messaging-app/use_fixture updated on 2014-07-02

125. By Omer Akram on 2014-07-02: fix style

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

FAILED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/254/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1277/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2453/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1425/console

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

review: Needs Fixing (continuous-integration)

lp:~om26er/messaging-app/use_fixture updated on 2014-07-02

126. By Omer Akram on 2014-07-02: fix pep8 failure

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

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

review: Needs Fixing (continuous-integration)

lp:~om26er/messaging-app/use_fixture updated on 2014-07-07

127. By Omer Akram on 2014-07-07: small stuff

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~om26er/messaging-app/use_fixture updated on 2014-07-08

128. By Omer Akram on 2014-07-08: autopilot: port to python3
129. By Omer Akram on 2014-07-08: revert last commit, seems someone else already ported it in a different MR

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-08:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-08:

+class MessagingFixture(fixtures.Fixture):

This needs a more meaningful name. Probably it would be better to split the fixture in one to backup the history, one to use phonesym, and one to reset the services.
Then combine them in one that could be called MessagingTestEnvironment.

review: Needs Fixing (code review)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-08:

Also, try to add the clean up one line before calling the set up. That will make sure that the clean up is run even if the set up fails in the middle. For that, you will have to make sure also that the clean up doesn't fail if the set up as not completed.

lp:~om26er/messaging-app/use_fixture updated on 2014-07-10

130. By Omer Akram on 2014-07-10: split fixture into subclasses

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10:

FAILED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/274/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1816/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1529/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2900/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1716/console

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

review: Needs Fixing (continuous-integration)

lp:~om26er/messaging-app/use_fixture updated on 2014-07-10

131. By Omer Akram on 2014-07-10: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10:

FAILED: Continuous integration, rev:131
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/275/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1817/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1530/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2902/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1717/console

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

review: Needs Fixing (continuous-integration)

lp:~om26er/messaging-app/use_fixture updated on 2014-07-10

132. By Omer Akram on 2014-07-10: make flake8 happy
133. By Omer Akram on 2014-07-10: add helper to send a message
134. By Omer Akram on 2014-07-10: use newly written send_message and delete all the duplicate code
135. By Omer Akram on 2014-07-10: move _is_phonesim_running to the right class
136. By Omer Akram on 2014-07-10: fix merge conflict revert
137. By Omer Akram on 2014-07-10: wtf vim

Revision history for this message

Omer Akram (om26er) wrote on 2014-07-10:

> +class MessagingFixture(fixtures.Fixture):
>
> This needs a more meaningful name. Probably it would be better to split the
> fixture in one to backup the history, one to use phonesym, and one to reset
> the services.
> Then combine them in one that could be called MessagingTestEnvironment.

Ok, I split this fixture into multiple fixtures and incorporated that into one.

Revision history for this message

Omer Akram (om26er) wrote on 2014-07-10:

Leo: Also note the send_message method was added after your review comment on my UX test branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Leo Arias (elopio) wrote on 2014-07-11:

Awesome! Thank you Omer.

21 + self.get_multiple_selection_list_view().count.wait_for(1)

In here, please call the count before the message is sent, like

original_number_of_messages = self.get_multiple_selection_list_view().count
[...]
self.get_multiple_selection_list_view().count.wait_for(original_number_of_messages + 1)

That way it works even if you want to send more than one message.

43 +import fixtures
44 +import subprocess
45 +import os

These needs to be sorted alphabetically, and following the pep8 rule that first we have the list of internal python modules:

import os
import subprocess

import fixtures

The rest is just so cool. You removed the duplication and put it in a reusable component. Nice work.

review: Needs Fixing (code review)

lp:~om26er/messaging-app/use_fixture updated on 2014-07-11

138. By Omer Akram on 2014-07-11: fix send_message per suggestions
139. By Omer Akram on 2014-07-11: change import order
140. By Omer Akram on 2014-07-11: fix for py3

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

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

review: Approve (continuous-integration)

Revision history for this message

Omer Akram (om26er) wrote on 2014-07-11:

> Awesome! Thank you Omer.
>
> 21 + self.get_multiple_selection_list_view().count.wait_for(1)
>
> In here, please call the count before the message is sent, like
>
> original_number_of_messages = self.get_multiple_selection_list_view().count
> [...]
> self.get_multiple_selection_list_view().count.wait_for(original_number_of_mess
> ages + 1)
>
> That way it works even if you want to send more than one message.
>
> 43 +import fixtures
> 44 +import subprocess
> 45 +import os
>
> These needs to be sorted alphabetically, and following the pep8 rule that
> first we have the list of internal python modules:
>
> import os
> import subprocess
>
> import fixtures
>
> The rest is just so cool. You removed the duplication and put it in a reusable
> component. Nice work.

DONE!

Revision history for this message

Leo Arias (elopio) on 2014-07-11:

review: Approve (code review)

Revision history for this message

Brendan Donegan (brendan-donegan) wrote on 2014-07-11:

review: Approve

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-07-15:

The code looks good. Can you please just do the MP submission checklist before it gets the final approval?
https://wiki.ubuntu.com/Process/Merges/Checklists/system-apps

Revision history for this message

Omer Akram (om26er) wrote on 2014-07-15:

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

None.

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?

Not needed.

Did you successfully run all tests found in your component's Test Plan on device or emulator?

tests are passing

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

None

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

None

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-07-15:

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.
Yes

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

Code looks good and works as expected!

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:

Omer Akram

Sam Short

Ubuntu Phablet Team

 === modified file 'tests/autopilot/messaging_app/emulators.py'
 --- tests/autopilot/messaging_app/emulators.py	2014-07-08 08:35:32 +0000
 +++ tests/autopilot/messaging_app/emulators.py	2014-07-11 10:28:53 +0000
@@ -368,6 +368,26 @@
          message.swipe_to_delete()
          message.confirm_removal()
++    @autopilot_logging.log_action(logger.info)
++    def send_message(self, number, message):
++        """Write a new message and send it.
++
++        :param number: number of the contact to send message to.
++        :param message: the message to be sent.
++
++        """
++        self.start_new_message()
++        self.type_contact_phone_num(number)
++        self.type_message(message)
++        old_message_count = self.get_multiple_selection_list_view().count
++        self.click_send_button()
++
++        self.get_multiple_selection_list_view().count.wait_for(
++            old_message_count + 1)
++        thread_bubble = self.get_message(message)
++
++        return thread_bubble
++
  class PageWithBottomEdge(MainView):
      """An emulator class that makes it easy to interact with the bottom edge
 === added file 'tests/autopilot/messaging_app/fixture_setup.py'
 --- tests/autopilot/messaging_app/fixture_setup.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/messaging_app/fixture_setup.py	2014-07-11 10:28:53 +0000
@@ -0,0 +1,89 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++# Copyright 2014 Canonical
++#
++# This file is part of messaging-app.
++#
++# messaging-app is free software: you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 3, as published
++# by the Free Software Foundation.
++
++import os
++import subprocess
++
++import fixtures
++
++
++class MessagingTestEnvironment(fixtures.Fixture):
++
++    def setUp(self):
++        super(MessagingTestEnvironment, self).setUp()
++        self.useFixture(OfonoPhoneSIM())
++        self.useFixture(BackupHistory())
++        self.useFixture(RespawnService())
++
++
++class BackupHistory(fixtures.Fixture):
++
++    def setUp(self):
++        super(BackupHistory, self).setUp()
++        self.addCleanup(self._restore_history)
++        self._backup_history()
++
++    def _backup_history(self):
++        self.history = os.path.expanduser(
++            '~/.local/share/history-service/history.sqlite')
++        if os.path.exists(self.history):
++            os.rename(self.history, self.history + '.orig')
++
++    def _restore_history(self):
++        try:
++            os.unlink(self.history)
++        except OSError:
++            pass
++        if os.path.exists(self.history + '.orig'):
++            os.rename(self.history + '.orig', self.history)
++
++
++class RespawnService(fixtures.Fixture):
++
++    def setUp(self):
++        super(RespawnService, self).setUp()
++        self.addCleanup(self._kill_services_to_respawn)
++        self._kill_services_to_respawn()
++
++    def _kill_services_to_respawn(self):
++        subprocess.call(['pkill', 'history-daemon'])
++        subprocess.call(['pkill', '-f', 'telephony-service-handler'])
++
++
++class OfonoPhoneSIM(fixtures.Fixture):
++
++    def setUp(self):
++        super(OfonoPhoneSIM, self).setUp()
++        if not self._is_phonesim_running():
++            raise RuntimeError('ofono-phonesim is not setup')
++        self.addCleanup(self._restore_sim_connection)
++        self._set_modem_on_phonesim()
++
++    def _is_phonesim_running(self):
++        try:
++            out = subprocess.check_output(
++                ['/usr/share/ofono/scripts/list-modems'],
++                stderr=subprocess.PIPE,
++                universal_newlines=True
++            )
++            return out.startswith('[ /phonesim ]')
++        except subprocess.CalledProcessError:
++            return False
++
++    def _set_modem_on_phonesim(self):
++        subprocess.call(
++            ['mc-tool', 'update', 'ofono/ofono/account0',
++             'string:modem-objpath=/phonesim'])
++        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
++
++    def _restore_sim_connection(self):
++        subprocess.call(
++            ['mc-tool', 'update', 'ofono/ofono/account0',
++             'string:modem-objpath=/ril_0'])
++        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
 === modified file 'tests/autopilot/messaging_app/helpers.py'
 --- tests/autopilot/messaging_app/helpers.py	2014-07-08 23:12:48 +0000
 +++ tests/autopilot/messaging_app/helpers.py	2014-07-11 10:28:53 +0000
@@ -14,6 +14,7 @@
  import subprocess
  import sys
  import time
++
  from dbus import exceptions
@@ -100,7 +101,7 @@
      mc_tool = subprocess.Popen(
+         [
              'mc-tool',
--            'list',
++            'list'
          ], stdout=subprocess.PIPE, universal_newlines=True)
      mc_accounts = mc_tool.communicate()[0]
      return 'ofono/ofono/account' in mc_accounts
 === modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
 --- tests/autopilot/messaging_app/tests/test_messaging.py	2014-06-30 08:42:16 +0000
 +++ tests/autopilot/messaging_app/tests/test_messaging.py	2014-07-11 10:28:53 +0000
@@ -11,50 +11,25 @@
  from __future__ import absolute_import
--import os
  import subprocess
  import time
  from autopilot.matchers import Eventually
  from testtools.matchers import Equals, HasLength
--from testtools import skipIf, skip
++from testtools import skip
  from messaging_app import emulators
++from messaging_app import fixture_setup
  from messaging_app import helpers
  from messaging_app.tests import MessagingAppTestCase
--@skipIf(os.uname()[2].endswith('maguro'),
--        'tests cause Unity crashes on maguro')
  class BaseMessagingTestCase(MessagingAppTestCase):
      def setUp(self):
--        # determine whether we are running with phonesim
--        try:
--            out = subprocess.check_output(
--                ['/usr/share/ofono/scripts/list-modems'],
--                stderr=subprocess.PIPE,
--                universal_newlines=True
--            )
--            have_phonesim = out.startswith('[ /phonesim ]')
--        except subprocess.CalledProcessError:
--            have_phonesim = False
--
--        self.assertTrue(have_phonesim)
--
--        # provide clean history
--        self.history = os.path.expanduser(
--            '~/.local/share/history-service/history.sqlite')
--        if os.path.exists(self.history):
--            os.rename(self.history, self.history + '.orig')
--        subprocess.call(['pkill', 'history-daemon'])
--        subprocess.call(['pkill', '-f', 'telephony-service-handler'])
--
--        # make sure the modem is running on phonesim
--        subprocess.call(
--            ['mc-tool', 'update', 'ofono/ofono/account0',
--             'string:modem-objpath=/phonesim'])
--        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
++
++        test_setup = fixture_setup.MessagingTestEnvironment()
++        self.useFixture(test_setup)
          super(BaseMessagingTestCase, self).setUp()
@@ -66,22 +41,6 @@
      def tearDown(self):
          super(BaseMessagingTestCase, self).tearDown()
--        # restore history
--        try:
--            os.unlink(self.history)
--        except OSError:
--            pass
--        if os.path.exists(self.history + '.orig'):
--            os.rename(self.history + '.orig', self.history)
--        subprocess.call(['pkill', 'history-daemon'])
--        subprocess.call(['pkill', '-f', 'telephony-service-handler'])
--
--        # restore the original connection
--        subprocess.call(
--            ['mc-tool', 'update', 'ofono/ofono/account0',
--             'string:modem-objpath=/ril_0'])
--        subprocess.call(['mc-tool', 'reconnect', 'ofono/ofono/account0'])
--
          # on desktop, notify-osd may generate persistent popups (like for "SMS
          # received"), don't make that stay around for the tests
          subprocess.call(['pkill', '-f', 'notify-osd'])
@@ -122,26 +81,9 @@
      def test_write_new_message(self):
          """Verify we can write and send a new text message"""
--        self.main_view.start_new_message()
--        # verify the thread list page is not visible
--        self.assertThat(self.thread_list.visible, Eventually(Equals(False)))
--
--        # type contact/number
--        phone_num = 123
--        self.main_view.type_contact_phone_num(phone_num)
--
--        # type message
++        phone_num = '123'
          message = 'hello from Ubuntu'
--        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)))
--        # verify label text
--        self.main_view.get_message('hello from Ubuntu')
++        self.main_view.send_message(phone_num, message)
          # switch back to main page with thread list
          self.main_view.close_osk()
@@ -155,30 +97,16 @@
          self.assertThat(self.thread_list.count, Equals(1))
          # verify our number
          thread = self.main_view.get_thread_from_number(phone_num)
--        self.assertThat(thread.phoneNumber, Equals('123'))
++        self.assertThat(thread.phoneNumber, Equals(phone_num))
          # verify our text
--        thread.wait_select_single('Label', text='hello from Ubuntu')
++        thread.wait_select_single('Label', text=message)
      @skip("long press is currently invoking a context menu")
      def test_deleting_message_long_press(self):
          """Verify we can delete a message with a long press on the message"""
--        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'
--        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)))
--        bubble = self.main_view.get_message(message)
++        bubble = self.main_view.send_message(phone_num, message)
          self.main_view.close_osk()
@@ -194,24 +122,9 @@
      @skip("long press is currently invoking a context menu")
      def test_cancel_deleting_message_long_press(self):
          """Verify we can cancel deleting a message with a long press"""
--        self.main_view.start__new_message_button()
--        self.assertThat(self.thread_list.visible, Eventually(Equals(False)))
--
--        # type address number
          phone_num = '5555551234'
--        self.main_view.type_contact_phone_num(phone_num)
--
--        # type message
          message = 'do not delete'
--        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)))
--        bubble = self.main_view.get_message(message)
++        bubble = self.main_view.send_message(phone_num, message)
          self.main_view.close_osk()
@@ -242,23 +155,9 @@
      def test_header_delete_message(self):
          """Verify we can use the toolbar to delete a message"""
--        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'
--        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)))
--        bubble = self.main_view.get_message(message)
++        bubble = self.main_view.send_message(phone_num, message)
          self.main_view.close_osk()
@@ -271,23 +170,9 @@
      def test_delete_message_without_selecting_a_message(self):
          """Verify we only delete messages that have been selected"""
--        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 = 'dont delete me'
--        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)
++        message = 'delete me'
++        self.main_view.send_message(phone_num, message)
          self.main_view.close_osk()
@@ -299,6 +184,7 @@
          # verify messsage is not gone
          time.sleep(5)  # wait 5 seconds, the emulator is slow
++        list_view = self.main_view.get_multiple_selection_list_view()
          list_view.select_single("Label", text=message)
      def test_receive_text_with_letters_in_phone_number(self):
@@ -324,26 +210,9 @@
      def test_cancel_delete_thread_from_main_view(self):
          """Verify we can cancel deleting a message thread"""
--        self.main_view.start_new_message()
--        # verify the thread list page is not visible
--        self.assertThat(self.thread_list.visible, Eventually(Equals(False)))
--
--        # type contact/number
--        phone_num = 123
--        self.main_view.type_contact_phone_num(phone_num)
--
--        # type message
++        phone_num = '123'
          message = 'hello from Ubuntu'
--        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)))
--        # verify label text
--        self.main_view.get_message('hello from Ubuntu')
++        self.main_view.send_message(phone_num, message)
          # switch back to main page with thread list
          self.main_view.close_osk()
@@ -357,41 +226,24 @@
          self.assertThat(self.thread_list.count, Equals(1))
          # verify our number
          thread = self.main_view.get_thread_from_number(phone_num)
--        self.assertThat(thread.phoneNumber, Equals('123'))
++        self.assertThat(thread.phoneNumber, Equals(phone_num))
          # verify our text
--        thread.select_single('Label', text='hello from Ubuntu')
++        thread.select_single('Label', text=message)
          # use select button in toolbar
          self.main_view.enable_threads_selection_mode()
          # click cancel button
          self.main_view.click_threads_header_cancel()
          # verify our number was not deleted
          thread = self.main_view.get_thread_from_number(phone_num)
--        self.assertThat(thread.phoneNumber, Equals('123'))
++        self.assertThat(thread.phoneNumber, Equals(phone_num))
          # verify our text was not deleted
--        thread.select_single('Label', text='hello from Ubuntu')
++        thread.select_single('Label', text=message)
      def test_delete_thread_from_main_view(self):
          """Verify we can delete a message thread"""
--        self.main_view.start_new_message()
--        # verify the thread list page is not visible
--        self.assertThat(self.thread_list.visible, Eventually(Equals(False)))
--
--        # type contact/number
--        phone_num = 123
--        self.main_view.type_contact_phone_num(phone_num)
--
--        # type message
++        phone_num = '123'
          message = 'hello from Ubuntu'
--        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)))
--        # verify label text
--        self.main_view.get_message('hello from Ubuntu')
++        self.main_view.send_message(phone_num, message)
          # switch back to main page with thread list
          self.main_view.close_osk()
@@ -406,7 +258,7 @@
          # verify our number
          mess_thread = self.main_view.get_thread_from_number(phone_num)
          # verify our text
--        self.thread_list.select_single('Label', text='hello from Ubuntu')
++        self.thread_list.select_single('Label', text=message)
          # use select button in toolbar
          self.main_view.enable_threads_selection_mode()
          # click thread we want to delete
@@ -430,26 +282,13 @@
      def test_delete_message_swipe_right(self):
          """Verify we can delete a message by swiping right"""
--        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)
++        self.main_view.send_message(phone_num, message)
          # delete message
          self.main_view.delete_message(message)
++        list_view = self.main_view.get_multiple_selection_list_view()
          self.assertThat(list_view.count, Eventually(Equals(0)))