Merge lp:~nataliabidart/ubuntu-sso-client/validate-all-pages into lp:ubuntu-sso-client

[Natalia Bidart]

* Validate form data for verify token page, request password token and set new password (LP: #625361).
* Validate password strength on reset password page (LP: #616528).
* Labels are not as wide as the parent windowm but a little bit less wide (LP: #625009).

Validate form data for verify token page, request password token and set new password (LP: #625361).
Validate password strength on reset password page (LP: #616528).

[Vincenzo Di Somma (vds)]

review: Approve

[lp:~nataliabidart/ubuntu-sso-client/validate-all-pages]

605. By Natalia Bidart on 2010-08-27

Removed unneeded code. Clarified error setting.

606. By Natalia Bidart on 2010-08-27

Labels are not as wide as the parent windowm but a little bit less wide (LP:
#625009).

[John Lenton (chipaca)]

+1 from alecu and me :)

review: Approve

[lp:~nataliabidart/ubuntu-sso-client/validate-all-pages]

607. By Natalia Bidart on 2010-08-27

Merged trunk in.

[Alejandro J. Cura (alecu)]

I just did some functional testing of this branch and it works ok.

review: Approve

=== modified file 'data/ui.glade'
--- data/ui.glade	2010-08-26 00:56:39 +0000
+++ data/ui.glade	2010-08-27 21:46:39 +0000
@@ -60,6 +60,12 @@
     <property name="visible">True</property>
     <property name="spacing">10</property>
     <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkHBox" id="emails_hbox">
         <property name="visible">True</property>
         <property name="spacing">5</property>
@@ -77,9 +83,6 @@
       </packing>
     </child>
     <child>
-      <placeholder/>
-    </child>
-    <child>
       <object class="GtkHBox" id="passwords_hbox">
         <property name="visible">True</property>
         <property name="spacing">5</property>
@@ -107,9 +110,6 @@
       </packing>
     </child>
     <child>
-      <placeholder/>
-    </child>
-    <child>
       <object class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
         <child>
@@ -585,27 +585,43 @@
     <property name="visible">True</property>
     <property name="spacing">10</property>
     <child>
-      <object class="GtkAlignment" id="alignment1">
+      <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
-        <property name="xscale">0</property>
-        <property name="yscale">0</property>
-        <child>
-          <object class="GtkVBox" id="set_new_password_details_vbox">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
+        <child>
+          <object class="GtkAlignment" id="alignment1">
+            <property name="visible">True</property>
+            <property name="xscale">0</property>
+            <property name="yscale">0</property>
+            <child>
+              <object class="GtkVBox" id="set_new_password_details_vbox">
+                <property name="visible">True</property>
+                <property name="spacing">5</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="reset_password_help_label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">label</property>
+            <property name="wrap">True</property>
           </object>
         </child>
       </object>
       <packing>
+        <property name="padding">5</property>
         <property name="position">0</property>
       </packing>
     </child>

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-08-27 15:26:27 +0000
+++ ubuntu_sso/gui.py	2010-08-27 21:46:39 +0000
@@ -319,22 +319,26 @@
         self._append_page(self._build_request_password_token_page())
         self._append_page(self._build_set_new_password_page())
 
+        window_size = None
         if not login_only:
+            window_size = (550, 600)
             self._append_page(self._build_enter_details_page())
             self._append_page(self._build_tc_page())
             self._append_page(self._build_verify_email_page())
             self.login_button.grab_focus()
             self._set_current_page(self.enter_details_vbox)
-            self.window.set_size_request(550, 600)
-            size_req = (self.window.get_size_request()[0], -1)
-            for label in self.labels:
-                label.set_size_request(*size_req)
         else:
+            window_size = (400, 350)
             self.login_back_button.hide()
             self.login_ok_button.grab_focus()
             self.login_vbox.help_text = help_text
             self._set_current_page(self.login_vbox)
 
+        self.window.set_size_request(*window_size)
+        size_req = (int(window_size[0] * 0.9), -1)
+        for label in self.labels:
+            label.set_size_request(*size_req)
+
         self._setup_signals()
         self._gtk_signal_log = []
 
@@ -501,11 +505,11 @@
         msg = self.CAPTCHA_RELOAD_TOOLTIP
         self.captcha_reload_button.set_tooltip_text(msg)
 
-        self.emails_hbox.pack_start(self.email1_entry)
-        self.emails_hbox.pack_start(self.email2_entry)
+        self.emails_hbox.pack_start(self.email1_entry, expand=False)
+        self.emails_hbox.pack_start(self.email2_entry, expand=False)
 
-        self.passwords_hbox.pack_start(self.password1_entry)
-        self.passwords_hbox.pack_start(self.password2_entry)
+        self.passwords_hbox.pack_start(self.password1_entry, expand=False)
+        self.passwords_hbox.pack_start(self.password2_entry, expand=False)
         help_msg = '<small>%s</small>' % self.PASSWORD_HELP
         self.password_help_label.set_markup(help_msg)
 
@@ -584,7 +588,8 @@
         self.request_password_token_vbox.help_text = text
 
         entry = self.reset_email_entry
-        self.request_password_token_details_vbox.pack_start(entry)
+        self.request_password_token_details_vbox.pack_start(entry,
+                                                            expand=False)
         cb = self.on_reset_email_entry_changed
         self.reset_email_entry.connect('changed', cb)
         self.request_password_token_ok_button.set_label(self.NEXT)
@@ -604,19 +609,48 @@
         for entry in (self.reset_code_entry,
                       self.reset_password1_entry,
                       self.reset_password2_entry):
-            self.set_new_password_details_vbox.pack_start(entry)
+            self.set_new_password_details_vbox.pack_start(entry, expand=False)
             entry.connect('activate', cb)
 
         cb = self.on_set_new_password_entries_changed
         self.reset_code_entry.connect('changed', cb)
         self.reset_password1_entry.connect('changed', cb)
         self.reset_password2_entry.connect('changed', cb)
+        help_msg = '<small>%s</small>' % self.PASSWORD_HELP
+        self.reset_password_help_label.set_markup(help_msg)
 
         self.set_new_password_ok_button.set_label(self.RESET_PASSWORD)
         self.set_new_password_ok_button.set_sensitive(False)
 
         return self.set_new_password_vbox
 
+    def _validate_email(self, email1, email2=None):
+        """Validate 'email1', return error message if not valid.
+
+        If 'email2' is given, must match 'email1'.
+        """
+        if email2 is not None and email1 != email2:
+            return self.EMAIL_MISMATCH
+
+        if not email1:
+            return self.FIELD_REQUIRED
+
+        if '@' not in email1:
+            return self.EMAIL_INVALID
+
+    def _validate_password(self, password1, password2=None):
+        """Validate 'password1', return error message if not valid.
+
+        If 'password2' is given, must match 'email1'.
+        """
+        if password2 is not None and password1 != password2:
+            return self.PASSWORD_MISMATCH
+
+        if (len(password1) < 8 or
+            re.search('[A-Z]', password1) is None or
+            re.search('\d+', password1) is None):
+            return self.PASSWORD_TOO_WEAK
+
     # GTK callbacks
 
     def run(self):
@@ -673,56 +707,40 @@
         name = self.name_entry.get_text()
         if not name:
             self.name_entry.set_warning(self.FIELD_REQUIRED)
-            error |= True
+            error = True
 
         # check email
         email1 = self.email1_entry.get_text()
         email2 = self.email2_entry.get_text()
-        if email1 != email2:
-            self.email1_entry.set_warning(self.EMAIL_MISMATCH)
-            self.email2_entry.set_warning(self.EMAIL_MISMATCH)
-            error |= True
-
-        if '@' not in email1:
-            self.email1_entry.set_warning(self.EMAIL_INVALID)
-            self.email2_entry.set_warning(self.EMAIL_INVALID)
-            error |= True
-
-        if not email1:
-            self.email1_entry.set_warning(self.FIELD_REQUIRED)
-            self.email2_entry.set_warning(self.FIELD_REQUIRED)
-            error |= True
+        msg = self._validate_email(email1, email2)
+        if msg is not None:
+            self.email1_entry.set_warning(msg)
+            self.email2_entry.set_warning(msg)
+            error = True
 
         # check password
         password1 = self.password1_entry.get_text()
         password2 = self.password2_entry.get_text()
-        if password1 != password2:
-            self.password1_entry.set_warning(self.PASSWORD_MISMATCH)
-            self.password2_entry.set_warning(self.PASSWORD_MISMATCH)
-            error |= True
-
-        if (len(password1) < 8 or
-            re.search('[A-Z]', password1) is None or
-            re.search('\d+', password1) is None):
-            self.password1_entry.set_warning(self.PASSWORD_TOO_WEAK)
-            self.password2_entry.set_warning(self.PASSWORD_TOO_WEAK)
-            error |= True
+        msg = self._validate_password(password1, password2)
+        if msg is not None:
+            self.password1_entry.set_warning(msg)
+            self.password2_entry.set_warning(msg)
+            error = True
 
         # check T&C
         if not self.yes_to_tc_checkbutton.get_active():
             self._set_warning_message(self.tc_warning_label,
                                       self.TC_NOT_ACCEPTED)
-            error |= True
+            error = True
 
         captcha_solution = self.captcha_solution_entry.get_text()
         if not captcha_solution:
             self.captcha_solution_entry.set_warning(self.FIELD_REQUIRED)
-            error |= True
+            error = True
 
         if error:
             return
 
-        self._clear_warnings()
         self._set_current_page(self.processing_vbox)
 
         logger.info('Calling register_user with email %r, password <hidden>,' \
@@ -745,14 +763,19 @@
         if not self.verify_token_button.is_sensitive():
             return
 
+        self._clear_warnings()
+
+        email_token = self.email_token_entry.get_text()
+        if not email_token:
+            self.email_token_entry.set_warning(self.FIELD_REQUIRED)
+            return
+
         email = self.email1_entry.get_text()
         password = self.password1_entry.get_text()
-        email_token = self.email_token_entry.get_text()
-
+        f = self.backend.validate_email
         logger.info('Calling validate_email with email %r, password <hidden>' \
-                    ', app_name %r and email_token %r.', email,
-                    self.app_name, email_token)
-        f = self.backend.validate_email
+                    ', app_name %r and email_token %r.', email, self.app_name,
+                    email_token)
         f(self.app_name, email, password, email_token,
           reply_handler=NO_OP, error_handler=NO_OP)
 
@@ -766,27 +789,21 @@
         self._clear_warnings()
 
         error = False
+
         email = self.login_email_entry.get_text()
-
-        if '@' not in email:
-            self.login_email_entry.set_warning(self.EMAIL_INVALID)
-            error |= True
-
-        if not email:
-            self.login_email_entry.set_warning(self.FIELD_REQUIRED)
-            error |= True
+        msg = self._validate_email(email)
+        if msg is not None:
+            self.login_email_entry.set_warning(msg)
+            error = True
 
         password = self.login_password_entry.get_text()
-
         if not password:
             self.login_password_entry.set_warning(self.FIELD_REQUIRED)
-            error |= True
+            error = True
 
         if error:
             return
 
-        self._clear_warnings()
-
         f = self.backend.login
         f(self.app_name, email, password,
           reply_handler=NO_OP, error_handler=NO_OP)
@@ -806,7 +823,13 @@
         if not self.request_password_token_ok_button.is_sensitive():
             return
 
+        self._clear_warnings()
+
         email = self.reset_email_entry.get_text()
+        msg = self._validate_email(email)
+        if msg is not None:
+            self.reset_email_entry.set_warning(msg)
+            return
 
         logger.info('Calling request_password_reset_token with %r.', email)
         f = self.backend.request_password_reset_token
@@ -837,13 +860,27 @@
         if not self.set_new_password_ok_button.is_sensitive():
             return
 
-        email = self.reset_email_entry.get_text()
+        self._clear_warnings()
+
+        error = False
+
         token = self.reset_code_entry.get_text()
-        # XXX: validate passwords!
-        # see LP: #616528
+        if not token:
+            self.reset_code_entry.set_warning(self.FIELD_REQUIRED)
+            error = True
+
         password1 = self.reset_password1_entry.get_text()
-        #password2 = self.reset_password2_entry.get_text()
-
+        password2 = self.reset_password2_entry.get_text()
+        msg = self._validate_password(password1, password2)
+        if msg is not None:
+            self.reset_password1_entry.set_warning(msg)
+            self.reset_password2_entry.set_warning(msg)
+            error = True
+
+        if error:
+            return
+
+        email = self.reset_email_entry.get_text()
         logger.info('Calling set_new_password with email %r, token %r and ' \
                     'new password: <hidden>.', email, token)
         f = self.backend.set_new_password

=== modified file 'ubuntu_sso/tests/test_gui.py'
--- ubuntu_sso/tests/test_gui.py	2010-08-27 15:09:43 +0000
+++ ubuntu_sso/tests/test_gui.py	2010-08-27 21:46:39 +0000
@@ -364,11 +364,13 @@
     def assert_warnings_visibility(self, visible=False):
         """Every warning label should be 'visible'."""
         msg = '"%s" should be %svisible.'
-        warnings = filter(lambda name: 'warning' in name, self.ui.widgets)
-        for name in warnings:
+        for name in self.ui.widgets:
             widget = getattr(self.ui, name)
-            self.assertEqual(visible, widget.get_property('visible'),
-                             msg % (name, '' if visible else 'not '))
+            if 'warning' in name:
+                self.assertEqual(visible, widget.get_property('visible'),
+                                 msg % (name, '' if visible else 'not '))
+            elif 'entry' in name:
+                self.assertEqual(widget.warning, '')
 
     def assert_correct_label_warning(self, label, message):
         """Check that a warning is shown displaying 'message'."""
@@ -541,7 +543,7 @@
 
     def test_initial_size_for_labels(self):
         """Labels have the correct width."""
-        expected = (self.ui.window.get_size_request()[0], -1)
+        expected = (int(self.ui.window.get_size_request()[0] * 0.9), -1)
         msg = 'Label %r must have size request %s (got %s instead).'
         labels = [i for i in self.ui.widgets if 'label' in i]
         for label in labels:
@@ -559,7 +561,7 @@
 
     def test_warning_fields_are_hidden(self):
         """Every warning label should be not visible."""
-        self.assert_warnings_visibility(visible=False)
+        self.assert_warnings_visibility()
 
     def test_cancel_buttons_close_window(self):
         """Every cancel button should close the window when clicked."""
@@ -612,7 +614,7 @@
         self.assertEqual(self._called, ((xid,), {}))
 
 
-class RegistrationEnterDetailsTestCase(UbuntuSSOClientTestCase):
+class EnterDetailsTestCase(UbuntuSSOClientTestCase):
     """Test suite for the user registration (enter details page)."""
 
     def test_initial_text_for_header_label(self):
@@ -914,12 +916,12 @@
     test_tc_browser_opens_the_proper_uri.skip = 'The freaking test wont work.'
 
 
-class UserRegistrationErrorTestCase(UbuntuSSOClientTestCase):
+class RegistrationErrorTestCase(UbuntuSSOClientTestCase):
     """Test suite for the user registration error handling."""
 
     def setUp(self):
         """Init."""
-        super(UserRegistrationErrorTestCase, self).setUp()
+        super(RegistrationErrorTestCase, self).setUp()
         self.click_join_with_valid_data()
 
     def test_previous_page_is_shown(self):
@@ -992,11 +994,11 @@
         self.click_verify_email_with_valid_data()
         self.assert_pages_visibility(processing=True)
 
-    def test_no_warning_messages_if_valid_data_on_verify_token(self):
+    def test_no_warning_messages_if_valid_data(self):
         """No warning messages are shown if the data is valid."""
         # this will certainly NOT generate warnings
         self.click_verify_email_with_valid_data()
-        self.assert_warnings_visibility(visible=False)
+        self.assert_warnings_visibility()
 
     def test_on_email_validated_shows_success_page(self):
         """On email validated the success page is shown."""
@@ -1060,6 +1062,42 @@
         self.assertTrue(self._called)
 
 
+class VerifyEmailValidationTestCase(UbuntuSSOClientTestCase):
+    """Test suite for the user registration (verify email page)."""
+
+    def setUp(self):
+        """Init."""
+        super(VerifyEmailValidationTestCase, self).setUp()
+        self.ui.on_user_registered(app_name=APP_NAME, email=EMAIL)
+
+    def test_warning_is_shown_if_empty_email_token(self):
+        """A warning message is shown if email token is empty."""
+        self.ui.email_token_entry.set_text('')
+
+        self.ui.verify_token_button.clicked()
+
+        self.assert_correct_entry_warning(self.ui.email_token_entry,
+                                          self.ui.FIELD_REQUIRED)
+        self.assertNotIn('validate_email', self.ui.backend._called)
+
+    def test_no_warning_messages_if_valid_data(self):
+        """No warning messages are shown if the data is valid."""
+        # this will certainly NOT generate warnings
+        self.click_verify_email_with_valid_data()
+
+        self.assert_warnings_visibility()
+
+    def test_no_warning_messages_if_valid_data_after_invalid_data(self):
+        """No warnings if the data is valid (with prior invalid data)."""
+        # this will certainly generate warnings
+        self.ui.verify_token_button.clicked()
+
+        # this will certainly NOT generate warnings
+        self.click_verify_email_with_valid_data()
+
+        self.assert_warnings_visibility()
+
+
 class RegistrationValidationTestCase(UbuntuSSOClientTestCase):
     """Test suite for the user registration  validations."""
 
@@ -1072,7 +1110,7 @@
         """A warning message is shown if name is empty."""
         self.ui.name_entry.set_text('')
 
-        self.ui.join_ok_button.clicked()  # submit form
+        self.ui.join_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.name_entry,
                                           self.ui.FIELD_REQUIRED)
@@ -1083,7 +1121,7 @@
         self.ui.email1_entry.set_text('')
         self.ui.email2_entry.set_text('')
 
-        self.ui.join_ok_button.clicked()  # submit form
+        self.ui.join_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.email1_entry,
                                           self.ui.FIELD_REQUIRED)
@@ -1096,7 +1134,7 @@
         self.ui.email1_entry.set_text(EMAIL)
         self.ui.email2_entry.set_text(EMAIL * 2)
 
-        self.ui.join_ok_button.clicked()  # submit form
+        self.ui.join_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.email1_entry,
                                           self.ui.EMAIL_MISMATCH)
@@ -1109,7 +1147,7 @@
         self.ui.email1_entry.set_text('q')
         self.ui.email2_entry.set_text('q')
 
-        self.ui.join_ok_button.clicked()  # submit form
+        self.ui.join_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.email1_entry,
                                           self.ui.EMAIL_INVALID)
@@ -1130,7 +1168,7 @@
         self.ui.password1_entry.set_text(PASSWORD)
         self.ui.password2_entry.set_text(PASSWORD * 2)
 
-        self.ui.join_ok_button.clicked()  # submit form
+        self.ui.join_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.password1_entry,
                                           self.ui.PASSWORD_MISMATCH)
