Merge lp:~brendan-donegan/messaging-app/new_helpers_tests into lp:messaging-app

[Brendan Donegan]

Add some tests for helpers for the 'Add number to contact' dialog

This branch contains some new tests which exercise the helpers that I created to aid in the automation of the 'Add number to contact from message' user experience. To some extent they replicate the intent of that test, but do not actually concern themselves with the integration of the messaging-app and address-book-app - they just check that address-book-app does the right thing in the case of each function.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:140
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~brendan-donegan/messaging-app/new_helpers_tests/+merge/226439/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/messaging-app-ci/280/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1854/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1552/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2949/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1742/console

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

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

102 + address_book = get_proxy_object_for_existing_process(
103 + pid=helpers.get_pid_by_name('address-book-app'))
104 + self.assertNotEqual(address_book, None)

we shouldn't add address book as a dependency to those tests.
what we should do is to check that url-dispatcher has received the right message.

review: Needs Fixing (code review)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/281/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1568/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-amd64-ci/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-armhf-ci/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2973/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1758/console

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

The test_add_phone_number_to_new_contact needs to be disabled on desktop as it only works on the device.

review: Needs Fixing

Unmerged revisions

140. By Brendan Donegan on 2014-07-11

Make sure that address-book-app is launched when we try to add a number to a new contact

139. By Brendan Donegan on 2014-07-11

Remove proxy for AddPhoneNumberToContactPage because it isn't ready to be tested.

138. By Brendan Donegan on 2014-07-11

Add tests for toolbar button helpers

=== 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 11:49:26 +0000
@@ -184,6 +184,10 @@
         dialog_buttons = self.get_dialog_buttons()
         return dialog_buttons.select_single('Button', text='Delete')
 
+    def get_add_phone_number_to_contact_page(self):
+        """ Return page with list of contacts """
+        return self.wait_select_single('AddPhoneNumberToContactPage')
+
     def click_cancel_dialog_button(self):
         """Click on dialog button cancel"""
 

=== 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 11:49:26 +0000
@@ -104,3 +104,17 @@
         ], stdout=subprocess.PIPE, universal_newlines=True)
     mc_accounts = mc_tool.communicate()[0]
     return 'ofono/ofono/account' in mc_accounts
+
+def get_pid_by_name(proc_name):
+    for i in range(10):
+        try:
+            return int(
+                subprocess.check_output(['pidof', proc_name]).strip())
+        except subprocess.CalledProcessError:
+            # application not started yet, check in a second
+            time.sleep(1)
+    else:
+        raise RuntimeError(
+            'Could not find autopilot interface for {} after 10'
+            'seconds'.format(proc_name)
+        )

=== 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 11:49:26 +0000
@@ -15,6 +15,7 @@
 import subprocess
 import time
 
+from autopilot.introspection import get_proxy_object_for_existing_process
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, HasLength
 from testtools import skipIf, skip
@@ -22,7 +23,8 @@
 from messaging_app import emulators
 from messaging_app import helpers
 from messaging_app.tests import MessagingAppTestCase
-
+from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntuuitoolkit import fixture_setup
 
 @skipIf(os.uname()[2].endswith('maguro'),
         'tests cause Unity crashes on maguro')
@@ -452,6 +454,50 @@
         self.main_view.delete_message(message)
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
+    def test_add_phone_number_to_existing_contact(self):
+        """
+        Verify that if we click on the add number to contact from message
+        button, then the add to existing contact button, that we get a
+        list of contacts to choose from.
+        """
+        # receive an sms message to add the number from
+        helpers.receive_sms('0815', 'hello to Ubuntu')
+        # verify that we got the message
+        self.assertThat(self.thread_list.count, Eventually(Equals(1)))
+        main = self.main_view.get_main_page()
+        main.open_thread('0815')
+        # work around the notification getting in the way
+        time.sleep(5)
+        self.main_view.click_add_button()
+        self.main_view.click_add_to_contact_button()
+        add_to_contact = self.main_view.get_add_phone_number_to_contact_page()
+        self.assertThat(add_to_contact.visible, Eventually(Equals(True)))
+
+    def test_add_phone_number_to_new_contact(self):
+        """
+        Verify that if we click on the add number to contact from message
+        button, then the add to new contact button, that we get a call out
+        to the address book application.
+        """
+        # receive an sms message to add the number from
+        helpers.receive_sms('0815', 'hello to Ubuntu')
+        # verify that we got the message
+        self.assertThat(self.thread_list.count, Eventually(Equals(1)))
+        main = self.main_view.get_main_page()
+        main.open_thread('0815')
+        # work around the notification getting in the way
+        time.sleep(5)
+        self.main_view.click_add_button()
+        # Enable load testability before clicking the button
+        # and launching the address book application
+        self.useFixture(fixture_setup.InitctlEnvironmentVariable(
+            QT_LOAD_TESTABILITY=1))
+        self.main_view.click_create_new_contact_button()
+        address_book = get_proxy_object_for_existing_process(
+            pid=helpers.get_pid_by_name('address-book-app'))
+        self.assertNotEqual(address_book, None)
+        os.system('ubuntu-app-stop address-book-app')
+
 
 class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):