Merge lp:~canonical-platform-qa/messaging-app/bug1513044_label_uclabel into lp:messaging-app

[Brendan Donegan]

As per https://bugs.launchpad.net/ubuntu/+source/messaging-app/+bug/1513044, Label seems to have switched to UCLabel. This is just a quick update to account for that

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:460
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/~canonical-platform-qa/messaging-app/bug1513044_label_uclabel/+merge/276641/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/messaging-app-ci/691/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5010/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5007/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

460. By Brendan Donegan on 2015-11-04

Update references to Label to UCLabel

=== modified file 'tests/autopilot/messaging_app/emulators.py'
--- tests/autopilot/messaging_app/emulators.py	2015-09-11 14:25:57 +0000
+++ tests/autopilot/messaging_app/emulators.py	2015-11-04 12:25:41 +0000
@@ -60,7 +60,7 @@
 
         time.sleep(2)  # message is not always found on slow emulator
         for message in self.select_many(MessageDelegateFactory):
-            for item in message.select_many('Label'):
+            for item in message.select_many('UCLabel'):
                 if "text" in item.get_properties():
                     if item.get_properties()['text'] == text:
                         return message
@@ -73,7 +73,7 @@
         :parameter text: the text of the label to return
         """
 
-        return self.select_single('Label', visible=True, text=text)
+        return self.select_single('UCLabel', visible=True, text=text)
 
     def get_main_page(self):
         """Return messages with objectName messagesPage"""
@@ -506,9 +506,9 @@
         for index in range(self.get_messages_count()):
             message_delegate = self._get_message_delegate(index)
             date = message_delegate.select_single(
-                'Label', objectName='messageDate').text
+                'UCLabel', objectName='messageDate').text
             text = message_delegate.select_single(
-                'Label', objectName='messageText').text
+                'UCLabel', 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	2015-10-08 22:00:25 +0000
+++ tests/autopilot/messaging_app/tests/test_messaging.py	2015-11-04 12:25:41 +0000
@@ -79,10 +79,10 @@
         self.assertThat(self.thread_list.count, Eventually(Equals(1)))
 
         # verify number
-        self.thread_list.select_single('Label', text='0815')
+        self.thread_list.select_single('UCLabel', text='0815')
         time.sleep(1)  # make it visible to human users for a sec
         # verify text
-        self.thread_list.select_single('Label', text='hello to Ubuntu')
+        self.thread_list.select_single('UCLabel', text='hello to Ubuntu')
 
     def test_write_new_message(self):
         """Verify we can write and send a new text message"""
@@ -104,7 +104,7 @@
         thread = self.main_view.get_thread_from_number(phone_num)
         self.assertThat(thread.phoneNumber, Equals(phone_num))
         # verify our text
-        thread.wait_select_single('Label', text=message)
+        thread.wait_select_single('UCLabel', text=message)
 
     def test_deleting_message_long_press(self):
         """Verify we can delete a message with a long press on the message"""
@@ -146,7 +146,7 @@
         helpers.receive_sms(number, message)
         self.assertThat(self.thread_list.count, Eventually(Equals(1)))
         # click message thread
-        mess_thread = self.thread_list.wait_select_single('Label', text=number)
+        mess_thread = self.thread_list.wait_select_single('UCLabel', text=number)
         self.pointing_device.click_object(mess_thread)
         self.main_view.get_message(message)
         # send new message
@@ -188,7 +188,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)
+        list_view.select_single("UCLabel", text=message)
 
     def test_receive_text_with_letters_in_phone_number(self):
         """verify we can receive a text message with letters for a phone #"""
@@ -199,7 +199,7 @@
         self.assertThat(self.thread_list.count, Eventually(Equals(1)))
         # click message thread
         mess_thread = self.thread_list.wait_select_single(
-            'Label',
+            'UCLabel',
             text='letters@'  # phonesim sends text with number as letters@
         )
         self.pointing_device.click_object(mess_thread)
@@ -231,7 +231,7 @@
         thread = self.main_view.get_thread_from_number(phone_num)
         self.assertThat(thread.phoneNumber, Equals(phone_num))
         # verify our text
-        thread.select_single('Label', text=message)
+        thread.select_single('UCLabel', text=message)
         # use select button in toolbar
         self.main_view.enable_threads_selection_mode()
         # click cancel button
@@ -240,7 +240,7 @@
         thread = self.main_view.get_thread_from_number(phone_num)
         self.assertThat(thread.phoneNumber, Equals(phone_num))
         # verify our text was not deleted
-        thread.select_single('Label', text=message)
+        thread.select_single('UCLabel', text=message)
 
     def test_delete_thread_from_main_view(self):
         """Verify we can delete a message thread"""
@@ -261,7 +261,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=message)
+        self.thread_list.select_single('UCLabel', text=message)
         # use select button in toolbar
         self.main_view.enable_threads_selection_mode()
         # click thread we want to delete
@@ -342,10 +342,10 @@
         self.assertThat(self.thread_list.count, Eventually(Equals(1)))
 
         # verify number
-        self.thread_list.select_single('Label', text='Orange')
+        self.thread_list.select_single('UCLabel', text='Orange')
         time.sleep(1)  # make it visible to human users for a sec
         # verify text
-        self.thread_list.select_single('Label', text='hello to Ubuntu')
+        self.thread_list.select_single('UCLabel', text='hello to Ubuntu')
 
 
 class MessagingTestCaseWithExistingThread(MessagingAppTestCase):
@@ -568,7 +568,7 @@
         self.assertThat(thread_list.count, Eventually(Equals(1)))
 
         # click message thread
-        mess_thread = thread_list.wait_select_single('Label', text=number)
+        mess_thread = thread_list.wait_select_single('UCLabel', text=number)
         self.pointing_device.click_object(mess_thread)
 
         swipe_item_demo = self.main_view.get_swipe_item_demo()