gallery-app

Merge lp:~artmello/gallery-app/gallery-app-fix_autopilot_tests into lp:gallery-app

gallery-app-fix_autopilot_tests
Merge into trunk

Proposed by Arthur Mello on 2015-04-14

Status:	Merged
Approved by:	Bill Filler on 2015-04-22
Approved revision:	1192
Merged at revision:	1191
Proposed branch:	lp:~artmello/gallery-app/gallery-app-fix_autopilot_tests
Merge into:	lp:gallery-app
Diff against target:	368 lines (+107/-78) 7 files modified tests/autopilot/gallery_app/emulators/album_editor.py (+4/-4) tests/autopilot/gallery_app/emulators/album_view.py (+10/-7) tests/autopilot/gallery_app/emulators/gallery_utils.py (+6/-4) tests/autopilot/gallery_app/emulators/photo_viewer.py (+59/-27) tests/autopilot/gallery_app/emulators/picker_screen.py (+1/-0) tests/autopilot/gallery_app/tests/test_album_editor.py (+0/-1) tests/autopilot/gallery_app/tests/test_photo_viewer.py (+27/-35)
To merge this branch:	bzr merge lp:~artmello/gallery-app/gallery-app-fix_autopilot_tests
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-20
Federico Gimenez (community)		2015-04-15	Approve on 2015-04-15
Ubuntu Phablet Team		2015-04-14	Pending
Review via email: mp+256159@code.launchpad.net

Commit Message

Fix AP tests

Description of the Change

Fix AP tests

PS Jenkins bot (ps-jenkins) wrote on 2015-04-14:

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

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-fix_autopilot_tests updated on 2015-04-15

1190. By Arthur Mello on 2015-04-15: Add another check to make sure remove from album dialog is fully open

PS Jenkins bot (ps-jenkins) wrote on 2015-04-15:

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

review: Needs Fixing (continuous-integration)

Federico Gimenez (fgimenez) wrote on 2015-04-15:

Looks good in general and the tests are passing on krillin, someone else should check on mako.

You should double check the wait_select_single calls are used for elements that are not previously present in the ui (for those that are you should use select_single) and that the visible kwarg is used when needed (elements that appear eventually).

There are some flake8 minor issues (you can check them with 'python3 -m flake8.run .'), not a blocker.

Cheers!

review: Approve

lp:~artmello/gallery-app/gallery-app-fix_autopilot_tests updated on 2015-04-15

1191. By Arthur Mello on 2015-04-15: Fix flake8 minor issues

PS Jenkins bot (ps-jenkins) wrote on 2015-04-15:

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

review: Needs Fixing (continuous-integration)

lp:~artmello/gallery-app/gallery-app-fix_autopilot_tests updated on 2015-04-20

1192. By Arthur Mello on 2015-04-20: Merge changes from lp:~canonical-platform-qa/gallery-app/clean_delete_autopilot_tests

PS Jenkins bot (ps-jenkins) wrote on 2015-04-20:

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

