Merge lp:~elopio/ubuntu-ui-toolkit/ap-toolbar-open-missing_tests into lp:~tpeeters/ubuntu-ui-toolkit/ap-toolbar-open

[Leo Arias]

Added missing tests and fixed pep257.

[lp:~elopio/ubuntu-ui-toolkit/ap-toolbar-open-missing_tests]

836. By Leo Arias on 2013-11-08

We have just asked if the toolbar is opened, no need to open it again.

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2013-11-07 17:47:46 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2013-11-08 10:00:48 +0000
@@ -239,11 +239,12 @@
         self.pointing_device.drag(line_x, start_y, line_x, stop_y)
 
     def click_button(self, object_name):
-        """Click a button of the toolbar. The toolbar should be opened before
-        clicking the button, or an exception will be raised. If the toolbar
-        is closed for some reason (e.g., timer finishes) after moving the mouse cursor
-        and before clicking the button, it is re-opened automatically by
-        this function.
+        """Click a button of the toolbar.
+
+        The toolbar should be opened before clicking the button, or an
+        exception will be raised. If the toolbar is closed for some reason
+        (e.g., timer finishes) after moving the mouse cursor and before
+        clicking the button, it is re-opened automatically by this function.
 
         :parameter object_name: The QML objectName property of the button.
         :raise ToolkitEmulatorException: If there is no button with that object
@@ -258,12 +259,10 @@
         # ensure the toolbar is open
         if not self.opened:
             raise ToolkitEmulatorException(
-                'Toolbar must be opened before calling click_button()')
-        self.open()
+                'Toolbar must be opened before calling click_button().')
         self.pointing_device.move_to_object(button)
         # ensure the toolbar is still open (may have closed due to timeout)
-        if not self.opened:
-            self.open()
+        self.open()
         # click the button
         self.pointing_device.click_object(button)
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-11-07 17:51:46 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2013-11-08 10:00:48 +0000
@@ -61,6 +61,18 @@
         toolbar = self.main_view.get_toolbar()
         self.assertIsInstance(toolbar, emulators.Toolbar)
 
+    def test_open_toolbar(self):
+        with mock.patch.object(emulators.Toolbar, 'open') as mock_open:
+            self.main_view.open_toolbar()
+
+        mock_open.assert_called_once_with()
+
+    def test_close_toolbar(self):
+        with mock.patch.object(emulators.Toolbar, 'close') as mock_close:
+            self.main_view.close_toolbar()
+
+        mock_close.assert_called_once_with()
+
     def test_open_toolbar_returns_the_toolbar(self):
         toolbar = self.main_view.open_toolbar()
         self.assertIsInstance(toolbar, emulators.Toolbar)
@@ -187,6 +199,14 @@
         self.assertEqual(
             error.message, 'Button with objectName "unexisting" not found.')
 
+    def test_click_button_on_closed_toolbar(self):
+        error = self.assertRaises(
+            emulators.ToolkitEmulatorException, self.toolbar.click_button,
+            'buttonName')
+        self.assertEqual(
+            error.message,
+            'Toolbar must be opened before calling click_button().')
+
 
 class TabsTestCase(tests.QMLStringAppTestCase):