Merge lp:~fboucault/camera-app/tap_exits_options into lp:camera-app

[Florian Boucault]

Exit the options overlay upon tapping anywhere outside the buttons.
It used to work relying on the behaviour of the toolkit's Panel but it recently changed under our feet (rev 1000.119.19 from lp:ubuntu-ui-toolkit).

[lp:~fboucault/camera-app/tap_exits_options]

326. By Florian Boucault on 2014-07-28

Empty commit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/camera-app-ci/240/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2067
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/361
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/330
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2320
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2320/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/240/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

That looks good. Can you add an autopilot test?

[lp:~fboucault/camera-app/tap_exits_options]

327. By Florian Boucault on 2014-07-29

Added autopilot test.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/camera-app-ci/243/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/221
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/336
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2374
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2374/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/243/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

49 + def tearDown(self):
50 + super(TestCameraFlash, self).tearDown()

This is useless and can be safely removed.

[Olivier Tilloy (osomon)]

31 +from testtools.matchers import Equals, NotEquals
36 +import unittest

NotEquals and unittest are imported but unused.

[Olivier Tilloy (osomon)]

46 + self.assertThat(
47 + self.main_window.get_qml_view().visible, Eventually(Equals(True)))

This assertion probably belongs in CameraAppTestCase.setUp() (but it’s ok if you address that separately).

[lp:~fboucault/camera-app/tap_exits_options]

328. By Florian Boucault on 2014-07-29

Removed useless imports. Removed useless tearDown. Renamed class to make sense. Added FIXME.

[Florian Boucault (fboucault)]

All fixed now, thanks.

[Olivier Tilloy (osomon)]

Looks good now, thanks!

review: Approve

=== modified file 'ViewFinderOverlay.qml'
--- ViewFinderOverlay.qml	2014-07-17 13:39:48 +0000
+++ ViewFinderOverlay.qml	2014-07-29 16:40:38 +0000
@@ -75,6 +75,12 @@
         }
     }
 
+    MouseArea {
+        id: bottomEdgeClose
+        anchors.fill: parent
+        onClicked: bottomEdge.close()
+    }
+
     Panel {
         id: bottomEdge
         anchors {

=== added file 'tests/autopilot/camera_app/tests/test_options.py'
--- tests/autopilot/camera_app/tests/test_options.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/camera_app/tests/test_options.py	2014-07-29 16:40:38 +0000
@@ -0,0 +1,42 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2014 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+"""Tests for the Camera App options overlay"""
+
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+
+from camera_app.tests import CameraAppTestCase
+
+class TestCameraOptions(CameraAppTestCase):
+    """Tests the options overlay"""
+
+    """ This is needed to wait for the application to start.
+        In the testfarm, the application may take some time to show up."""
+    def setUp(self):
+        super(TestCameraOptions, self).setUp()
+        # FIXME: this should be in parent class
+        self.assertThat(
+            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
+
+    """Test that the options overlay closes properly by tapping"""
+    def test_overlay_tap_to_close(self):
+        bottom_edge = self.main_window.get_bottom_edge()
+        bottom_edge.open()
+
+        # check overlay is opened
+        self.assertThat(bottom_edge.opened, Eventually(Equals(True)))
+
+        # tap to close overlay
+        root = self.main_window.get_root()
+        x = root.globalRect.x + root.width / 2.0
+        y = root.globalRect.y + root.height / 4.0
+        self.pointing_device.move(x, y)
+        self.pointing_device.click()
+
+        # check overlay is closed
+        self.assertThat(bottom_edge.opened, Eventually(Equals(False)))