Merge lp:~elopio/ubuntu-filemanager-app/clean_places_tests into lp:ubuntu-filemanager-app

[Leo Arias]

Cleaned up the places autopilot tests.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:199
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/248/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2921
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2921/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/469
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/469/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/198
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/46

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/248/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Ahh, so you moved the places test to it's own file.. hmm..

Do you plan to break out test_filemanager even more?

[Leo Arias (elopio)]

yes I do. If I have time to do it.

[Nicholas Skaggs (nskaggs)]

17:31:51.289 ERROR testresult:46 - traceback: {{{
Traceback (most recent call last):
File "/home/phablet/autopilot/filemanager/tests/test_places.py", line 37, in test_go_to_root_must_open_the_root_directory
self.main_view.go_to_place('placeRoot')
File "/usr/lib/python3/dist-packages/autopilot/introspection/dbus.py", line 420, in __getattr__
(self.__class__.__name__, name))
AttributeError: Class 'MainView' has no attribute 'go_to_place'.
}}}

http://paste.ubuntu.com/7624597/

review: Needs Fixing

[lp:~elopio/ubuntu-filemanager-app/clean_places_tests]

200. By Leo Arias on 2014-06-10

Fixed tests on mako.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:200
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/250/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2923
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2923/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/484
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/484/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/200
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/48

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/250/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

The current test errors still exist, but this introduces no new errors and cleans the tests.

review: Approve

=== modified file 'src/app/qml/components/PlacesSidebar.qml'
--- src/app/qml/components/PlacesSidebar.qml	2014-03-29 09:20:11 +0000
+++ src/app/qml/components/PlacesSidebar.qml	2014-06-10 18:01:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd
+ * Copyright (C) 2013, 2014 Canonical Ltd
  *
  * 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
@@ -46,6 +46,7 @@
         id: places
 
         ListElement {
+            objectName: "placeHome"
             path: "~"
         }
 
@@ -70,6 +71,7 @@
         }
 
         ListElement {
+            objectName: "placeRoot"
             path: "/"
         }
     }
@@ -92,6 +94,7 @@
             model: places
 
             delegate: Standard {
+                objectName: model.objectName
                 text: folderName(path)
 
                 Image {

=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml	2014-02-19 00:00:15 +0000
+++ src/app/qml/ui/PlacesPopover.qml	2014-06-10 18:01:55 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd
+ * Copyright (C) 2013, 2014 Canonical Ltd
  *
  * 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
@@ -28,6 +28,7 @@
         id: places
 
         ListElement {
+            objectName: 'placeHome'
             path: "~"
         }
 
@@ -52,6 +53,7 @@
         }
 
         ListElement {
+            objectName: "placeRoot"
             path: "/"
         }
     }