@@ -1145,7 +1183,7 @@
             self.ui.password1_entry.set_text(w)
             self.ui.password2_entry.set_text(w)
 
-            self.ui.join_ok_button.clicked()  # submit form
+            self.ui.join_ok_button.clicked()
 
             self.assert_correct_entry_warning(self.ui.password1_entry,
                                               self.ui.PASSWORD_TOO_WEAK)
@@ -1158,7 +1196,7 @@
         # don't agree to TC
         self.ui.yes_to_tc_checkbutton.set_active(False)
 
-        self.ui.join_ok_button.clicked()  # submit form
+        self.ui.join_ok_button.clicked()
 
         self.assert_correct_label_warning(self.ui.tc_warning_label,
                                           self.ui.TC_NOT_ACCEPTED)
@@ -1169,18 +1207,18 @@
         # captcha solution will be empty
         self.ui.captcha_solution_entry.set_text('')
 
-        self.ui.join_ok_button.clicked()  # submit form
+        self.ui.join_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.captcha_solution_entry,
                                           self.ui.FIELD_REQUIRED)
         self.assertNotIn('register_user', self.ui.backend._called)
 
-    def test_no_warning_messages_if_valid_data_on_enter_details(self):
+    def test_no_warning_messages_if_valid_data(self):
         """No warning messages are shown if the data is valid."""
         # this will certainly NOT generate warnings
         self.click_join_with_valid_data()
 
