Merge lp:~diegosarmentero/ubuntuone-windows-installer/err-dict into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Improves in Setup Account to enable setting the message of a label with an automatic style.

Improves in Setup Account to enable setting the message of a label with an automatic style.

[lp:~diegosarmentero/ubuntuone-windows-installer/err-dict]

58. By Diego Sarmentero on 2011-09-13

Added missing docstring.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-09-12 19:34:20 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-09-13 12:10:13 +0000
@@ -144,8 +144,8 @@
         """Show help for the name field."""
         text = unicode(self.ui.name_edit.text())
         if not text.strip():
-            self.ui.name_assistance.setVisible(True)
-            self.ui.name_assistance.setText(ERROR % EMPTY_NAME)
+            self.set_error_message(self.ui.name_assistance,
+                EMPTY_NAME)
             common.check_as_invalid(self.ui.name_edit)
         else:
             self.ui.name_assistance.setVisible(False)
@@ -155,8 +155,8 @@
         """Show help for the email field."""
         text = unicode(self.ui.email_edit.text())
         if not is_correct_email(text):
-            self.ui.email_assistance.setText(ERROR % INVALID_EMAIL)
-            self.ui.email_assistance.setVisible(True)
+            self.set_error_message(self.ui.email_assistance,
+                INVALID_EMAIL)
             common.check_as_invalid(self.ui.email_edit)
         else:
             self.ui.email_assistance.setVisible(False)
@@ -167,13 +167,18 @@
         text1 = unicode(self.ui.email_edit.text())
         text2 = unicode(self.ui.confirm_email_edit.text())
         if text1 != text2:
-            self.ui.confirm_email_assistance.setText(ERROR % EMAIL_MATCH)
-            self.ui.confirm_email_assistance.setVisible(True)
+            self.set_error_message(self.ui.confirm_email_assistance,
+                EMAIL_MATCH)
             common.check_as_invalid(self.ui.confirm_email_edit)
         else:
             self.ui.confirm_email_assistance.setVisible(False)
             common.check_as_valid(self.ui.confirm_email_edit)
 
+    def set_error_message(self, label, msg):
+        """Set the message to the proper label applying the error style."""
+        label.setText(ERROR % msg)
+        label.setVisible(True)
+
     def showEvent(self, event):
         """Set set_up_button as default button when the page is shown."""
         # This method should stays here because if we move it to initializePage

=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
--- ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-12 19:49:13 +0000
+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-13 12:10:13 +0000
@@ -230,6 +230,17 @@
         super(SetupAccountFakeWizardTestCase, self).setUp()
         self.patch(self.ui, 'wizard', FakeWizard)
 
+    def test_set_error_message(self):
+        """Check the state of the label after calling: set_error_message."""
+        self.ui.email_assistance()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.ui.set_error_message(self.ui.ui.email_assistance, "message")
+        self.assertTrue(self.ui.ui.email_assistance.isVisible())
+        self.assertEqual(
+            unicode(self.ui.ui.email_assistance.text()),
+            setup_account.ERROR % "message")
+
     def test_blank_name(self):
         """Status when the name field is blank (spaces).