Merge lp:~nskaggs/ubuntu-ui-toolkit/add-popover-object-support into lp:ubuntu-ui-toolkit

[Nicholas Skaggs]

Add objectname support to ActionSelectionPopover

Add objectname support to ActionSelectionPopover

[Nicholas Skaggs (nskaggs)]

Needs to add tests . . .

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1037
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2100/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1503/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2474/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1448/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2100/rebuild

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

So I don't forget :-)

elopio> 56 + if button is None:
<elopio> 57 + raise _common.ToolkitException(
<elopio> 58 + 'Button with text "{0}" not found.'.format(text))
<elopio> that's old autopilot. Now select_single will raise an exception instead of returning None.

[Nicholas Skaggs (nskaggs)]

Also add logger.warn to deprecated click by text

add a logger.warn('This is dreprecated, please use this other one.')

[Zsombor Egri (zsombi)]

> Also add logger.warn to deprecated click by text
>
> add a logger.warn('This is dreprecated, please use this other one.')

Nikchiolas, is this MR still valid? If yes, please re-submit to staging! Thx ;)

review: Needs Information

[Zsombor Egri (zsombi)]

> Also add logger.warn to deprecated click by text
>
> add a logger.warn('This is dreprecated, please use this other one.')

Nikchiolas, is this MR still valid? If yes, please re-submit to staging! Thx ;)

review: Needs Information

Unmerged revisions

1037. By Nicholas Skaggs on 2014-07-02

add objectname support to ActionSelectionPopover

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2014-04-25 18:39:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2014-07-02 21:36:22 +0000
@@ -28,39 +28,61 @@
 class ActionSelectionPopover(_common.UbuntuUIToolkitCustomProxyObjectBase):
     """ActionSelectionPopover Autopilot emulator."""
 
+
+    def click_button(self, object_name):
+        """Click a button on the popover.
+
+        :parameter object_name: The QML objectName property of the button.
+        :raise ToolkitException: If the object is not found.
+
+        """
+        if not self.visible:
+            raise _common.ToolkitException('The popover is not open.')
+        button = self._get_button(object_name)
+        self._click_button(button)
+
+
     def click_button_by_text(self, text):
         """Click a button on the popover.
 
-        XXX We are receiving the text because there's no way to set the
-        objectName on the action. This is reported at
-        https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
-        --elopio - 2013-07-25
-
         :parameter text: The text of the button.
         :raise ToolkitException: If the popover is not open.
 
         """
         if not self.visible:
             raise _common.ToolkitException('The popover is not open.')
-        button = self._get_button(text)
-        if button is None:
-            raise _common.ToolkitException(
-                'Button with text "{0}" not found.'.format(text))
+        button = self._get_button_by_text(text)
+        self._click_button(button)
+
+    def _get_button_by_text(self, text):
+        buttons = self.select_many('Empty')
+        for obj in buttons:
+            if obj.text == text:
+                button = obj
+                break
+        if button is None:
+            raise _common.ToolkitException(
+                'Button with text "{0}" not found.'.format(text))
+        return button
+
+    def _get_button(self, object_name):
+        button = self.select_single('Standard', objectName=object_name)
+        if button is None:
+            raise _common.ToolkitException(
+                'Button with text "{0}" not found.'.format(text))
+        return button
+
+    def _click_button(self, button):
         self.pointing_device.click_object(button)
         if self.autoClose:
             try:
+                #currently this fails due to
+                #https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1336945
                 self.visible.wait_for(False)
             except dbus.StateNotFoundError:
                 # The popover was removed from the tree.
                 pass
 
-    def _get_button(self, text):
-        buttons = self.select_many('Empty')
-        for button in buttons:
-            if button.text == text:
-                return button
-
-
 class ComposerSheet(_common.UbuntuUIToolkitCustomProxyObjectBase):
     """ComposerSheet Autopilot emulator."""