-        self.assert_warnings_visibility(visible=False)
+        self.assert_warnings_visibility()
 
     def test_no_warning_messages_if_valid_data_after_invalid_data(self):
         """No warnings if the data is valid (with prior invalid data)."""
@@ -1190,7 +1228,7 @@
         # this will certainly NOT generate warnings
         self.click_join_with_valid_data()
 
-        self.assert_warnings_visibility(visible=False)
+        self.assert_warnings_visibility()
 
 
 class LoginTestCase(UbuntuSSOClientTestCase):
@@ -1331,7 +1369,7 @@
         """A warning message is shown if email is empty."""
         self.ui.login_email_entry.set_text('')
 
-        self.ui.login_ok_button.clicked()  # submit form
+        self.ui.login_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.login_email_entry,
                                           self.ui.FIELD_REQUIRED)
@@ -1341,7 +1379,7 @@
         """A warning message is shown if email is invalid."""
         self.ui.login_email_entry.set_text('q')
 
-        self.ui.login_ok_button.clicked()  # submit form
+        self.ui.login_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.login_email_entry,
                                           self.ui.EMAIL_INVALID)
@@ -1351,7 +1389,7 @@
         """A warning message is shown if password is empty."""
         self.ui.login_password_entry.set_text('')
 
-        self.ui.login_ok_button.clicked()  # submit form
+        self.ui.login_ok_button.clicked()
 
         self.assert_correct_entry_warning(self.ui.login_password_entry,
                                           self.ui.FIELD_REQUIRED)
