Merge lp:~ralsina/ubuntuone-control-panel/lang-tested into lp:ubuntuone-control-panel

[Roberto Alsina]

- Fixed tests so they work under non-english locales (Fixes LP: #951716).

 - Fixed tests so they work under non-english locales (Fixes LP: #951716).

[dobey (dobey)]

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_account.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_account.py	2012-03-01 22:05:51 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_account.py	2012-03-12 17:04:25 +0000
@@ -62,10 +62,10 @@
     def test_process_info(self):
         """The info is processed when ready."""
         self.ui.process_info(SAMPLE_ACCOUNT_INFO)
-        self.assertEqual(self.ui.ui.name_label.text(), SAMPLE_NAME)
-        self.assertEqual(self.ui.ui.email_label.text(), SAMPLE_EMAIL)
-        self.assertEqual(self.ui.ui.services_description_label.text(),
-                         SAMPLE_PLAN)
+        self.assertEqual(unicode(self.ui.ui.name_label.text()), SAMPLE_NAME)
+        self.assertEqual(unicode(self.ui.ui.email_label.text()), SAMPLE_EMAIL)
+        self.assertEqual(unicode(
+            self.ui.ui.services_description_label.text()), SAMPLE_PLAN)
 
     def test_edit_account_button(self):
         """When clicking the edit account button, the proper url is opened."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-02 17:13:04 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-12 17:04:25 +0000
@@ -107,7 +107,7 @@
 
         name = gui.NAME_STYLE % SAMPLE_NAME
         greeting = gui.GREETING % {'user_display_name': name}
-        self.assertEqual(self.ui.ui.greeting_label.text(), greeting)
+        self.assertEqual(unicode(self.ui.ui.greeting_label.text()), greeting)
 
         used = int(info['quota_used'])
         total = int(info['quota_total'])
@@ -116,9 +116,10 @@
         expected = {'used': gui.humanize(used),
                     'total': gui.humanize(total)}
         msg = gui.USAGE_LABEL % expected
-        self.assertEqual(self.ui.ui.quota_usage_label.text(), msg)
+        self.assertEqual(unicode(self.ui.ui.quota_usage_label.text()), msg)
         msg = gui.PERCENTAGE_LABEL % percentage_usage
-        self.assertEqual(self.ui.ui.percentage_usage_label.text(), msg)
+        self.assertEqual(unicode(self.ui.ui.percentage_usage_label.text()),
+            msg)
 
     def test_update_over_quota(self):
         """Check the labels state when the user exceed the quota."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_device.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_device.py	2012-03-08 20:46:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_device.py	2012-03-12 17:04:25 +0000
@@ -71,7 +71,8 @@
         info = SAMPLE_COMPUTER_INFO
         expected_name = info["name"]
         self.ui.update_device_info(info)
-        self.assertEqual(self.ui.ui.device_name_label.text(), expected_name)
+        self.assertEqual(unicode(self.ui.ui.device_name_label.text()),
+            expected_name)
 
     # pylint: disable=C0103
     def assertIconMatchesType(self, device_type, base_icon_name):
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-03-08 20:46:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-03-12 17:04:25 +0000
@@ -69,7 +69,7 @@
         local, remote = SAMPLE_DEVICES_INFO[0], SAMPLE_DEVICES_INFO[1:]
 
         local_device = self.ui.ui.local_device
-        self.assertEqual(local_device.text(), local['name'])
+        self.assertEqual(unicode(local_device.text()), local['name'])
         self.assertEqual(local_device.id, local['device_id'])
 
         self.assertEqual(self.ui.ui.list_devices.count(),
@@ -77,7 +77,7 @@
         for i, remote_device in enumerate(remote):
             item = self.ui.ui.list_devices.item(i)
             device = self.ui.ui.list_devices.itemWidget(item)
-            self.assertEqual(device.text(), remote_device['name'])
+            self.assertEqual(unicode(device.text()), remote_device['name'])
 
     def test_local_device(self):
         """Test if the local_device widget is properly packed."""
@@ -102,7 +102,7 @@
 
         self.ui.ui.local_device.removed.emit()
 
-        self.assertEqual(self.ui.ui.local_device.text(), '')
+        self.assertEqual(unicode(self.ui.ui.local_device.text()), '')
         self.assertEqual(self.ui.ui.local_device.id, None)
 
     def test_local_device_removed_signal(self):
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-03-02 13:53:24 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-03-12 17:04:25 +0000
@@ -60,7 +60,7 @@
         status = {backend.STATUS_KEY: status_bd, backend.MSG_KEY: msg_bd}
         self.ui.process_info(status)
 
-        actual_text = self.ui.ui.sync_status_label.text()
+        actual_text = unicode(self.ui.ui.sync_status_label.text())
         self.assertEqual(expected_text, actual_text)
 
         actual_icon = self.ui.ui.sync_status_icon.pixmap()
@@ -69,7 +69,8 @@
         self.assertEqualPixmaps(expected_icon, actual_icon)
 
         self.assertTrue(self.ui.ui.sync_status_button.isEnabled())
-        self.assertEqual(self.ui.ui.sync_status_button.text(), action)
+        self.assertEqual(unicode(self.ui.ui.sync_status_button.text()),
+            action)
 
         is_default = self.ui.ui.sync_status_button.isDefault()
         expected_default = (action == gui.FILE_SYNC_CONNECT)
@@ -180,9 +181,10 @@
 
         self.assertFalse(self.ui.ui.sync_status_button.isEnabled())
         self.assertFalse(self.ui.ui.sync_status_button.isDefault())
-        actual_text = self.ui.ui.sync_status_label.text()
+        actual_text = unicode(self.ui.ui.sync_status_label.text())
         self.assertEqual(actual_text, LOADING)
-        self.assertEqual(self.ui.ui.sync_status_button.text(), PLEASE_WAIT)
+        self.assertEqual(unicode(self.ui.ui.sync_status_button.text()),
+            PLEASE_WAIT)
         actual_icon = self.ui.ui.sync_status_icon.pixmap()
         expected_icon = gui.pixmap_from_name('sync_status_loading')
         self.assertEqualPixmaps(expected_icon, actual_icon)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-08 20:46:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-12 17:04:25 +0000
@@ -61,7 +61,8 @@
 
     def test_text(self):
         """The button text is correct."""
-        self.assertEqual(self.ui.text(), gui.FOLDERS_COLUMN_EXPLORE)
+        self.assertEqual(unicode(self.ui.text()),
+            gui.FOLDERS_COLUMN_EXPLORE)
 
     def test_clicked(self):
         """Clicking the button opens the folder in the default file manager."""
@@ -105,10 +106,10 @@
 
     def assert_folder_group_header_correct(self, item, name):
         """Check that the folder group header is correct."""
-        self.assertEqual(item.text(gui.FOLDER_NAME_COL), name)
-        self.assertEqual(item.text(gui.SUBSCRIPTION_COL),
+        self.assertEqual(unicode(item.text(gui.FOLDER_NAME_COL)), name)
+        self.assertEqual(unicode(item.text(gui.SUBSCRIPTION_COL)),
                          gui.FOLDERS_COLUMN_SYNC_LOCALLY)
-        self.assertEqual(item.text(gui.EXPLORE_COL), '')
+        self.assertEqual(unicode(item.text(gui.EXPLORE_COL)), '')
 
     @defer.inlineCallbacks
     def test_is_processing_while_asking_info(self):
@@ -163,12 +164,12 @@
                 if volume['type'] == self.ui.backend.SHARE_TYPE:
                     name = volume['name']
                     expected_path = volume['realpath']
-                label = item.text(gui.FOLDER_NAME_COL)
+                label = unicode(item.text(gui.FOLDER_NAME_COL))
                 self.assertEqual(label, name)
 
                 if volume['type'] == self.ui.backend.ROOT_TYPE:
                     # no check box but the ALWAYS_SUBSCRIBED legend
-                    self.assertEqual(item.text(gui.SUBSCRIPTION_COL),
+                    self.assertEqual(unicode(item.text(gui.SUBSCRIPTION_COL)),
                                      gui.ALWAYS_SUBSCRIBED)
                 else:
                     subscribed = item.checkState(gui.SUBSCRIPTION_COL) == \
@@ -318,7 +319,7 @@
 
         volume = MUSIC_FOLDER
 
-        label = item.text(gui.FOLDER_NAME_COL)
+        label = unicode(item.text(gui.FOLDER_NAME_COL))
         self.assertEqual(label, gui.MUSIC_DISPLAY_NAME)
 
         subscribed = item.checkState(gui.SUBSCRIPTION_COL) == gui.CHECKED
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_signin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2012-03-02 17:13:04 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2012-03-12 17:04:25 +0000
@@ -47,11 +47,12 @@
 
     def test_label_is_correct(self):
         """The welcome_label has the correct text."""
-        self.assertEqual(self.ui.ui.welcome_label.text(), gui.WELCOME_LABEL)
+        self.assertEqual(unicode(self.ui.ui.welcome_label.text()),
+            gui.WELCOME_LABEL)
 
     def test_buttos_are_correct(self):
         """The buttos have the correct text."""
-        self.assertEqual(self.ui.ui.login_button.text(),
+        self.assertEqual(unicode(self.ui.ui.login_button.text()),
                          gui.EXISTING_ACCOUNT_CHOICE_BUTTON)
-        self.assertEqual(self.ui.ui.register_button.text(),
+        self.assertEqual(unicode(self.ui.ui.register_button.text()),
                          gui.SET_UP_ACCOUNT_CHOICE_BUTTON)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_wizard.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-02 17:13:04 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-12 17:04:25 +0000
@@ -43,7 +43,7 @@
     def test_cancel_button(self):
         """Send the rejected signal when the cancel button is clicked."""
         button = self.ui.button(self.ui.CancelButton)
-        self.assertEqual(button.text(), gui.CLOSE_AND_SETUP_LATER)
+        self.assertEqual(unicode(button.text()), gui.CLOSE_AND_SETUP_LATER)
 
         self.ui.rejected.connect(self._set_called)
         button.click()