Merge lp:~schwann/gallery-app/gallery-atest-tap-select into lp:gallery-app

[Günter Schwann]

* cleanups for the autopilot tests
* test if long press on media switches to select mode

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:817
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/440/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/250
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/250/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2374
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2374/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/84
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-maguro/79
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner-mako/76

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/gallery_app/emulators/gallery_utils.py'
--- tests/autopilot/gallery_app/emulators/gallery_utils.py	2013-08-09 10:20:19 +0000
+++ tests/autopilot/gallery_app/emulators/gallery_utils.py	2013-08-19 14:00:17 +0000
@@ -60,14 +60,6 @@
         return self.app.select_single("QQuickLoader",
                                       objectName="albumsCheckerboardLoader")
 
-    def get_tabs_bar(self):
-        """Returns the top tabs bar."""
-        return self.app.select_single("TabBar")
-
-    def get_albums_tab_button(self):
-        """Returns the photos tab."""
-        return self.app.select_single("AbstractButton", buttonIndex=0)
-
     def get_delete_dialog(self):
         """Returns the delete dialog in the events view."""
         return self.select_single_retry("DeleteDialog",

=== modified file 'tests/autopilot/gallery_app/emulators/photos_view.py'
--- tests/autopilot/gallery_app/emulators/photos_view.py	2013-08-12 15:33:20 +0000
+++ tests/autopilot/gallery_app/emulators/photos_view.py	2013-08-19 14:00:17 +0000
@@ -13,14 +13,6 @@
     def __init__(self, app):
         self.app = app
 
-    def get_photos_tab_button(self):
-        """Returns the photos tab."""
-        return self.app.select_single("AbstractButton", buttonIndex=5)
-
-    def get_photos_view(self):
-        """Returns the photos view."""
-        return self.app.select_single("Tab", objectName="photosTab")
-
     def get_first_photo_in_photos_view(self):
         """Returns the very first photo in the photos view."""
         return self.select_many_retry("QQuickItem",

=== renamed file 'tests/autopilot/gallery_app/emulators/picker_mode.py' => 'tests/autopilot/gallery_app/emulators/picker_screen.py'
--- tests/autopilot/gallery_app/emulators/picker_mode.py	2013-06-26 08:59:08 +0000
+++ tests/autopilot/gallery_app/emulators/picker_screen.py	2013-08-19 14:00:17 +0000
@@ -5,23 +5,20 @@
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
 
-from gallery_utils import GalleryUtils
-
-
-class PickerMode(GalleryUtils):
-
-    def __init__(self, app):
-        self.app = app
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class PickerScreen(toolkit_emulators.MainView):
 
     def pick_button(self):
-        return self.app.select_single("Button", objectName="pickButton")
+        return self.select_single("Button", objectName="pickButton")
 
     def get_photos_tab_button(self):
         """Returns the photos tab."""
-        return self.app.select_single("AbstractButton", buttonIndex=3)
+        return self.select_single("AbstractButton", buttonIndex=3)
 
     def events_view(self):
-        return self.app.select_single("OrganicView", objectName="eventSelectView")
+        return self.select_single("OrganicView", objectName="eventSelectView")
 
     def first_media_in_events_view(self):
         events_view = self.events_view()
@@ -29,7 +26,7 @@
                                        objectName="eventsViewPhoto")[0]
 
     def grid_view(self):
-        return self.app.select_single("MediaGrid")
+        return self.select_single("MediaGrid")
 
     def first_media_in_grid_view(self):
         grid_view = self.grid_view()

=== modified file 'tests/autopilot/gallery_app/tests/test_events_view.py'
--- tests/autopilot/gallery_app/tests/test_events_view.py	2013-08-14 14:04:39 +0000
+++ tests/autopilot/gallery_app/tests/test_events_view.py	2013-08-19 14:00:17 +0000
@@ -61,6 +61,10 @@
         self.assertThat(toolbar.opened, Eventually(Equals(False)))
         self.assertFalse(events_view.inSelectionMode)
 
+        first_photo = self.gallery_utils.get_first_image_in_event_view()
+        self.tap_item(first_photo)
+        self.assertTrue(events_view.inSelectionMode)
+
     def test_delete_a_photo(self):
         """Selecting a photo must make the delete button clickable."""
         number_of_photos = self.gallery_utils.number_of_photos_in_events()

=== modified file 'tests/autopilot/gallery_app/tests/test_photos_view.py'
--- tests/autopilot/gallery_app/tests/test_photos_view.py	2013-08-14 14:04:39 +0000
+++ tests/autopilot/gallery_app/tests/test_photos_view.py	2013-08-19 14:00:17 +0000
@@ -46,12 +46,21 @@
     def test_select_button_cancel(self):
         """Clicking the cancel button after clicking the select button must
         hide the toolbar automatically."""
+        photos_overview = self.app.select_single("PhotosOverview")
+        self.assertFalse(photos_overview.inSelectionMode)
+
         self.main_view.open_toolbar().click_button("selectButton")
+        self.assertTrue(photos_overview.inSelectionMode)
 
         self.main_view.open_toolbar().click_custom_button("cancelButton")
 
         toolbar = self.main_view.get_toolbar()
         self.assertThat(toolbar.active, Eventually(Equals(False)))
+        self.assertFalse(photos_overview.inSelectionMode)
+
+        first_photo = self.photos_view.get_first_photo_in_photos_view()
+        self.tap_item(first_photo)
+        self.assertTrue(photos_overview.inSelectionMode)
 
     def test_delete_a_photo(self):
         """Selecting a photo must make the delete button clickable."""

=== modified file 'tests/autopilot/gallery_app/tests/test_picker_mode.py'
--- tests/autopilot/gallery_app/tests/test_picker_mode.py	2013-08-08 11:42:24 +0000
+++ tests/autopilot/gallery_app/tests/test_picker_mode.py	2013-08-19 14:00:17 +0000
@@ -13,69 +13,56 @@
 from testtools.matchers import Equals, GreaterThan
 from autopilot.matchers import Eventually
 
-from gallery_app.emulators.picker_mode import PickerMode
+from gallery_app.emulators.picker_screen import PickerScreen
 from gallery_app.tests import GalleryTestCase
 
 
 class TestPickerMode(GalleryTestCase):
 
     @property
-    def picker_mode(self):
-        return PickerMode(self.app)
+    def picker_view(self):
+        return self.app.select_single(PickerScreen)
 
     def setUp(self):
         self.ARGS.append("--pick-photo")
         super(TestPickerMode, self).setUp()
-        
+
     def select_first_event_media(self):
-        first_media = self.picker_mode.first_media_in_events_view()
+        first_media = self.picker_view.first_media_in_events_view()
         self.click_item(first_media)
-        
+
     def select_first_grid_media(self):
-        first_media = self.picker_mode.first_media_in_events_view()
+        first_media = self.picker_view.first_media_in_events_view()
         self.click_item(first_media)
-        
-    def switch_to_grid_view(self):
-        tabs_bar = self.picker_mode.get_tabs_bar()
-        self.click_item(tabs_bar)
-        photos_tab_button = self.picker_mode.get_photos_tab_button()
-        # Due to some timing issues sometimes mouse moves to the location a bit
-        # earlier even though the tab item is not fully visible, hence the tab
-        # does not activate.
-        self.assertThat(photos_tab_button.opacity,
-                        Eventually(GreaterThan(0.2)))
-        self.click_item(photos_tab_button)
-        self.ensure_tabs_dont_move()
 
     def test_pick_first_photo(self):
         """Check if the button enabled state follows the selection"""
-        pick_button = self.picker_mode.pick_button()
+        pick_button = self.picker_view.pick_button()
         self.assertThat(pick_button.enabled, Eventually(Equals(False)))
-        first_events_media = self.picker_mode.first_media_in_events_view()
+        first_events_media = self.picker_view.first_media_in_events_view()
         self.assertThat(first_events_media.isSelected, Eventually(Equals(False)))
-        
+
         self.select_first_event_media()
-        
-        pick_button = self.picker_mode.pick_button()
+
+        pick_button = self.picker_view.pick_button()
         self.assertThat(pick_button.enabled, Eventually(Equals(True)))
         self.assertThat(first_events_media.isSelected, Eventually(Equals(True)))
-        
+
         self.select_first_event_media()
-        
-        pick_button = self.picker_mode.pick_button()
+
+        pick_button = self.picker_view.pick_button()
         self.assertThat(pick_button.enabled, Eventually(Equals(False)))
         self.assertThat(first_events_media.isSelected, Eventually(Equals(False)))
 
     def test_selection_synchronisation(self):
         """Checks if the selection is the same for both views"""
-        first_events_media = self.picker_mode.first_media_in_events_view()
+        first_events_media = self.picker_view.first_media_in_events_view()
         self.assertThat(first_events_media.isSelected, Eventually(Equals(False)))
-        
+
         self.select_first_event_media()
         self.assertThat(first_events_media.isSelected, Eventually(Equals(True)))
-        
-        self.switch_to_grid_view()
-
-        first_grid_media = self.picker_mode.first_media_in_grid_view()
+
+        self.picker_view.switch_to_next_tab()
+
+        first_grid_media = self.picker_view.first_media_in_grid_view()
         self.assertThat(first_grid_media.isSelected, Eventually(Equals(True)))
-