@@ -114,6 +116,7 @@
             model: places
 
             delegate: Standard {
+                objectName: model.objectName
                 property string name: folderName(path)
 
                 Label {

=== added file 'tests/autopilot/filemanager/_common.py'
--- tests/autopilot/filemanager/_common.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/filemanager/_common.py	2014-06-10 18:01:55 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class FileManagerException(toolkit_emulators.ToolkitEmulatorException):
+    """Exception raised when there is an error with the File Manager."""

=== modified file 'tests/autopilot/filemanager/emulators.py'
--- tests/autopilot/filemanager/emulators.py	2014-05-08 23:04:17 +0000
+++ tests/autopilot/filemanager/emulators.py	2014-06-10 18:01:55 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013, 2014 Canonical Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -16,18 +16,60 @@
 
 """File Manager app autopilot emulators."""
 
+import logging
 import re
 import time
 
+import autopilot.logging
 from autopilot import input
 from autopilot.introspection import dbus
-
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
+from filemanager import _common
+
+logger = logging.getLogger(__name__)
+
 
 class MainView(toolkit_emulators.MainView):
     """File Manager MainView Autopilot emulator."""
 
+    @autopilot.logging.log_action(logger.info)
+    def go_to_place(self, object_name):
+        """Open one of the bookmarked place folders.
+
+        :param object_name: The objectName property of the place to open.
+
+        """
+        if self.showSidebar:
+            self._go_to_place_from_side_bar(object_name)
+        else:
+            self._go_to_place_from_popover(object_name)
+
+    def _go_to_place_from_side_bar(self, object_name):
+        side_bar = self.get_folder_list_page().get_sidebar()
+        side_bar.go_to_place(object_name)
+
+    def _go_to_place_from_popover(self, object_name):
+        popover = self.open_places()
+        place = popover.select_single('Standard', objectName=object_name)
+        self.pointing_device.click_object(place)
+
+    @autopilot.logging.log_action(logger.info)
+    def open_places(self):
+        if not self.showSidebar:
+            self.open_toolbar().click_button('places')
+            return self._get_places_popover()
+        else:
+            raise _common('The places popover cannot be opened on wide mode.')
+
+    def _get_places_popover(self):
+        """Return the Places popover."""
+        # XXX It would be easier if the places popover was an object
+        # that inherits from Popover, like the
+        # ActionSelectionPopover does.
+        # --elopio - 2013-07-25
+        return self.wait_select_single('Popover', objectName='placesPopover')
+
     def get_folder_list_page(self):
         """Return the FolderListPage emulator of the MainView."""
         page = self.wait_select_single(FolderListPage)
@@ -60,19 +102,6 @@
         except:
             return False
 
-    def get_places_popover(self):
-        """Return the Places popover."""
-        if not self.showSidebar:
-            # XXX It would be easier if the places popover was an object
-            # that inherits from Popover, like the
-            # ActionSelectionPopover does.
-            # --elopio - 2013-07-25
-            return self.wait_select_single('Popover',
-                                           objectName='placesPopover')
-        else:
-            raise ValueError(
-                'Places sidebar is hidden in wide mode.')
-
     def get_file_details_popover(self):
         """Return the FileDetailsPopover emulator."""
         return self.wait_select_single(FileDetailsPopover)
@@ -117,13 +146,15 @@
 class PlacesSidebar(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
     """PlacesSidebar Autopilot emulator."""
 
-    def get_place(self, text):
-        places = self.select_many('Standard')
-        for place in places:
-            if place.text == text:
-                return place
-        raise ValueError(
-            'Place "{0}" not found.'.format(text))
+    @autopilot.logging.log_action(logger.info)
+    def go_to_place(self, object_name):
+        """Open one of the bookmarked place folders.
+
+        :param object_name: The objectName property of the place to open.
+
+        """
+        place = self.select_single('Standard', objectName=object_name)
+        self.pointing_device.click_object(place)
 
 
 class FolderListPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
@@ -169,6 +200,7 @@
             'File with name "{0}" not found.'.format(name))
 
     def get_current_path(self):
+        """Get the path of the folder currently displayed."""
         if self.showingListView:
             return self.select_single(FolderListView).get_current_path()
         else:

=== modified file 'tests/autopilot/filemanager/tests/__init__.py'
--- tests/autopilot/filemanager/tests/__init__.py	2014-05-08 22:18:56 +0000
+++ tests/autopilot/filemanager/tests/__init__.py	2014-06-10 18:01:55 +0000
@@ -1,9 +1,18 @@
 # -*- 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.
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """Filemanager app autopilot tests."""
 
@@ -12,18 +21,19 @@
 import logging
 
 import fixtures
-from filemanager import emulators
-
+from autopilot import logging as autopilot_logging
 from autopilot.input import Mouse, Touch, Pointer
+from autopilot.matchers import Eventually
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
-from autopilot import logging as autopilot_logging
-
+from testtools.matchers import Equals
 from ubuntuuitoolkit import (
     emulators as toolkit_emulators,
     fixture_setup as toolkit_fixtures
 )
 
+from filemanager import emulators
+
 logger = logging.getLogger(__name__)
 
 
@@ -77,6 +87,9 @@
 
         self.app = launcher()
 
+        self.assertThat(
+            self.main_view.visible, Eventually(Equals(True)))
+
     @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
         self.useFixture(fixtures.EnvironmentVariable(

=== modified file 'tests/autopilot/filemanager/tests/test_filemanager.py'
--- tests/autopilot/filemanager/tests/test_filemanager.py	2014-05-08 23:20:20 +0000
+++ tests/autopilot/filemanager/tests/test_filemanager.py	2014-06-10 18:01:55 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd.
+# Copyright (C) 2013, 2014 Canonical Ltd.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -35,11 +35,6 @@
 
 class TestFolderListPage(FileManagerTestCase):
 
-    def setUp(self):
-        super(TestFolderListPage, self).setUp()
-        self.assertThat(
-            self.main_view.visible, Eventually(Equals(True)))
-
     def _make_file_in_home(self):
         return self._make_content_in_home('file')
 
@@ -92,22 +87,6 @@
             Eventually(NotEquals(None)))
         return folder_list_page.get_file_by_index(index)
 
-    def _go_to_place(self, text):
-        # XXX We are receiving the text because there's no way to set the
-        # objectName on the ListElement. This is reported at
-        # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205201
-        # --elopio - 2013-07-25
-        place = None
-        if self.main_view.showSidebar:
-            place = (self.main_view.get_folder_list_page().get_sidebar()
-                     .get_place(text))
-        else:
-            open_popover = lambda: \
-                self.main_view.open_toolbar().click_button('places')
-            self._safe_open_popover(open_popover)
-            place = self._get_place(text)
-        self.pointing_device.click_object(place)
-
     def _go_to_location(self, location):
         #go to specified location
         #on wide UI display, we get the location dialog
@@ -120,22 +99,11 @@
             goto_location = self.main_view.get_dialog()
         else:
             logger.debug("Using places to goto %s on %s" % (location, device))
-            open_popover = lambda: \
-                self.main_view.open_toolbar().click_button('places')
-            self._safe_open_popover(open_popover)
+            self._safe_open_popover(self.main_view.open_places)
             goto_location = self.main_view.get_popover()
         goto_location.enter_text(location)
         goto_location.ok()
 
-    def _get_place(self, text):
-        places_popover = self.main_view.get_places_popover()
-        places = places_popover.select_many('Standard')
-        for place in places:
-            if place.name == text:
-                return place
-        raise ValueError(
-            'Place "{0}" not found.'.format(text))
-
     def _make_directory_in_home(self):
         return self._make_content_in_home('directory')
 
@@ -627,22 +595,6 @@
             folder_list_page.get_current_path,
             Eventually(Equals(self.home_dir)))
 
-    def test_go_home(self):
-        self._go_to_place('Home')
-
-        folder_list_page = self.main_view.get_folder_list_page()
-        self.assertThat(
-            folder_list_page.get_current_path,
-            Eventually(Equals(self.home_dir)))
-
-    def test_go_to_root(self):
-        self._go_to_place('File System')
-
-        folder_list_page = self.main_view.get_folder_list_page()
-        self.assertThat(
-            folder_list_page.get_current_path,
-            Eventually(Equals('/')))
-
     def test_file_context_menu_shows(self):
         """Checks to make sure that the file actions popover is shown."""
         file_name = os.path.basename(self._make_file_in_home())

=== added file 'tests/autopilot/filemanager/tests/test_places.py'
--- tests/autopilot/filemanager/tests/test_places.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/filemanager/tests/test_places.py	2014-06-10 18:01:55 +0000
@@ -0,0 +1,42 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+from filemanager import tests
+
+
+class PlacesTestCase(tests.FileManagerTestCase):
+    """Test cases for the places section of the file manager app."""
+
+    def test_go_home_must_open_the_home_directory(self):
+        """Test that opens the Home bookmark from the places section."""
+        self.main_view.go_to_place('placeHome')
+
+        folder_list_page = self.main_view.get_folder_list_page()
+        self.assertThat(
+            folder_list_page.get_current_path,
+            Eventually(Equals(self.home_dir)))
+
+    def test_go_to_root_must_open_the_root_directory(self):
+        """Test that opens the File System bookmark from the places section."""
+        self.main_view.go_to_place('placeRoot')
+
+        folder_list_page = self.main_view.get_folder_list_page()
+        self.assertThat(
+            folder_list_page.get_current_path,
+            Eventually(Equals('/')))