@@ -1362,7 +1400,7 @@
         # this will certainly NOT generate warnings
         self.click_connect_with_valid_data()
 
-        self.assert_warnings_visibility(visible=False)
+        self.assert_warnings_visibility()
 
     def test_no_warning_messages_if_valid_data_after_invalid_data(self):
         """No warnings if the data is valid (with prior invalid data)."""
@@ -1372,7 +1410,7 @@
         # this will certainly NOT generate warnings
         self.click_connect_with_valid_data()
 
-        self.assert_warnings_visibility(visible=False)
+        self.assert_warnings_visibility()
 
 
 class ResetPasswordTestCase(UbuntuSSOClientTestCase):
@@ -1503,6 +1541,50 @@
         self.assertTrue(self._called)
 
 
+class ResetPasswordValidationTestCase(UbuntuSSOClientTestCase):
+    """Test suite for the password reset validations."""
+
+    def test_warning_is_shown_if_empty_email(self):
+        """A warning message is shown if emails are empty."""
+        self.ui.reset_email_entry.set_text(' ')
+
+        self.ui.request_password_token_ok_button.set_sensitive(True)
+        self.ui.request_password_token_ok_button.clicked()
+
+        self.assert_correct_entry_warning(self.ui.reset_email_entry,
+                                          self.ui.FIELD_REQUIRED)
+        self.assertNotIn('request_password_reset_token',
+                         self.ui.backend._called)
+
+    def test_warning_is_shown_if_invalid_email(self):
+        """A warning message is shown if email is invalid."""
+        self.ui.reset_email_entry.set_text('q')
+
+        self.ui.request_password_token_ok_button.clicked()
+
+        self.assert_correct_entry_warning(self.ui.reset_email_entry,
+                                          self.ui.EMAIL_INVALID)
+        self.assertNotIn('request_password_reset_token',
+                         self.ui.backend._called)
+
+    def test_no_warning_messages_if_valid_data(self):
+        """No warning messages are shown if the data is valid."""
+        # this will certainly NOT generate warnings
+        self.click_request_password_token_with_valid_data()
+
+        self.assert_warnings_visibility()
+
+    def test_no_warning_messages_if_valid_data_after_invalid_data(self):
+        """No warnings if the data is valid (with prior invalid data)."""
+        # this will certainly generate warnings
+        self.ui.request_password_token_ok_button.clicked()
+
+        # this will certainly NOT generate warnings
+        self.click_request_password_token_with_valid_data()
+
+        self.assert_warnings_visibility()
+
+
 class SetNewPasswordTestCase(UbuntuSSOClientTestCase):
     """Test suite for setting a new password functionality."""
 
