Merge lp:~nataliabidart/ubuntuone-windows-installer/setup-button into lp:ubuntuone-windows-installer

[Natalia Bidart]

- Improved the test suite for set_up_button handling.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~nataliabidart/ubuntuone-windows-installer/setup-button]

66. By Natalia Bidart on 2011-09-16

Merged trunk in.

67. By Natalia Bidart on 2011-09-16

All test green.

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'run-tests'
--- run-tests	2011-08-24 15:24:03 +0000
+++ run-tests	2011-09-16 13:04:24 +0000
@@ -27,7 +27,8 @@
 fi
 
 style_check() {
-    u1lint --ignore ubuntuone_installer/gui/qt/ui
+    ./setup.py clean
+    u1lint
     if [ -x `which pep8` ]; then
         pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat .
     else
 
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-15 19:10:23 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-16 13:04:24 +0000
@@ -305,8 +305,8 @@
         # Add the pages in the right order
         # pylint: disable=C0103
 
-        self.LICENSE_PAGE = LicensePage()
-        self.LICENSE_PAGE_ID = self.addPage(self.LICENSE_PAGE)
+        self.license_page = LicensePage()
+        self.LICENSE_PAGE = self.addPage(self.license_page)
 
         #SSO Pages
         title_page = TITLE_STYLE % SIGN_IN
@@ -389,7 +389,7 @@
         self.button(QtGui.QWizard.NextButton).setDefault(True)
 
         if installing:
-            self.setStartId(self.LICENSE_PAGE_ID)
+            self.setStartId(self.LICENSE_PAGE)
         else:
             self.setStartId(self.SIGNIN_PAGE)
         self.restart()
@@ -440,7 +440,7 @@
         # Finished, not cancelled
         if result == 1:  # Cancelled
             qt.utils.start_control_panel()
-        elif self.currentId() == self.LICENSE_PAGE_ID:
+        elif self.currentId() == self.LICENSE_PAGE:
             if not AreYouSure(self).exec_():
                 qt.utils.uninstall_application()
             else:
 
=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-09-15 18:00:49 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-09-16 13:04:24 +0000
@@ -25,6 +25,7 @@
 
 from ubuntu_sso.qt import common
 from ubuntu_sso.qt import gui as sso_gui
+from ubuntu_sso.utils.ui import SET_UP_ACCOUNT_BUTTON
 
 from ubuntuone_installer.gui.qt import enhanced_check_box
 
@@ -98,9 +99,10 @@
             self.wizard().customButtonClicked.disconnect()
         except TypeError:
             pass
-        self.setButtonText(QtGui.QWizard.CustomButton3, _('Set Up Account'))
+        self.setButtonText(QtGui.QWizard.CustomButton3, SET_UP_ACCOUNT_BUTTON)
         self.set_up_button = self.wizard().button(QtGui.QWizard.CustomButton3)
         self.set_up_button.clicked.connect(self.wizard().overlay.show)
+        self.set_up_button.clicked.connect(self.controller.set_next_validation)
         self.set_up_button.setEnabled(False)
 
         self.ui.name_label.setText(NAME)
 
=== modified file 'ubuntuone_installer/gui/qt/tests/__init__.py'
--- ubuntuone_installer/gui/qt/tests/__init__.py	2011-09-01 18:12:12 +0000
+++ ubuntuone_installer/gui/qt/tests/__init__.py	2011-09-16 13:04:24 +0000
@@ -18,8 +18,11 @@
 
 """The test suite for the Qt UI of the Ubuntu One Installer."""
 
+from PyQt4 import QtGui, QtCore
+from ubuntuone.controlpanel.gui.qt import loadingoverlay
+
+from ubuntuone_installer.gui.tests import FakedObject
 from ubuntuone_installer.tests import TestCase
-from ubuntuone_installer.gui.tests import FakedObject
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
 # pylint: disable=W0201, W0212
@@ -34,6 +37,106 @@
     exposed_methods = ['setupUi']
 
 
+class FakeSignal(object):
+
+    """A fake PyQt signal."""
+
+    def __init__(self, *args, **kwargs):
+        """Initialize."""
+        self.target = None
+
+    def connect(self, target):
+        """Fake connect."""
+        self.target = target
+
+    def disconnect(self, *args):
+        """Fake disconnect."""
+        self.target = None
+
+    def emit(self, *args):
+        """Fake emit."""
+        if self.target:
+            self.target(*args)
+
+
+class FakeController(object):
+
+    """A fake controller for the tests."""
+
+    is_fake = True
+    set_next_validation = lambda *a, **kw: None
+
+    def __init__(self, *args, **kwargs):
+        self.args = (args, kwargs)
+
+    # pylint: disable=C0103
+    def setupUi(self, view):
+        """Fake the setup."""
+    # pylint: enable=C0103
+
+
+class FakeOverlay(object):
+
+    """A fake delay overlay."""
+
+    def __init__(self, *args, **kwargs):
+        """Initialize."""
+        self.show_counter = 0
+        self.hide_counter = 0
+        self.args = (args, kwargs)
+
+    def show(self):
+        """Fake show."""
+        self.show_counter += 1
+
+    def hide(self):
+        """Fake hide."""
+        self.hide_counter += 1
+
+    def resize(self, *args):
+        """Fake resize."""
+
+
+class FakeWizard(object):
+    """Replace wizard() function on wizard pages."""
+
+    customButtonClicked = QtCore.QObject()
+
+    def __init__(self):
+        self.overlay = FakeOverlay()
+        self.called = []
+        self.buttons = {}
+
+    # Invalid name "setButtonLayout", "setOption"
+    # pylint: disable=C0103
+
+    def setButtonLayout(self, *args, **kwargs):
+        """Fake the functionality of setButtonLayout on QWizard class."""
+        self.called.append(('setButtonLayout', (args, kwargs)))
+
+    def setOption(self, *args, **kwargs):
+        """Fake the functionality of setOption on QWizard class."""
+        self.called.append(('setOption', (args, kwargs)))
+
+    # pylint: enable=C0103
+
+    def button(self, button_id):
+        """Fake the functionality of button on QWizard class."""
+        return self.buttons.setdefault(button_id, QtGui.QPushButton())
+
+
+class FakeWizardPage(object):
+
+    """A fake wizard page."""
+
+    def __init__(self, *args, **kwargs):
+        self.has_back_button = True
+
+    # pylint: disable=C0103
+    def initializePage(self):
+        """Fake initializePage."""
+
+
 class BaseTestCase(TestCase):
     """Base Test Case."""
 
@@ -52,3 +155,5 @@
         if hasattr(self.ui, 'backend'):
             # clean backend calls
             self.ui.backend._called.clear()
+
+        self.patch(loadingoverlay, 'LoadingOverlay', FakeOverlay)
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-15 22:02:03 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-16 13:04:24 +0000
@@ -25,21 +25,14 @@
 
 from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import gui, forgotten, utils
-from ubuntuone_installer.gui.qt.tests import BaseTestCase, NO_OP
-
-
-class FakeController(object):
-
-    """A fake controller for the tests."""
-
-    def __init__(self, *args, **kwargs):
-        self.args = (args, kwargs)
-
-    # pylint: disable=C0103
-    def setupUi(self, view):
-        """Fake the setup."""
-    # pylint: enable=C0103
-    is_fake = True
+from ubuntuone_installer.gui.qt.tests import (
+    BaseTestCase,
+    FakeController,
+    FakeOverlay,
+    FakeSignal,
+    FakeWizardPage,
+    NO_OP,
+)
 
 
 class FakeAreYouSure(object):
@@ -58,28 +51,6 @@
         return self.result  # Means reject
 
 
-class FakeOverlay(object):
-
-    """A fake delay overlay."""
-
-    def __init__(self, *args, **kwargs):
-        """Initialize."""
-        self.show_counter = 0
-        self.hide_counter = 0
-        self.args = (args, kwargs)
-
-    def show(self):
-        """Fake show."""
-        self.show_counter += 1
-
-    def hide(self):
-        """Fake hide."""
-        self.hide_counter += 1
-
-    def resize(self, *args):
-        """Fake resize."""
-
-
 class FakeLocalFoldersPage(QtGui.QWizardPage):
     """Fake Local Folders Page."""
 
@@ -195,7 +166,7 @@
     def test_with_flag(self):
         """test with flag activated."""
         win = gui.MainWindow(installing=True)
-        self.assertEqual(win.startId(), win.LICENSE_PAGE_ID)
+        self.assertEqual(win.startId(), win.LICENSE_PAGE)
         self.assertEqual(
             unicode(self.ui.sign_in_page.ui.message_label.text()),
             u"")
@@ -244,7 +215,7 @@
 
     def test_execute_uninstall_on_licence_cancel(self):
         """Pressing Disagree button from license page the uninstall is exec."""
-        self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
@@ -255,7 +226,7 @@
 
     def test_execute_uninstall_on_licence_cancel_frozen(self):
         """Pressing Disagree button from license page the uninstall is exec."""
-        self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
@@ -436,7 +407,7 @@
 
     def test_next_hides_overlay(self):
         """Make sure next() hides the overlay."""
-        self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
@@ -447,11 +418,11 @@
 
     def test_insert_remove_critical_message(self):
         """Make sure critical message is added and next() removes it."""
-        self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
-        license_page = self.ui.page(self.ui.LICENSE_PAGE_ID)
+        license_page = self.ui.page(self.ui.LICENSE_PAGE)
         self.assertEqual(self.ui.form_errors_label.parentWidget(), None)
         self.ui.critical("test critical message")
         self.assertEqual(self.ui.form_errors_label.parentWidget(),
@@ -534,7 +505,7 @@
 
     def test_stage_progression_1(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE_ID)
+        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
         self.assertEqual(self.ui.sideWidget().stage, 0)
 
     def test_stage_progression_2(self):
@@ -608,39 +579,22 @@
         # Check if syncdaemon was added to autostart
         self.assertEqual(self._called, ((), {}))
 
-
-class FakeSignal(object):
-
-    """A fake PyQt signal."""
-
-    def __init__(self, *args, **kwargs):
-        """Initialize."""
-        self.target = None
-
-    def connect(self, target):
-        """Fake connect."""
-        self.target = target
-
-    def disconnect(self, *args):
-        """Fake disconnect."""
-        self.target = None
-
-    def emit(self, *args):
-        """Fake emit."""
-        if self.target:
-            self.target(*args)
-
-
-class FakeWizardPage(object):
-
-    """A fake wizard page."""
-
-    def __init__(self, *args, **kwargs):
-        self.has_back_button = True
-
-    # pylint: disable=C0103
-    def initializePage(self):
-        """Fake initializePage."""
+    def test_side_widget_state(self):
+        """Test if the side widget of the wizard has state frame visible."""
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+
+        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
+        self.assertFalse(self.ui.sideWidget().ui.states_frame.isVisible())
+
+        self.ui.on_currentIdChanged(self.ui.SIGNIN_PAGE)
+        self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
+
+        self.ui.on_currentIdChanged(self.ui.local_folders_page_id)
+        self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
+
+        self.ui.on_currentIdChanged(self.ui.CONGRATULATIONS_PAGE)
+        self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
 
 
 class FakeMainWindow(object):
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-13 02:07:43 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-16 13:04:24 +0000
@@ -452,6 +452,7 @@
     @defer.inlineCallbacks
     def test_add_folder_valid_starts_selected(self):
         """When adding a valid folder, it starts as selected."""
+        self.patch(self.ui, 'update_sizes', lambda: None)
         self.patch(QtGui, "QFileDialog", FakeFileDialog())
         yield self.ui.on_add_folder_button_clicked()
         self.assertEqual(
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_setup_account.py'
--- ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-15 18:00:49 +0000
+++ ubuntuone_installer/gui/qt/tests/test_setup_account.py	2011-09-16 13:04:24 +0000
@@ -24,54 +24,13 @@
 
 from ubuntu_sso.qt import common
 
-from ubuntuone_installer.gui.qt import gui, setup_account
-from ubuntuone_installer.gui.qt.tests import BaseTestCase
-from ubuntuone_installer.gui.qt.ui import (
-    setup_account_ui,
+from ubuntuone_installer.gui.qt import setup_account as gui
+from ubuntuone_installer.gui.qt.tests import (
+    BaseTestCase,
+    FakeController,
+    FakeWizard,
 )
-
-
-class FakeController(object):
-
-    """A fake controller for the tests."""
-
-    def __init__(self, *args, **kwargs):
-        self.args = (args, kwargs)
-
-    # pylint: disable=C0103
-    def setupUi(self, view):
-        """Fake the setup."""
-    # pylint: enable=C0103
-
-
-class FakeWizard(object):
-    """Replace wizard() function on wizard pages."""
-
-    customButtonClicked = QtCore.QObject()
-    overlay = None
-    params = None
-
-    # Invalid name "setButtonLayout"
-    # pylint: disable=C0103
-
-    def setButtonLayout(self, *args, **kwargs):
-        """Fake the functionality of setButtonLayout on QWizard class."""
-        FakeWizard.params = (args, kwargs)
-
-    # pylint: enable=C0103
-
-    # Invalid name "setOption"
-    # pylint: disable=C0103
-
-    def setOption(self, *args, **kwargs):
-        """Fake the functionality of setOption on QWizard class."""
-        FakeWizard.params = (args, kwargs)
-
-    # pylint: enable=C0103
-
-    def button(self, *args, **kwargs):
-        """Fake the functionality of button on QWizard class."""
-        return QtGui.QPushButton()
+from ubuntuone_installer.gui.qt.ui import setup_account_ui
 
 
 class FakeValidationDict(object):
@@ -108,7 +67,7 @@
 class SetupAccountTestCase(BaseTestCase):
     """Test the SetupAccountPage code."""
 
-    class_ui = setup_account.SetupAccountPage
+    class_ui = gui.SetupAccountPage
     kwargs = dict(
         ui=setup_account_ui.Ui_SetUpAccountPage(),
         controller=FakeController(),
@@ -138,7 +97,7 @@
         self.assertTrue(self.ui.ui.name_assistance.isVisible())
         self.assertEqual(
             unicode(self.ui.ui.name_assistance.text()),
-            setup_account.ERROR % setup_account.EMPTY_NAME)
+            gui.ERROR % gui.EMPTY_NAME)
         self.ui.hide()
 
     def test_password_default_assistance(self):
@@ -163,19 +122,6 @@
             unicode(self.ui.ui.password_assistance.text()),
         )
 
-    def test_side_widget_state(self):
-        """Test if the side widget of the wizard has state frame visible."""
-        if type(self.ui) != gui.MainWindow:
-            return
-        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
-        self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
-        self.ui.on_currentIdChanged(self.ui.SIGNIN_PAGE)
-        self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
-        self.ui.on_currentIdChanged(self.ui.local_folders_page_id)
-        self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
-        self.ui.on_currentIdChanged(self.ui.CONGRATULATIONS_PAGE)
-        self.assertTrue(self.ui.sideWidget().ui.states_frame.isVisible())
-
     def test_focus_changed_1(self):
         """Check functions execution when focus_changed() is executed."""
         self.patch(self.ui, 'validation_functions', FakeValidationDict())
@@ -216,7 +162,7 @@
 class SetupAccountFakeWizardTestCase(BaseTestCase):
     """Test the SetupAccountPage code."""
 
-    class_ui = setup_account.SetupAccountPage
+    class_ui = gui.SetupAccountPage
     kwargs = dict(
         ui=setup_account_ui.Ui_SetUpAccountPage(),
         controller=FakeController(),
@@ -228,7 +174,60 @@
         # Faking each SSO object instead of doing it lower
         # so we don't rely on any SSO behaviour
         super(SetupAccountFakeWizardTestCase, self).setUp()
-        self.patch(self.ui, 'wizard', FakeWizard)
+        self.wizard = FakeWizard()
+        self.patch(self.ui, 'wizard', lambda: self.wizard)
+
+    def test_initialize_page(self):
+        """Widgets are properly initialized."""
+        self.ui.initializePage()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+
+        # titles
+        self.assertEqual(self.ui.header.title_label.text(),
+                         gui.TITLE_STYLE % gui.TITLE)
+        self.assertEqual(self.ui.header.subtitle_label.text(), gui.SUBTITLE)
+
+        # set up account button
+        expected = [QtGui.QWizard.BackButton, QtGui.QWizard.Stretch,
+                    QtGui.QWizard.CustomButton3]
+        self.assertIn(('setButtonLayout', ((expected,), {})),
+                       self.ui.wizard().called)
+        self.assertEqual(gui.SET_UP_ACCOUNT_BUTTON,
+                         self.ui.buttonText(QtGui.QWizard.CustomButton3))
+        self.assertTrue(self.ui.wizard().button(QtGui.QWizard.CustomButton3) is
+                        self.ui.set_up_button)
+        self.assertFalse(self.ui.set_up_button.isEnabled())
+
+        # labels
+        self.assertEqual(self.ui.ui.name_label.text(), gui.NAME)
+        self.assertEqual(self.ui.ui.email_label.text(), gui.EMAIL)
+        self.assertEqual(self.ui.ui.confirm_email_label.text(),
+                         gui.RETYPE_EMAIL)
+        self.assertEqual(self.ui.ui.password_label.text(),
+                         gui.PASSWORD)
+        self.assertEqual(self.ui.ui.confirm_password_label.text(),
+                         gui.RETYPE_PASSWORD)
+        self.assertFalse(self.ui.ui.password_info_label.isVisible())
+
+        # assistants
+        self.assertFalse(self.ui.ui.name_assistance.isVisible())
+        self.assertFalse(self.ui.ui.email_assistance.isVisible())
+        self.assertFalse(self.ui.ui.confirm_email_assistance.isVisible())
+        self.assertFalse(self.ui.ui.password_assistance.isVisible())
+        self.assertTrue(self.ui.ui.refresh_label.isVisible())
+
+    def test_set_up_button_clicked(self):
+        """Validation and overlay is shown when the setupbutton is clicked."""
+        self.patch(self.ui.controller, 'set_next_validation', self._set_called)
+        self.ui.initializePage()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+
+        self.ui.set_up_button.clicked.emit(False)
+
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 1)
+        self.assertEqual(self._called, ((False,), {}))
 
     def test_set_error_message(self):
         """Check the state of the label after calling: set_error_message."""
@@ -239,7 +238,7 @@
         self.assertTrue(self.ui.ui.email_assistance.isVisible())
         self.assertEqual(
             unicode(self.ui.ui.email_assistance.text()),
-            setup_account.ERROR % "message")
+            gui.ERROR % "message")
 
     def test_blank_name(self):
         """Status when the name field is blank (spaces).
@@ -254,7 +253,7 @@
         self.assertTrue(self.ui.ui.name_assistance.isVisible())
         self.assertEqual(
             unicode(self.ui.ui.name_assistance.text()),
-            setup_account.ERROR % setup_account.EMPTY_NAME)
+            gui.ERROR % gui.EMPTY_NAME)
         self.ui.hide()
 
     def test_valid_name(self):
@@ -282,7 +281,7 @@
         self.assertTrue(self.ui.ui.email_assistance.isVisible())
         self.assertEqual(
             unicode(self.ui.ui.email_assistance.text()),
-            setup_account.ERROR % setup_account.INVALID_EMAIL)
+            gui.ERROR % gui.INVALID_EMAIL)
 
     def test_valid_email(self):
         """Status when the email field has a @.
@@ -323,7 +322,7 @@
         self.assertTrue(self.ui.ui.confirm_email_assistance.isVisible())
         self.assertEqual(
             unicode(self.ui.ui.confirm_email_assistance.text()),
-            setup_account.ERROR % setup_account.EMAIL_MATCH)
+            gui.ERROR % gui.EMAIL_MATCH)
         self.ui.hide()
 
     def test_focus_changed_password_visibility(self):