Merge lp:~canonical-platform-qa/gallery-app/launch_app_fixture into lp:~canonical-platform-qa/gallery-app/clean_autopilot_setup

[Leo Arias]

Made an autopilot base test case for the tests that just need the app to be open.

Unmerged revisions

1109. By Leo Arias on 2014-10-15

Made a base test case for the tests that just need the app to be open.

1108. By Leo Arias on 2014-10-15

Removed the database and thumbnail files.

1107. By Leo Arias on 2014-10-15

Link to the bug

1106. By Leo Arias on 2014-10-15

Modified the date of the first two pictures.

1105. By Leo Arias on 2014-10-15

Merged with prerequisite.

1104. By Leo Arias on 2014-10-15

Removed the database edits.

1103. By Leo Arias on 2014-10-15

Merged with prerequisite.

1102. By Leo Arias on 2014-10-14

Do not backup existing files during autopilot tests. We will assume a clean environment from now on.

=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
--- tests/autopilot/gallery_app/tests/__init__.py	2014-10-15 05:23:12 +0000
+++ tests/autopilot/gallery_app/tests/__init__.py	2014-10-15 05:23:12 +0000
@@ -42,14 +42,19 @@
 
 class GalleryTestCase(AutopilotTestCase):
 
-    """A common test case class that provides several useful methods for
-       gallery tests."""
-
-    sample_file_source = "/sample01.jpg"
-    tap_press_time = 1
+    """Base test case for gallery app tests.
+
+    It will open the gallery app with testability enabled.
+
+    """
+
     local_location = os.path.abspath('../../src/gallery-app')
 
-    ARGS = []
+    def setUp(self):
+        self.pointing_device = toolkit_emulators.get_pointing_device()
+        super().setUp()
+        env_type = self._get_environment_launch_type()
+        self.launch_gallery_app(env_type)
 
     @property
     def gallery_utils(self):
@@ -71,45 +76,11 @@
         else:
             return fixture_setup.Launcher.installed_click
 
-    def _get_sample_destination_dir(self):
-        return os.path.expanduser("~/Pictures")
-
-    def configure_sample_files(self, env_type):
-        self.sample_dir = resource_filename('gallery_app', 'data')
-        self.sample_destination_dir = self._get_sample_destination_dir()
-        if (os.path.exists(self.sample_destination_dir)):
-            shutil.rmtree(self.sample_destination_dir)
-        self.assertFalse(os.path.exists(self.sample_destination_dir))
-
-        self.sample_file = os.path.join(
-            self.sample_destination_dir,
-            "sample04.jpg"
-        )
-
-        default_data_dir = os.path.join(self.sample_dir, 'default')
-        shutil.copytree(default_data_dir, self.sample_destination_dir)
-        self.assertTrue(os.path.isfile(self.sample_file))
-
-        self.sample_file_source = default_data_dir + self.sample_file_source
-
-    def do_reset_config(self):
-        config = os.path.expanduser(
-            os.path.join("~", ".config", "gallery-app.conf"))
-        if os.path.exists(config):
-            os.remove(config)
-
-    def setUp(self):
-        self.pointing_device = toolkit_emulators.get_pointing_device()
-        super(GalleryTestCase, self).setUp()
-
-        env_type = self._get_environment_launch_type()
-        self.configure_sample_files(env_type)
-
-        self.launch_gallery_app(env_type)
-
-        self.addCleanup(shutil.rmtree, self.sample_destination_dir)
-        self.addCleanup(logger.debug,
-                        "Deleting %s" % self.sample_destination_dir)
+    def launch_gallery_app(self, env_type):
+        launch_fixture = fixture_setup.LaunchGalleryApp(
+            env_type, self.local_location)
+        self.useFixture(launch_fixture)
+        self.app = launch_fixture.application_proxy
 
         """ This is needed to wait for the application to start.
         In the testfarm, the application may take some time to show up."""
@@ -119,12 +90,6 @@
         for switching to the albums view. Therefore this hack of sleeping"""
         sleep(2)
 
-    def launch_gallery_app(self, env_type):
-        launch_fixture = fixture_setup.LaunchGalleryApp(
-            env_type, self.local_location)
-        self.useFixture(launch_fixture)
-        self.app = launch_fixture.application_proxy
-
     def ui_update(self):
         """ Gives the program the time to update the UI"""
         sleep(0.1)
@@ -211,3 +176,49 @@
         self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
         self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
         return delete_dialog
+
+
+class GalleryTestCaseWithSampleFiles(GalleryTestCase):
+
+    """A common test case class that provides several useful methods for
+       gallery tests."""
+
+    sample_file_source = "/sample01.jpg"
+    tap_press_time = 1
+
+    ARGS = []
+
+    def _get_sample_destination_dir(self):
+        return os.path.expanduser("~/Pictures")
+
+    def configure_sample_files(self):
+        self.sample_dir = resource_filename('gallery_app', 'data')
+        self.sample_destination_dir = self._get_sample_destination_dir()
+        if (os.path.exists(self.sample_destination_dir)):
+            shutil.rmtree(self.sample_destination_dir)
+        self.assertFalse(os.path.exists(self.sample_destination_dir))
+
+        self.sample_file = os.path.join(
+            self.sample_destination_dir,
+            "sample04.jpg"
+        )
+
+        default_data_dir = os.path.join(self.sample_dir, 'default')
+        shutil.copytree(default_data_dir, self.sample_destination_dir)
+        self.assertTrue(os.path.isfile(self.sample_file))
+
+        self.sample_file_source = default_data_dir + self.sample_file_source
+
+    def do_reset_config(self):
+        config = os.path.expanduser(
+            os.path.join("~", ".config", "gallery-app.conf"))
+        if os.path.exists(config):
+            os.remove(config)
+
+    def setUp(self):
+        self.configure_sample_files()
+        self.addCleanup(shutil.rmtree, self.sample_destination_dir)
+        self.addCleanup(logger.debug,
+                        "Deleting %s" % self.sample_destination_dir)
+
+        super(GalleryTestCase, self).setUp()