camera-app

Merge lp:~om26er/camera-app/gallery_integration_test into lp:camera-app

gallery_integration_test
Merge into trunk

Proposed by Omer Akram on 2013-10-08

Status:

Merged

Approved by:

Omer Akram on 2013-11-21

Approved revision:

219

Merged at revision:

229

Proposed branch:

lp:~om26er/camera-app/gallery_integration_test

Merge into:

lp:camera-app

Diff against target:

75 lines (+52/-0)

3 files modified

debian/control (+1/-0)
tests/autopilot/camera_app/emulators/main_window.py (+4/-0)
tests/autopilot/camera_app/tests/test_gallery_integration.py (+47/-0)

To merge this branch:

bzr merge lp:~om26er/camera-app/gallery_integration_test

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-11-21
Ubuntu Phablet Team		2013-10-08	Pending
Review via email: mp+189797@code.launchpad.net

Commit message

add integration test to make sure gallery icon in the camera toolbar really opens the gallery-app

Description of the change

add integration test to make sure gallery icon in the camera toolbar really opens the gallery-app

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-08:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/camera-app-ci/126/rebuild

review: Approve (continuous-integration)

lp:~om26er/camera-app/gallery_integration_test updated on 2013-10-08

214. By Omer Akram on 2013-10-08: make tearDown less error prone

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-10-08:

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/camera-app-ci/127/rebuild

review: Approve (continuous-integration)

lp:~om26er/camera-app/gallery_integration_test updated on 2013-11-18

215. By Omer Akram on 2013-11-18: simplify the integration test code much
216. By Omer Akram on 2013-11-18: fix integration test
217. By Omer Akram on 2013-11-18: depend -autopilot on unity8-autopilot as we use emulators from there
218. By Omer Akram on 2013-11-18: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-18:

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

review: Needs Fixing (continuous-integration)

lp:~om26er/camera-app/gallery_integration_test updated on 2013-11-19

219. By Omer Akram on 2013-11-19: fix tearDown order

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-11-19:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Omer Akram (om26er) wrote on 2013-11-21:

I ran the tests on mako again and they passed: https://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3554/artifact/results/autopilot/camera_app_results.xml

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-11-21:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Omer Akram

Ubuntu Phablet Team

deaunapaul

 === modified file 'debian/control'
 --- debian/control	2013-11-06 15:08:41 +0000
 +++ debian/control	2013-11-19 14:49:27 +0000
@@ -49,6 +49,7 @@
           libautopilot-qt (>= 1.4),
           libqt5test5,
           libqt5widgets5,
++         unity8-autopilot,
           ${misc:Depends},
           ${shlibs:Depends},
  Description: Test package for the camera app
 === modified file 'tests/autopilot/camera_app/emulators/main_window.py'
 --- tests/autopilot/camera_app/emulators/main_window.py	2013-11-06 13:49:10 +0000
 +++ tests/autopilot/camera_app/emulators/main_window.py	2013-11-19 14:49:27 +0000
@@ -71,3 +71,7 @@
          else:
              return 'portrait'
++    def get_gallery_button(self):
++        """Returns the gallery button on the camera toolbar."""
++        return self.app.select_single(
++            "CameraToolbarButton", objectName="galleryButton")
 === added file 'tests/autopilot/camera_app/tests/test_gallery_integration.py'
 --- tests/autopilot/camera_app/tests/test_gallery_integration.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/camera_app/tests/test_gallery_integration.py	2013-11-19 14:49:27 +0000
@@ -0,0 +1,47 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++# Copyright 2013 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.
++
++from __future__ import absolute_import
++
++from autopilot.introspection import get_proxy_object_for_existing_process
++from autopilot.matchers import Eventually
++from autopilot.platform import model
++from testtools import skipIf
++from testtools.matchers import Equals
++
++from camera_app.tests import CameraAppTestCase
++from unity8 import process_helpers as helpers
++
++import os
++
++
++@skipIf(model() == 'Desktop', "Phablet only")
++class TestGalleryIntegration(CameraAppTestCase):
++
++    def setUp(self):
++        super(TestGalleryIntegration, self).setUp()
++        self.assertThat(
++            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
++
++    def tearDown(self):
++        os.system("pkill gallery-app")
++        super(TestGalleryIntegration, self).tearDown()
++
++    def get_unity8_proxy_object(self):
++        pid = helpers._get_unity_pid()
++        return get_proxy_object_for_existing_process(pid)
++
++    def get_current_focused_appid(self, unity8):
++        return unity8.select_single("Shell").currentFocusedAppId
++
++    def test_gallery_button_opens_gallery(self):
++        gallery_button = self.main_window.get_gallery_button()
++        unity8 = self.get_unity8_proxy_object()
++        current_focused_app = self.get_current_focused_appid(unity8)
++
++        self.pointing_device.click_object(gallery_button)
++        self.assertThat(current_focused_app, Eventually(Equals("gallery-app")))