1
=== modified file 'tests/autopilot/messaging_app/emulators.py'
2
--- tests/autopilot/messaging_app/emulators.py	2014-07-08 08:35:32 +0000
3
+++ tests/autopilot/messaging_app/emulators.py	2014-07-15 13:29:36 +0000
4
@@ -184,6 +184,10 @@
5
184
        dialog_buttons = self.get_dialog_buttons()
184
        dialog_buttons = self.get_dialog_buttons()
6
185
        return dialog_buttons.select_single('Button', text='Delete')
185
        return dialog_buttons.select_single('Button', text='Delete')
7
186
186
8
187
    def get_add_phone_number_to_contact_page(self):
9
188
        """ Return page with list of contacts """
10
189
        return self.wait_select_single('AddPhoneNumberToContactPage')
11
190
12
187
    def click_cancel_dialog_button(self):
191
    def click_cancel_dialog_button(self):
13
188
        """Click on dialog button cancel"""
192
        """Click on dialog button cancel"""
14
189
193
15
190
194
16
=== modified file 'tests/autopilot/messaging_app/helpers.py'
17
--- tests/autopilot/messaging_app/helpers.py	2014-07-08 23:12:48 +0000
18
+++ tests/autopilot/messaging_app/helpers.py	2014-07-15 13:29:36 +0000
19
@@ -104,3 +104,17 @@
20
104
        ], stdout=subprocess.PIPE, universal_newlines=True)
104
        ], stdout=subprocess.PIPE, universal_newlines=True)
21
105
    mc_accounts = mc_tool.communicate()[0]
105
    mc_accounts = mc_tool.communicate()[0]
22
106
    return 'ofono/ofono/account' in mc_accounts
106
    return 'ofono/ofono/account' in mc_accounts
23
107
24
108
def get_pid_by_name(proc_name):
25
109
    for i in range(10):
26
110
        try:
27
111
            return int(
28
112
                subprocess.check_output(['pidof', proc_name]).strip())
29
113
        except subprocess.CalledProcessError:
30
114
            # application not started yet, check in a second
31
115
            time.sleep(1)
32
116
    else:
33
117
        raise RuntimeError(
34
118
            'Could not find autopilot interface for {} after 10'
35
119
            'seconds'.format(proc_name)
36
120
        )
37
107
121
38
=== modified file 'tests/autopilot/messaging_app/tests/test_messaging.py'
39
--- tests/autopilot/messaging_app/tests/test_messaging.py	2014-06-30 08:42:16 +0000
40
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2014-07-15 13:29:36 +0000
41
@@ -15,14 +15,17 @@
42
15
import subprocess
15
import subprocess
43
16
import time
16
import time
44
17
17
45
18
from autopilot.introspection import get_proxy_object_for_existing_process
46
18
from autopilot.matchers import Eventually
19
from autopilot.matchers import Eventually
47
19
from testtools.matchers import Equals, HasLength
20
from testtools.matchers import Equals, HasLength
48
21
from autopilot.platform import model
49
20
from testtools import skipIf, skip
22
from testtools import skipIf, skip
50
21
23
51
22
from messaging_app import emulators
24
from messaging_app import emulators
52
23
from messaging_app import helpers
25
from messaging_app import helpers
53
24
from messaging_app.tests import MessagingAppTestCase
26
from messaging_app.tests import MessagingAppTestCase
55
25
27
from ubuntuuitoolkit import emulators as toolkit_emulators
56
28
from ubuntuuitoolkit import fixture_setup
57
26
29
58
27
@skipIf(os.uname()[2].endswith('maguro'),
30
@skipIf(os.uname()[2].endswith('maguro'),
59
28
        'tests cause Unity crashes on maguro')
31
        'tests cause Unity crashes on maguro')
60
@@ -452,6 +455,51 @@
61
452
        self.main_view.delete_message(message)
455
        self.main_view.delete_message(message)
62
453
        self.assertThat(list_view.count, Eventually(Equals(0)))
456
        self.assertThat(list_view.count, Eventually(Equals(0)))
63
454
457
64
458
    def test_add_phone_number_to_existing_contact(self):
65
459
        """
66
460
        Verify that if we click on the add number to contact from message
67
461
        button, then the add to existing contact button, that we get a
68
462
        list of contacts to choose from.
69
463
        """
70
464
        # receive an sms message to add the number from
71
465
        helpers.receive_sms('0815', 'hello to Ubuntu')
72
466
        # verify that we got the message
73
467
        self.assertThat(self.thread_list.count, Eventually(Equals(1)))
74
468
        main = self.main_view.get_main_page()
75
469
        main.open_thread('0815')
76
470
        # work around the notification getting in the way
77
471
        time.sleep(5)
78
472
        self.main_view.click_add_button()
79
473
        self.main_view.click_add_to_contact_button()
80
474
        add_to_contact = self.main_view.get_add_phone_number_to_contact_page()
81
475
        self.assertThat(add_to_contact.visible, Eventually(Equals(True)))
82
476
83
477
    @skipIf(model() == 'Desktop', 'Not valid on the desktop') 
84
478
    def test_add_phone_number_to_new_contact(self):
85
479
        """
86
480
        Verify that if we click on the add number to contact from message
87
481
        button, then the add to new contact button, that we get a call out
88
482
        to the address book application.
89
483
        """
90
484
        # receive an sms message to add the number from
91
485
        helpers.receive_sms('0815', 'hello to Ubuntu')
92
486
        # verify that we got the message
93
487
        self.assertThat(self.thread_list.count, Eventually(Equals(1)))
94
488
        main = self.main_view.get_main_page()
95
489
        main.open_thread('0815')
96
490
        # work around the notification getting in the way
97
491
        time.sleep(5)
98
492
        self.main_view.click_add_button()
99
493
        # Enable load testability before clicking the button
100
494
        # and launching the address book application
101
495
        self.useFixture(fixture_setup.InitctlEnvironmentVariable(
102
496
            QT_LOAD_TESTABILITY=1))
103
497
        self.main_view.click_create_new_contact_button()
104
498
        address_book = get_proxy_object_for_existing_process(
105
499
            pid=helpers.get_pid_by_name('address-book-app'))
106
500
        self.assertNotEqual(address_book, None)
107
501
        os.system('ubuntu-app-stop address-book-app')
108
502
109
455
503
110
456
class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):
504
class MessagingTestCaseWithExistingThread(BaseMessagingTestCase):
111
457
505
Status:	Work in progress
Proposed branch:	lp:~canonical-platform-qa/messaging-app/new_helpers_tests
Merge into:	lp:messaging-app
Diff against target:	110 lines (+67/-1) 3 files modified tests/autopilot/messaging_app/emulators.py (+4/-0) tests/autopilot/messaging_app/helpers.py (+14/-0) tests/autopilot/messaging_app/tests/test_messaging.py (+49/-1)
To merge this branch:	bzr merge lp:~canonical-platform-qa/messaging-app/new_helpers_tests
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-07-15	Needs Fixing on 2014-07-15
Leo Arias (community)		2014-07-15	Needs Fixing on 2014-07-15
Gustavo Pichorim Boiko		2014-07-15	Pending
Review via email: mp+226825@code.launchpad.net