Merge lp:~acerisara/ubuntu-calculator-app/check-button-pressed into lp:ubuntu-calculator-app

[Andrea Cerisara]

Added check button has been pressed.

Added check button has been pressed. Should avoid failing on Jenkins.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:53
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/39/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/567
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-vivid-amd64-ci/39

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-reboot-ci/39/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Wow, that was fast!
lgtm, thanks!

review: Approve

=== modified file 'app/tests/autopilot/ubuntu_calculator_app/__init__.py'
--- app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-01-03 19:22:22 +0000
+++ app/tests/autopilot/ubuntu_calculator_app/__init__.py	2015-01-06 19:54:52 +0000
@@ -86,7 +86,22 @@
         button = self.wait_select_single('KeyboardButton',
                                          objectName=MainView.BUTTONS[button])
 
-        self.pointing_device.click_object(button)
+        button_area = button.wait_select_single('QQuickMouseArea',
+                                                objectName='buttonMA')
+
+        self.pointing_device.move_to_object(button)
+        # we use press and release so we can check the qml property
+        # and ensure the button is pressed long enough to be recieved
+        # and processed correctly
+        # using a larger press_duration for click_object would be inferior
+        # as it would cause longer delays (we are forced to arbitrarily decide
+        # how long to press each time) and potentially fail.
+        # Also, https://bugs.launchpad.net/autopilot/+bug/1366949
+        # causes press_duration argument to be ignored currently
+        # balloons 2014-09-08
+        self.pointing_device.press()
+        button_area.pressed.wait_for(True)
+        self.pointing_device.release()
 
     def get_history(self):
         history = self.wait_select_single('ScrollableView',

=== modified file 'app/ui/KeyboardButton.qml'
--- app/ui/KeyboardButton.qml	2014-12-09 08:59:08 +0000
+++ app/ui/KeyboardButton.qml	2015-01-06 19:54:52 +0000
@@ -56,6 +56,7 @@
 
     MouseArea {
         id: buttonMA
+        objectName: "buttonMA"
         anchors.fill: parent
         onClicked: buttonRect.clicked();
     }