review: Needs Fixing (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:

Arthur Mello

Ubuntu Phablet Team

 === modified file 'tests/autopilot/gallery_app/emulators/album_editor.py'
 --- tests/autopilot/gallery_app/emulators/album_editor.py	2015-02-17 10:23:02 +0000
 +++ tests/autopilot/gallery_app/emulators/album_editor.py	2015-04-20 20:01:35 +0000
@@ -35,8 +35,8 @@
      def album_title_entry_field(self):
          """Returns the album title input box."""
          editor = self.album_editor()
--        return editor.select_single("TextEditOnClick",
--                                    objectName="albumTitleField")
++        return editor.wait_select_single("TextEditOnClick",
++                                         objectName="albumTitleField")
      def click_title_field(self):
          self.pointing_device.click_object(self.album_title_entry_field())
@@ -44,8 +44,8 @@
      def album_subtitle_entry_field(self):
          """Returns the album subtitle input box."""
          editor = self.album_editor()
--        return editor.select_single("TextEditOnClick",
--                                    objectName="albumSubtitleField")
++        return editor.wait_select_single("TextEditOnClick",
++                                         objectName="albumSubtitleField")
      def click_subtitle_field(self):
          self.pointing_device.click_object(self.album_subtitle_entry_field())
 === modified file 'tests/autopilot/gallery_app/emulators/album_view.py'
 --- tests/autopilot/gallery_app/emulators/album_view.py	2015-02-27 19:33:20 +0000
 +++ tests/autopilot/gallery_app/emulators/album_view.py	2015-04-20 20:01:35 +0000
@@ -146,25 +146,28 @@
      def _get_remove_from_album_popover_remove_item(self):
          """Returns remove button of the remove from album popover."""
--        return self.app.select_single("Button",
--                                      objectName="removeFromAlbumButton",
--                                      visible=True)
++        return self.app.wait_select_single("Button",
++                                           objectName="removeFromAlbumButton",
++                                           visible=True)
      def _get_remove_from_album_popover_delete_item(self):
          """Returns delete button of the remove from album popover."""
--        return self.app.select_single(
++        return self.app.wait_select_single(
              "Button",
              objectName="removeFromAlbumAndDeleteButton",
              visible=True)
      def _get_remove_from_album_popover_cancel_item(self):
          """Returns cancel button of the remove from album popover."""
--        return self.app.select_single("Button",
--                                      objectName="removeFromAlbumCancelButton",
--                                      visible=True)
++        return self.app.wait_select_single(
++            "Button",
++            objectName="removeFromAlbumCancelButton",
++            visible=True)
      def _ensure_remove_from_album_dialog_is_open(self):
          """Ensure that the remove from album dialog is fully opened."""
++        self.assertThat(self._remove_from_album_dialog_shown,
++                        Eventually(Is(True)))
          remove_dialog = self._get_remove_from_album_dialog()
          self.assertThat(remove_dialog.visible, Eventually(Equals(True)))
          self.assertThat(remove_dialog.opacity, Eventually(Equals(1)))
 === modified file 'tests/autopilot/gallery_app/emulators/gallery_utils.py'
 --- tests/autopilot/gallery_app/emulators/gallery_utils.py	2015-02-16 22:52:55 +0000
 +++ tests/autopilot/gallery_app/emulators/gallery_utils.py	2015-04-20 20:01:35 +0000
@@ -69,13 +69,15 @@
      def get_delete_dialog_delete_button(self):
          """Returns the delete button of the delete popover."""
--        return self.app.select_single("Button", objectName="deleteDialogYes",
--                                      visible=True)
++        return self.app.wait_select_single("Button",
++                                           objectName="deleteDialogYes",
++                                           visible=True)
      def get_delete_dialog_cancel_button(self):
          """Returns the cancel button of the delete popover."""
--        return self.app.select_single("Button", objectName="deleteDialogNo",
--                                      visible=True)
++        return self.app.wait_select_single("Button",
++                                           objectName="deleteDialogNo",
++                                           visible=True)
      def get_all_albums(self):
          """Returns all albums in the albums view"""
 === modified file 'tests/autopilot/gallery_app/emulators/photo_viewer.py'
 --- tests/autopilot/gallery_app/emulators/photo_viewer.py	2015-03-02 14:55:22 +0000
 +++ tests/autopilot/gallery_app/emulators/photo_viewer.py	2015-04-20 20:01:35 +0000
@@ -5,7 +5,54 @@
  # under the terms of the GNU General Public License version 3, as published
  # by the Free Software Foundation.
--from gallery_app.emulators.gallery_utils import GalleryUtils
++import logging
++
++import autopilot.logging
++import ubuntuuitoolkit
++
++from gallery_app.emulators import main_screen
++from gallery_app.emulators.gallery_utils import(
++    GalleryAppException,
++    GalleryUtils
++)
++
++
++logger = logging.getLogger(__name__)
++
++
++class PopupPhotoViewer(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
++
++    @autopilot.logging.log_action(logger.info)
++    def delete_current_photo(self, confirm=True):
++        header = self.get_root_instance().select_single(
++            main_screen.MainScreen).get_header()
++        header.click_action_button("deleteButton")
++        if confirm:
++            self.confirm_delete_photo()
++        else:
++            self.cancel_delete_photo()
++
++    @autopilot.logging.log_action(logger.debug)
++    def confirm_delete_photo(self):
++        self._click_delete_dialog_button("Yes")
++
++    def _click_delete_dialog_button(self, name):
++        delete_dialog = self._get_delete_dialog()
++        button = delete_dialog.wait_select_single(
++            "Button", objectName="deletePhotoDialog" + name, visible=True)
++        self.pointing_device.click_object(button)
++        delete_dialog.wait_until_destroyed()
++
++    def _get_delete_dialog(self):
++        delete_dialog = self.get_root_instance().wait_select_single(
++            objectName="deletePhotoDialog")
++        delete_dialog.visible.wait_for(True)
++        delete_dialog.opacity.wait_for(1)
++        return delete_dialog
++
++    @autopilot.logging.log_action(logger.debug)
++    def cancel_delete_photo(self):
++        self._click_delete_dialog_button('No')
  class PhotoViewer(GalleryUtils):
@@ -14,16 +61,6 @@
          super(PhotoViewer, self).__init__(self)
          self.app = app
--    def get_delete_dialog(self):
--        """Returns the photo viewer delete dialog."""
--        return self.app.wait_select_single("Dialog",
--                                           objectName="deletePhotoDialog")
--
--    def delete_dialog_shown(self):
--        dialog = self.app.select_many("Dialog",
--                                      objectName="deletePhotoDialog")
--        return len(dialog) >= 1
--
      def get_popup_album_picker(self):
          """Returns the photo viewer album pickers."""
          return self.app.wait_select_single("PopupAlbumPicker",
@@ -54,16 +91,16 @@
      def get_cancel_revert_to_original_button(self):
          """Returns the revert to original cancel button."""
          return self.get_revert_to_original_dialog().wait_select_single(
--           "Button",
--           objectName="cancelRevertButton",
--           visible=True)
++            "Button",
++            objectName="cancelRevertButton",
++            visible=True)
      def get_confirm_revert_to_original_button(self):
          """Returns the revert to original confirm button."""
          return self.get_revert_to_original_dialog().wait_select_single(
--           "Button",
--           objectName="confirmRevertButton",
--           visible=True)
++            "Button",
++            objectName="confirmRevertButton",
++            visible=True)
      def get_photo_component(self):
          # Was using a list index (lp:1247711). Still needs fixing, I'm not
@@ -78,7 +115,8 @@
      def get_editor_actions_bar(self):
          """Returns the actions bar for the editor."""
--        return self.app.select_single("ActionsBar", objectName="editorActionsBar")
++        return self.app.select_single("ActionsBar",
++                                      objectName="editorActionsBar")
      def get_editor_action_button_by_text(self, button_text):
          """Returns the action button from the editor by text."""
@@ -114,17 +152,11 @@
          """Returns the 'auto enhance' menu item in the edit dialog."""
          return self.app.select_single("Standard", objectName='enhanceListItem')
--    def get_delete_popover_delete_item(self):
--        """Returns the delete button of the delete popover."""
--        return self.app.select_single("Button",
--                                      objectName="deletePhotoDialogYes",
--                                      visible=True)
--
      def get_delete_popover_cancel_item(self):
          """Returns the cancel button of the delete popover."""
--        return self.app.select_single("Button",
--                                      objectName="deletePhotoDialogNo",
--                                      visible=True)
++        return self.app.wait_select_single("Button",
++                                           objectName="deletePhotoDialogNo",
++                                           visible=True)
      def get_opened_photo(self):
          """Returns the first opened photo."""
 === modified file 'tests/autopilot/gallery_app/emulators/picker_screen.py'
 --- tests/autopilot/gallery_app/emulators/picker_screen.py	2015-04-08 16:42:43 +0000
 +++ tests/autopilot/gallery_app/emulators/picker_screen.py	2015-04-20 20:01:35 +0000
@@ -6,6 +6,7 @@
  # by the Free Software Foundation.
  from ubuntuuitoolkit import emulators as toolkit_emulators
++from gallery_app.emulators.gallery_utils import GalleryAppException
  class PickerScreen(toolkit_emulators.MainView):
 === modified file 'tests/autopilot/gallery_app/tests/test_album_editor.py'
 --- tests/autopilot/gallery_app/tests/test_album_editor.py	2015-02-17 10:23:02 +0000
 +++ tests/autopilot/gallery_app/tests/test_album_editor.py	2015-04-20 20:01:35 +0000
@@ -56,7 +56,6 @@
          text = "Ubuntu"
          self.assertThat(subtitle_field.text, Eventually(Equals(text)))
--        sleep(5)
          editor.click_title_field()
          self.assertThat(title_field.activeFocus, Eventually(Equals(True)))
          self.keyboard.press_and_release("Ctrl+a")
 === modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
 --- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2015-04-08 05:16:08 +0000
 +++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2015-04-20 20:01:35 +0000
@@ -8,12 +8,12 @@
  """Tests the Photo editor of the gallery app."""
--from testtools.matchers import Equals, NotEquals, GreaterThan, Is
++from testtools.matchers import Equals, NotEquals, GreaterThan
  from autopilot.matchers import Eventually
  from testtools import skipIf
  from autopilot.platform import model
--from gallery_app.emulators.photo_viewer import PhotoViewer
++from gallery_app.emulators import photo_viewer
  from gallery_app.emulators.media_viewer import MediaViewer
  from gallery_app.emulators.events_view import EventsView
  from gallery_app.tests import GalleryTestCase
@@ -31,7 +31,7 @@
  class TestMediaViewerBase(GalleryTestCase):
      @property
      def photo_viewer(self):
--        return PhotoViewer(self.app)
++        return photo_viewer.PhotoViewer(self.app)
      @property
      def events_view(self):
@@ -93,16 +93,6 @@
          photo_viewer_loader = self.photo_viewer.get_main_photo_viewer_loader()
          self.assertThat(photo_viewer_loader.source, Equals(""))
--    def get_delete_dialog(self):
--        delete_dialog = self.photo_viewer.get_delete_dialog()
--        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
--        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
--        return delete_dialog
--
--    def ensure_closed_delete_dialog(self):
--        self.assertThat(self.photo_viewer.delete_dialog_shown,
--                        Eventually(Is(False)))
--
      def test_nav_bar_back_button(self):
          """Clicking the back button must close the photo."""
          self.main_view.get_header().click_custom_back_button()
@@ -120,38 +110,40 @@
          self.click_item(cancel_button)
          self.assertThat(share_picker.visible, Eventually(Equals(False)))
--    def delete_one_picture(self):
--        self.main_view.get_header().click_action_button("deleteButton")
--        self.get_delete_dialog()
--        delete_item = self.photo_viewer.get_delete_popover_delete_item()
--        self.click_item(delete_item)
--        self.ensure_closed_delete_dialog()
++    def test_delete_photo_must_remove_it_from_filesystem(self):
++        photo_component = self.main_view.select_single('GalleryPhotoComponent')
++        source = photo_component.source
++        file_path = source[len('image://thumbnailer/file://'):]
++        self.assertTrue(os.path.exists(file_path))
++
++        photo_viewer_popup = self.main_view.select_single(
++            photo_viewer.PopupPhotoViewer)
++        photo_viewer_popup.delete_current_photo()
++
++        self.assertFalse(os.path.exists(file_path))
      def test_photo_delete_works(self):
          """Clicking the trash button must show the delete dialog."""
--        self.main_view.get_header().click_action_button("deleteButton")
--        self.get_delete_dialog()
--
--        photo_viewer = self.photo_viewer.get_main_photo_viewer()
--
--        cancel_item = self.photo_viewer.get_delete_popover_cancel_item()
--        self.click_item(cancel_item)
--        self.ensure_closed_delete_dialog()
++        # XXX This test must be split into multiple QML tests.
++        # --elopio - 2015-14-16
++        photo_viewer_popup = self.main_view.select_single(
++            photo_viewer.PopupPhotoViewer)
++        photo_viewer_popup.delete_current_photo(confirm=False)
          self.assertThat(lambda: os.path.exists(self.sample_file),
                          Eventually(Equals(True)))
--        self.delete_one_picture()
++        photo_viewer_popup.delete_current_photo()
          self.assertThat(lambda: os.path.exists(self.sample_file),
                          Eventually(Equals(False)))
          # Delete all other pictures and make sure the photo viewer closes
--        self.delete_one_picture()
--        self.delete_one_picture()
--        self.delete_one_picture()
--        self.delete_one_picture()
++        photo_viewer_popup.delete_current_photo()
++        photo_viewer_popup.delete_current_photo()
++        photo_viewer_popup.delete_current_photo()
++        photo_viewer_popup.delete_current_photo()
--        self.assertThat(photo_viewer.visible, Eventually(Equals(False)))
++        self.assertThat(photo_viewer_popup.visible, Eventually(Equals(False)))
      def test_nav_bar_album_picker_button(self):
          """Clicking the album picker must show the picker dialog."""
@@ -208,7 +200,7 @@
          video_file = "video.mp4"
          shutil.copyfile(self.sample_dir+"/option01/"+video_file,
                          self.sample_destination_dir+"/"+video_file)
--
++
          self.assertThat(
              lambda: self.events_view.number_of_events(),
              Eventually(Equals(num_events + 1))
@@ -221,7 +213,7 @@
          sleep(1)
          photo_viewer = self.photo_viewer.get_main_photo_viewer()
          self.assertThat(photo_viewer.visible, Eventually(Equals(True)))
--        photo_component = self.photo_viewer.get_photo_component()
++        photo_component = self.photo_viewer.get_photo_component()
          self.assertThat(photo_component.imageReady, Eventually(Equals(True)))
          os.remove(self.sample_destination_dir+"/"+video_file)