camera-app

Merge lp:~phablet-team/camera-app/refactor-and-fix-editor-tests into lp:camera-app

refactor-and-fix-editor-tests
Merge into trunk

Proposed by Ugo Riboni on 2015-02-25

Status:	Merged
Approved by:	Florian Boucault on 2015-03-11
Approved revision:	537
Merged at revision:	534
Proposed branch:	lp:~phablet-team/camera-app/refactor-and-fix-editor-tests
Merge into:	lp:camera-app
Diff against target:	479 lines (+171/-117) 7 files modified tests/autopilot/camera_app/data/__init__.py (+6/-0) tests/autopilot/camera_app/emulators/main_window.py (+4/-2) tests/autopilot/camera_app/emulators/panel.py (+4/-3) tests/autopilot/camera_app/tests/__init__.py (+30/-0) tests/autopilot/camera_app/tests/test_capture.py (+5/-2) tests/autopilot/camera_app/tests/test_gallery_view.py (+63/-73) tests/autopilot/camera_app/tests/test_photo_editor.py (+59/-37)
To merge this branch:	bzr merge lp:~phablet-team/camera-app/refactor-and-fix-editor-tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Florian Boucault (community)		2015-02-25	Approve on 2015-03-11
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-03-10
Review via email: mp+250931@code.launchpad.net

Commit message

Refactor camera editor tests, make them work even if UI extras are not installed, and add a test for the edit button being disabled when on a video

Description of the change

Refactor camera editor tests, make them work even if UI extras are not installed, and add a test for the edit button being disabled when on a video

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-25:

FAILED: Continuous integration, rev:526
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~phablet-team/camera-app/refactor-and-fix-editor-tests/+merge/250931/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/camera-app/refactor-and-fix-editor-tests updated on 2015-02-26

527. By Ugo Riboni on 2015-02-26: Fix very random bug on dragging the panel by maximizing the speed of drag

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-26:

FAILED: Continuous integration, rev:527
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~phablet-team/camera-app/refactor-and-fix-editor-tests/+merge/250931/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-26:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/camera-app/refactor-and-fix-editor-tests updated on 2015-03-09

528. By Ugo Riboni on 2015-03-09: Prevent failure when removing config file if it does not exist

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-09:

FAILED: Continuous integration, rev:527
http://jenkins.qa.ubuntu.com/job/camera-app-ci/405/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/101/console
    None: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/101/console
    None: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/101/console
    None: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/705/console
    None: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/431/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/823/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-09:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/camera-app/refactor-and-fix-editor-tests updated on 2015-03-10

529. By Ugo Riboni on 2015-03-10: Merge lp:~canonical-platform-qa/camera-app/close-panel-helper-fix to group more fixes in one review
530. By Ugo Riboni on 2015-03-10: Explicit rate parameter in calls to drag

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-10:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/camera-app/refactor-and-fix-editor-tests updated on 2015-03-10

531. By Ugo Riboni on 2015-03-10: When possible prefer adding sample media in advance of launching the app than taking actual pictures or videos
532. By Ugo Riboni on 2015-03-10: Make sure we don't fail if for any reason there are subdirectories while we try to clean the media directory
533. By Ugo Riboni on 2015-03-10: Merge changes from trunk
534. By Ugo Riboni on 2015-03-10: Fix missing parameter on call
535. By Ugo Riboni on 2015-03-10: Minimize swipe speed when switching to gallery view and back as it seems to be necessary to fix the problem in combination with previous changes
536. By Ugo Riboni on 2015-03-10: Ensure environment is clean of other media when running tests

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-10:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-10:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/camera-app/refactor-and-fix-editor-tests updated on 2015-03-11

537. By Ugo Riboni on 2015-03-11: Ensure editor tests have photo or video present before starting the test, or they will not be picked up

Revision history for this message

Florian Boucault (fboucault) wrote on 2015-03-11:

All tests green on krillin RTM

review: Approve

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:

Ubuntu Phablet Team

deaunapaul

 === added directory 'tests/autopilot/camera_app/data'
 === added file 'tests/autopilot/camera_app/data/__init__.py'
 --- tests/autopilot/camera_app/data/__init__.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/camera_app/data/__init__.py	2015-03-11 09:25:45 +0000