@@ -1602,6 +1684,76 @@
         self.assertTrue(self._called)
 
 
+class SetNewPasswordValidationTestCase(UbuntuSSOClientTestCase):
+    """Test suite for validations for setting a new password."""
+
+    def test_warning_is_shown_if_reset_code_empty(self):
+        """A warning message is shown if reset_code is empty."""
+        self.ui.reset_code_entry.set_text('')
+
+        self.ui.set_new_password_ok_button.set_sensitive(True)
+        self.ui.set_new_password_ok_button.clicked()
+
+        self.assert_correct_entry_warning(self.ui.reset_code_entry,
+                                          self.ui.FIELD_REQUIRED)
+        self.assertNotIn('set_new_password', self.ui.backend._called)
+
+    def test_password_help_is_always_shown(self):
+        """Password help text is correctly displayed."""
+        visible = self.ui.reset_password_help_label.get_property('visible')
+        self.assertTrue(visible, 'password help text is visible.')
+        self.assertEqual(self.ui.reset_password_help_label.get_text(),
+                         self.ui.PASSWORD_HELP)
+        self.assertNotIn('set_new_password', self.ui.backend._called)
+
+    def test_warning_is_shown_if_password_mismatch(self):
+        """A warning message is shown if password doesn't match."""
+        self.ui.reset_password1_entry.set_text(PASSWORD)
+        self.ui.reset_password2_entry.set_text(PASSWORD * 2)
+
+        self.ui.set_new_password_ok_button.set_sensitive(True)
+        self.ui.set_new_password_ok_button.clicked()
+
+        self.assert_correct_entry_warning(self.ui.reset_password1_entry,
+                                          self.ui.PASSWORD_MISMATCH)
+        self.assert_correct_entry_warning(self.ui.reset_password2_entry,
+                                          self.ui.PASSWORD_MISMATCH)
+        self.assertNotIn('set_new_password', self.ui.backend._called)
+
+    def test_warning_is_shown_if_password_too_weak(self):
+        """A warning message is shown if password is too weak."""
+        # password will match but will be too weak
+        for w in ('', 'h3lloWo', PASSWORD.lower(), 'helloWorld'):
+            self.ui.reset_password1_entry.set_text(w)
+            self.ui.reset_password2_entry.set_text(w)
+
+            self.ui.set_new_password_ok_button.set_sensitive(True)
+            self.ui.set_new_password_ok_button.clicked()
+
+            self.assert_correct_entry_warning(self.ui.reset_password1_entry,
+                                              self.ui.PASSWORD_TOO_WEAK)
+            self.assert_correct_entry_warning(self.ui.reset_password2_entry,
+                                              self.ui.PASSWORD_TOO_WEAK)
+        self.assertNotIn('set_new_password', self.ui.backend._called)
+
+    def test_no_warning_messages_if_valid_data(self):
+        """No warning messages are shown if the data is valid."""
+        # this will certainly NOT generate warnings
+        self.click_set_new_password_with_valid_data()
+
+        self.assert_warnings_visibility()
+
+    def test_no_warning_messages_if_valid_data_after_invalid_data(self):
+        """No warnings if the data is valid (with prior invalid data)."""
+        # this will certainly generate warnings
+        self.ui.set_new_password_ok_button.clicked()
+
+        # this will certainly NOT generate warnings
+        self.click_set_new_password_with_valid_data()
+
+        self.assert_warnings_visibility()
+
+
 class DbusTestCase(UbuntuSSOClientTestCase):
     """Test suite for the dbus calls."""