Merge lp:~diegosarmentero/ubuntu-sso-client/unicode-args into lp:ubuntu-sso-client

[Diego Sarmentero]

- Decode the content of help_text (LP: #951371).

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'ubuntu_sso/qt/main.py'
--- ubuntu_sso/qt/main.py	2012-03-16 22:33:29 +0000
+++ ubuntu_sso/qt/main.py	2012-03-19 20:20:23 +0000
@@ -41,6 +41,12 @@
         data.append(unicode(qss.data()))
     app.setStyleSheet('\n'.join(data))
 
+    # Fix the string that contains unicode chars.
+    for key in kwargs:
+        value = kwargs[key]
+        if isinstance(value, str):
+            kwargs[key] = value.decode('utf-8')
+
     # Unused variable 'ui', pylint: disable=W0612
     ui = UbuntuSSOClientGUI(close_callback=app.exit, **kwargs)
     style = QtGui.QStyle.alignedRect(

=== modified file 'ubuntu_sso/qt/tests/test_main.py'
--- ubuntu_sso/qt/tests/test_main.py	2012-03-16 22:33:29 +0000
+++ ubuntu_sso/qt/tests/test_main.py	2012-03-19 20:20:23 +0000
@@ -21,6 +21,7 @@
 from twisted.trial.unittest import TestCase
 
 from ubuntu_sso.qt import main
+from ubuntu_sso import tests
 
 
 # pylint: disable=C0103
@@ -36,6 +37,50 @@
         """Fake setGeometry."""
 
     show = setGeometry
+
+
+class FakeDesktop(object):
+
+    """Fake Desktop Widget."""
+
+    def availableGeometry(self):
+        """Fake availableGeometry for desktop.-"""
+        return QtCore.QRect(100, 100, 100, 100)
+
+
+class FakeApplication(object):
+
+    """Fake QApplication."""
+
+    called = {}
+    __instance = None
+
+    def __init__(self, args):
+        self.called['args'] = args
+        FakeApplication.__instance = self
+
+    def setStyleSheet(self, style):
+        """Fake setStyleSheet."""
+        self.called["setStyleSheet"] = style
+
+    def styleSheet(self):
+        """Fake get style sheet."""
+        return self.called.get("setStyleSheet", '')
+
+    def desktop(self):
+        """Fake Desktop."""
+        return FakeDesktop()
+
+    def exec_(self):
+        """Fake exec_."""
+
+    def exit(self):
+        """Fake exit."""
+
+    @classmethod
+    def instance(cls):
+        """Fake instance."""
+        return FakeApplication.__instance
 # pylint: enable=C0103
 
 
@@ -53,17 +98,32 @@
             return FakeUi()
 
         self.patch(main, 'UbuntuSSOClientGUI', called_ui)
-        self.patch(main.QtGui.QApplication, 'exec_',
-                   lambda *a: self.called.append('main'))
+        self.patch(main.QtGui, 'QApplication', FakeApplication)
 
     def test_main(self):
         """Calling main.main() a UI instance is created."""
-
-        kwargs = dict(foo='foo', bar='bar', baz='yadda', yadda=0)
-        main.main(**kwargs)
-
-        kwargs['close_callback'] = main.QtGui.QApplication.instance().exit
-        self.assertEqual(self.called, [('GUI', kwargs), 'main'])
+        kwargs = dict(app_name='APP_NAME', foo='foo', bar='bar',
+            baz='yadda', yadda=0)
+        main.main(**kwargs)
+
+        kwargs['close_callback'] = main.QtGui.QApplication.instance().exit
+        self.assertEqual(self.called, [('GUI', kwargs)])
+
+    def test_main_args(self):
+        """Calling main.main() a UI instance is created."""
+        arg_list = (tests.APP_NAME, tests.NAME, tests.PASSWORD,
+            tests.EMAIL_TOKEN)
+        kwargs = dict(app_name=arg_list[0].encode('utf-8'),
+            foo=arg_list[1].encode('utf-8'),
+            bar=arg_list[2].encode('utf-8'),
+            baz=arg_list[3].encode('utf-8'))
+        main.main(**kwargs)
+
+        kwargs['close_callback'] = main.QtGui.QApplication.instance().exit
+        expected = dict(app_name=arg_list[0], foo=arg_list[1],
+            bar=arg_list[2], baz=arg_list[3],
+            close_callback=main.QtGui.QApplication.instance().exit)
+        self.assertEqual(self.called, [('GUI', expected)])
 
     def test_styles_load(self):
         """Test that all stylesheets load."""
@@ -74,5 +134,5 @@
             qss = QtCore.QResource(qss_name)
             data.append(unicode(qss.data()))
         self.assertEqual(
-        unicode(QtCore.QCoreApplication.instance().styleSheet()),
+        unicode(main.QtGui.QApplication.instance().styleSheet()),
             '\n'.join(data))