@@ -0,0 +1,6 @@
++# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
++# Copyright 2015 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.
 === added file 'tests/autopilot/camera_app/data/sample.jpg'
 Binary files tests/autopilot/camera_app/data/sample.jpg	1970-01-01 00:00:00 +0000 and tests/autopilot/camera_app/data/sample.jpg	2015-03-11 09:25:45 +0000 differ
 === added file 'tests/autopilot/camera_app/data/sample.mp4'
 Binary files tests/autopilot/camera_app/data/sample.mp4	1970-01-01 00:00:00 +0000 and tests/autopilot/camera_app/data/sample.mp4	2015-03-11 09:25:45 +0000 differ
 === modified file 'tests/autopilot/camera_app/emulators/main_window.py'
 --- tests/autopilot/camera_app/emulators/main_window.py	2015-01-27 17:36:59 +0000
 +++ tests/autopilot/camera_app/emulators/main_window.py	2015-03-11 09:25:45 +0000
@@ -5,6 +5,8 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
++import sys
++
  from camera_app.emulators.panel import Panel
  from autopilot.matchers import Eventually
  from testtools.matchers import Equals
@@ -141,7 +143,7 @@
          tx = x + (w // 2)
          ty = y + (h // 2)
--        testCase.pointing_device.drag(tx, ty, (tx - main_view.width // 2), ty)
++        testCase.pointing_device.drag(tx, ty, x, ty, rate=1)
          viewfinder = self.get_viewfinder()
          testCase.assertThat(viewfinder.inView, Eventually(Equals(False)))
@@ -152,6 +154,6 @@
          tx = x + (w // 2)
          ty = y + (h // 2)
--        testCase.pointing_device.drag(tx, ty, (tx + main_view.width // 2), ty)
++        testCase.pointing_device.drag(tx, ty, (tx + main_view.width // 2), ty, rate=1)
          viewfinder = self.get_viewfinder()
          testCase.assertThat(viewfinder.inView, Eventually(Equals(True)))
 === modified file 'tests/autopilot/camera_app/emulators/panel.py'
 --- tests/autopilot/camera_app/emulators/panel.py	2014-12-10 17:47:57 +0000
 +++ tests/autopilot/camera_app/emulators/panel.py	2015-03-11 09:25:45 +0000
@@ -6,6 +6,7 @@
  # by the Free Software Foundation.
  import logging
++import sys
  from autopilot import logging as autopilot_logging
  from camera_app.emulators.baseemulator import CameraCustomProxyObjectBase
@@ -38,7 +39,7 @@
          start_y = y + self.height - 1
          stop_y = y
--        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
++        self.pointing_device.drag(line_x, start_y, line_x, stop_y, rate=sys.maxsize)
      @autopilot_logging.log_action(logger.info)
      def close(self):
@@ -51,8 +52,8 @@
      def _drag_to_close(self):
          x, y, _, _ = self.globalRect
--        line_x = x
++        line_x = x + self.width - 1
          start_y = y
          stop_y = y + self.height - 1
--        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
++        self.pointing_device.drag(line_x, start_y, line_x, stop_y, rate=sys.maxsize)
 === modified file 'tests/autopilot/camera_app/tests/__init__.py'
 --- tests/autopilot/camera_app/tests/__init__.py	2014-11-17 14:27:25 +0000
 +++ tests/autopilot/camera_app/tests/__init__.py	2015-03-11 09:25:45 +0000
@@ -9,10 +9,15 @@
  import os
  import time
++import shutil
++from time import sleep
++from pkg_resources import resource_filename
  from autopilot.input import Mouse, Touch, Pointer
  from autopilot.platform import model
  from autopilot.testcase import AutopilotTestCase
++from autopilot.matchers import Eventually
++from testtools.matchers import Equals
  from camera_app.emulators.main_window import MainWindow
  from camera_app.emulators.baseemulator import CameraCustomProxyObjectBase
@@ -32,6 +37,10 @@
      local_location = "../../camera-app"
      deb_location = '/usr/bin/camera-app'
++    pictures_dir = os.path.expanduser("~/Pictures/com.ubuntu.camera")
++    videos_dir = os.path.expanduser("~/Videos/com.ubuntu.camera")
++    sample_dir = resource_filename('camera_app', 'data')
++
      def setUp(self):
          self.pointing_device = Pointer(self.input_device_class.create())
          super(CameraAppTestCase, self).setUp()
@@ -79,3 +88,24 @@
      @property
      def main_window(self):
          return MainWindow(self.app)
++
++    def delete_all_media(self):
++        picture_files = os.listdir(self.pictures_dir)
++        for f in picture_files:
++            f = os.path.join(self.pictures_dir, f)
++            if os.path.isfile(f):
++                os.remove(f)
++
++        video_files = os.listdir(self.videos_dir)
++        for f in video_files:
++            f = os.path.join(self.videos_dir, f)
++            if os.path.isfile(f):
++                os.remove(f)
++
++    def add_sample_photo(self):
++        shutil.copyfile(os.path.join(self.sample_dir, "sample.jpg"),
++                        os.path.join(self.pictures_dir, "sample.jpg"))
++
++    def add_sample_video(self):
++        shutil.copyfile(os.path.join(self.sample_dir, "sample.mp4"),
++                        os.path.join(self.videos_dir, "sample.mp4"))
 === modified file 'tests/autopilot/camera_app/tests/test_capture.py'
 --- tests/autopilot/camera_app/tests/test_capture.py	2015-01-20 12:33:39 +0000
 +++ tests/autopilot/camera_app/tests/test_capture.py	2015-03-11 09:25:45 +0000
@@ -28,7 +28,8 @@
      def setUp(self):
          # Remove configuration file where knowledge of the photo roll hint's necessity is stored
          config_file = os.path.expanduser("~/.config/com.ubuntu.camera/com.ubuntu.camera.conf")
--        os.remove(config_file)
++        if os.path.exists(config_file):
++            os.remove(config_file)
          super(TestCapture, self).setUp()
@@ -199,7 +200,9 @@
      def delete_all_photos(self):
          picture_files = os.listdir(self.pictures_dir)
          for f in picture_files:
--            os.remove(os.path.join(self.pictures_dir, f))
++            f = os.path.join(self.pictures_dir, f)
++            if os.path.isfile(f):
++                os.remove(os.path.join(self.pictures_dir, f))
      def get_first_picture(self, timeout=10):
          pictures = []
 === modified file 'tests/autopilot/camera_app/tests/test_gallery_view.py'
 --- tests/autopilot/camera_app/tests/test_gallery_view.py	2015-02-18 14:23:02 +0000
 +++ tests/autopilot/camera_app/tests/test_gallery_view.py	2015-03-11 09:25:45 +0000
@@ -16,24 +16,8 @@
  import os
  from time import sleep
--
--class TestCameraGalleryView(CameraAppTestCase):
--    """Tests the main camera features"""
--
--    """ 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(TestCameraGalleryView, self).setUp()
--        self.assertThat(
--            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
--        self.pictures_dir = os.path.expanduser("~/Pictures/com.ubuntu.camera")
--        self.videos_dir = os.path.expanduser("~/Videos/com.ubuntu.camera")
--
--    def tearDown(self):
--        super(TestCameraGalleryView, self).tearDown()
--
++class TestCameraGalleryViewMixin(object):
      def move_from_slideshow_to_photogrid(self):
--        # make sure we move from slideshow to photogrid view
          gallery = self.main_window.get_gallery()
          slideshow_view = gallery.wait_select_single("SlideshowView")
@@ -52,39 +36,6 @@
          self.assertThat(slideshow_view.visible, Eventually(Equals(False)))
          self.assertThat(photogrid_view.visible, Eventually(Equals(True)))
--    def delete_all_media(self):
--        picture_files = os.listdir(self.pictures_dir)
--        for f in picture_files:
--            f = os.path.join(self.pictures_dir, f)
--            if os.path.isfile(f):
--                os.remove(f)
--
--        video_files = os.listdir(self.videos_dir)
--        for f in video_files:
--            f = os.path.join(self.videos_dir, f)
--            if os.path.isfile(f):
--                os.remove(f)
--
--    def add_sample_photo(self):
--        self.main_window.swipe_to_viewfinder(self)
--        exposure_button = self.main_window.get_exposure_button()
--        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
--        self.pointing_device.move_to_object(exposure_button)
--        self.pointing_device.click()
--
--    def add_sample_video(self):
--        self.main_window.swipe_to_viewfinder(self)
--        video_button = self.main_window.get_record_control()
--        self.pointing_device.move_to_object(video_button)
--        self.pointing_device.click()
--
--        exposure_button = self.main_window.get_exposure_button()
--        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
--        self.pointing_device.move_to_object(exposure_button)
--        self.pointing_device.click()
--        sleep(3)
--        self.pointing_device.click()
--
      def select_first_photo(self):
          # select the first photo
          gallery = self.main_window.get_gallery()
@@ -96,6 +47,18 @@
          sleep(1)
          self.pointing_device.release()
++class TestCameraGalleryView(CameraAppTestCase, TestCameraGalleryViewMixin):
++    """Tests the camera gallery view without media already present"""
++
++    def setUp(self):
++        self.delete_all_media()
++        super(TestCameraGalleryView, self).setUp()
++        self.assertThat(
++            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
++
++    def tearDown(self):
++        super(TestCameraGalleryView, self).tearDown()
++
      """Tests swiping to the gallery and pressing the back button"""
      def test_swipe_to_gallery(self):
          viewfinder = self.main_window.get_viewfinder()
@@ -120,7 +83,6 @@
      """Tests swiping to the gallery/photo roll with no media in it"""
      def test_swipe_to_empty_gallery(self):
--        self.delete_all_media()
          viewfinder = self.main_window.get_viewfinder()
          gallery = self.main_window.get_gallery()
@@ -133,14 +95,31 @@
          self.assertThat(hint.visible, Eventually(Equals(True)))
--        self.add_sample_photo()
++        # Take a picture and verify that the no media hint disappears
++        self.main_window.swipe_to_viewfinder(self)
++        exposure_button = self.main_window.get_exposure_button()
++        self.assertThat(exposure_button.enabled, Eventually(Equals(True)))
++        self.pointing_device.move_to_object(exposure_button)
++        self.pointing_device.click()
          self.assertThat(hint.visible, Eventually(Equals(False)))
++class TestCameraGalleryViewWithVideo(TestCameraGalleryViewMixin, CameraAppTestCase):
++    """Tests the camera gallery view with video already present"""
++
++    def setUp(self):
++        self.delete_all_media()
++        self.add_sample_video()
++
++        super(TestCameraGalleryViewWithVideo, self).setUp()
++        self.assertThat(
++            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
++
++    def tearDown(self):
++        super(TestCameraGalleryViewWithVideo, self).tearDown()
++
      """Tests the thumnails for video load correctly in slideshow view"""
      def test_video_thumbnails(self):
--        self.add_sample_video()
--        self.delete_all_media()
          viewfinder = self.main_window.get_viewfinder()
          gallery = self.main_window.get_gallery()
@@ -152,29 +131,22 @@
          spinner = gallery.wait_select_single("ActivityIndicator")
          self.assertThat(spinner.running, Eventually(Equals(False)))
--    """Tests entering/leaving multiselection mode in the photogrid view"""
--    def test_multiselection_mode(self):
++class TestCameraGalleryViewWithPhoto(TestCameraGalleryViewMixin, CameraAppTestCase):
++    """Tests the camera gallery view with photo already present"""
++
++    def setUp(self):
++        self.delete_all_media()
          self.add_sample_photo()
--        self.main_window.swipe_to_gallery(self)
--        self.move_from_slideshow_to_photogrid()
--        self.select_first_photo()
--
--        # exit the multiselection mode
--        gallery = self.main_window.get_gallery()
--        back_button = gallery.wait_select_single(objectName="backButton")
--        self.pointing_device.move_to_object(back_button)
--        self.pointing_device.click()
--
--        slideshow_view = gallery.wait_select_single("SlideshowView")
--        photogrid_view = gallery.wait_select_single("PhotogridView")
--
--        self.assertThat(slideshow_view.visible, Eventually(Equals(False)))
--        self.assertThat(photogrid_view.visible, Eventually(Equals(True)))
++
++        super(TestCameraGalleryViewWithPhoto, self).setUp()
++        self.assertThat(
++            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
++
++    def tearDown(self):
++        super(TestCameraGalleryViewWithPhoto, self).tearDown()
      """Test deleting photo from multiselection"""
      def test_delete_photo_from_multiselection(self):
--        self.delete_all_media()
--        self.add_sample_photo()
          self.main_window.swipe_to_gallery(self)
          self.move_from_slideshow_to_photogrid()
          self.select_first_photo()
@@ -197,3 +169,21 @@
          hint = self.main_window.get_no_media_hint()
          self.assertThat(hint.visible, Eventually(Equals(True)))
++
++    """Tests entering/leaving multiselection mode in the photogrid view"""
++    def test_multiselection_mode(self):
++        self.main_window.swipe_to_gallery(self)
++        self.move_from_slideshow_to_photogrid()
++        self.select_first_photo()
++
++        # exit the multiselection mode
++        gallery = self.main_window.get_gallery()
++        back_button = gallery.wait_select_single(objectName="backButton")
++        self.pointing_device.move_to_object(back_button)
++        self.pointing_device.click()
++
++        slideshow_view = gallery.wait_select_single("SlideshowView")
++        photogrid_view = gallery.wait_select_single("PhotogridView")
++
++        self.assertThat(slideshow_view.visible, Eventually(Equals(False)))
++        self.assertThat(photogrid_view.visible, Eventually(Equals(True)))
 === modified file 'tests/autopilot/camera_app/tests/test_photo_editor.py'
 --- tests/autopilot/camera_app/tests/test_photo_editor.py	2014-12-16 13:26:28 +0000
 +++ tests/autopilot/camera_app/tests/test_photo_editor.py	2015-03-11 09:25:45 +0000
@@ -18,49 +18,23 @@
  from time import sleep
--class TestCameraPhotoEditor(CameraAppTestCase):
--    """Tests the main camera features"""
++class TestCameraPhotoEditorWithPhoto(CameraAppTestCase):
++    """Tests photo editor when a photo is present"""
--    """ 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(TestCameraPhotoEditor, self).setUp()
++        self.delete_all_media()
++        self.add_sample_photo()
++
++        super(TestCameraPhotoEditorWithPhoto, self).setUp()
          self.assertThat(
              self.main_window.get_qml_view().visible, Eventually(Equals(True)))
--        self.pictures_dir = os.path.expanduser("~/Pictures/com.ubuntu.camera")
--        self.videos_dir = os.path.expanduser("~/Videos/com.ubuntu.camera")
      def tearDown(self):
--        super(TestCameraPhotoEditor, self).tearDown()
--
--    def delete_all_media(self):
--        picture_files = os.listdir(self.pictures_dir)
--        for f in picture_files:
--            os.remove(os.path.join(self.pictures_dir, f))
--
--        video_files = os.listdir(self.videos_dir)
--        for f in video_files:
--            os.remove(os.path.join(self.videos_dir, f))
--
--    def add_sample_photo(self):
--        # add a fake photo to pictures_dir
--        photo_path = os.path.join(self.pictures_dir, "fake_photo.jpg")
--        with open(photo_path, 'a'):
--            os.utime(photo_path, None)
--
--    def select_first_photo(self):
--        # select the first photo
--        gallery = self.main_window.get_gallery()
--        photo = gallery.wait_select_single(objectName="mediaItem0")
--        self.pointing_device.move_to_object(photo)
--
--        # do a long press to enter Multiselection mode
--        self.pointing_device.press()
--        sleep(1)
--        self.pointing_device.release()
--
--    """Tests swiping to the gallery and pressing the back button"""
++        super(TestCameraPhotoEditorWithPhoto, self).tearDown()
++
++    """Tests editor opening and closing correctly for pictures"""
      def test_editor_appears(self):
++
          viewfinder = self.main_window.get_viewfinder()
          gallery = self.main_window.get_gallery()
@@ -73,7 +47,15 @@
          self.pointing_device.move_to_object(opt)
          self.pointing_device.click()
--        edit = gallery.wait_select_single(objectName="actionButtonEdit")
++        # If the editor button is not there when in the gallery view, then
++        # we are not on a system that has the UI extras package installed or has
++        # an older version than the one we need. Skip the test in this case.
++        try:
++            edit = gallery.wait_select_single(objectName="actionButtonEdit")
++        except:
++            return
++
++        self.assertThat(edit.enabled, Eventually(Equals(True)))
          self.pointing_device.move_to_object(edit)
          self.pointing_device.click()
@@ -98,3 +80,43 @@
          except StateNotFoundError:
              disappeared = True
          self.assertThat(disappeared, Equals(True))
++
++class TestCameraPhotoEditorWithVideo(CameraAppTestCase):
++    """Tests photo editor when a video is present"""
++
++    def setUp(self):
++        self.delete_all_media()
++        self.add_sample_video()
++
++        super(TestCameraPhotoEditorWithVideo, self).setUp()
++        self.assertThat(
++            self.main_window.get_qml_view().visible, Eventually(Equals(True)))
++
++    def tearDown(self):
++        super(TestCameraPhotoEditorWithVideo, self).tearDown()
++
++    """Tests editor not being available for videos"""
++    def test_editor_not_on_videos(self):
++        self.add_sample_video()
++
++        viewfinder = self.main_window.get_viewfinder()
++        gallery = self.main_window.get_gallery()
++
++        self.main_window.swipe_to_gallery(self)
++
++        self.assertThat(gallery.inView, Eventually(Equals(True)))
++
++        # open actions drawer
++        opt = gallery.wait_select_single(objectName="additionalActionsButton")
++        self.pointing_device.move_to_object(opt)
++        self.pointing_device.click()
++
++        # If the editor button is not there when in the gallery view, then
++        # we are not on a system that has the UI extras package installed or has
++        # an older version than the one we need. Skip the test in this case.
++        try:
++            edit = gallery.wait_select_single(objectName="actionButtonEdit")
++        except:
++            return
++
++        self.assertThat(edit.enabled, Equals(False))