Merge lp:~kissiel/checkbox/autopilot-scenarios into lp:checkbox

[Maciej Kisielewski]

This MR brings several fixes to existing autopilot tests and the scenarios for resume functionality

8ab1bbc checkbox-touch:tests:autopilot: fix mismatch between job names and result
c782de0 checkbox-touch:tests:autopilot: fix start_and_select_tests() (use wait_*)
a759d59 checkbox-touch:tests:autopilot: fix pep8 issues
725a80c checkbox-touch:tests:autopilot: fix selecting on welcome page
c85f59e checkbox-touch:.gitignore: add checkbox-touch.desktop to gitignore
3851c7e checkbox-touch: add resume session autopilot scenarios

[Zygmunt Krynicki (zyga)]

+1, thanks a lot

review: Approve

=== modified file 'checkbox-touch/.gitignore'
--- checkbox-touch/.gitignore	2015-01-30 15:41:28 +0000
+++ checkbox-touch/.gitignore	2015-04-20 10:51:57 +0000
@@ -6,3 +6,5 @@
 settings.json
 # Ignore copied over providers
 providers/
+# Ignore auto-generated desktop file
+checkbox-touch.desktop

=== modified file 'checkbox-touch/tests/autopilot/autopilot-provider/jobs/autopilot.pxu'
--- checkbox-touch/tests/autopilot/autopilot-provider/jobs/autopilot.pxu	2015-04-01 20:28:59 +0000
+++ checkbox-touch/tests/autopilot/autopilot-provider/jobs/autopilot.pxu	2015-04-20 10:51:57 +0000
@@ -15,7 +15,7 @@
  Purpose of this test is to assist Autopilot in testing Checkbox-Touch.
  This test should be failed automatically.
 plugin: shell
-command: true
+command: false
 estimated_duration: 0.1
 flags: preserve-locale
 category_id: normal
@@ -25,7 +25,7 @@
  Purpose of this test is to assist Autopilot in testing Checkbox-Touch.
  This test should be passed automatically.
 plugin: shell
-command: false
+command: true
 estimated_duration: 0.1
 flags: preserve-locale
 category_id: normal

=== modified file 'checkbox-touch/tests/autopilot/checkbox_touch/__init__.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/__init__.py	2015-04-07 17:55:36 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/__init__.py	2015-04-20 10:51:57 +0000
@@ -3,8 +3,6 @@
 """Ubuntu Touch App autopilot tests."""
 
 import os
-import subprocess
-import time
 
 from autopilot import input, platform
 from autopilot.introspection.dbus import StateNotFoundError
@@ -51,41 +49,39 @@
             except StateNotFoundError:
                 pass
             try:
-                welcome_page = self.app.wait_select_single(
+                self.app.wait_select_single(
                     objectName='welcomePage', visible=True)
                 return
             except StateNotFoundError:
                 pass
 
-
     def start_and_select_tests(self, category_id, job_ids):
         self.skipResumeIfShown()
-        start_btn = self.app.select_single(objectName='startTestButton')
-        self.assertThat(start_btn.text, Eventually(Equals("Start Testing")))
+        welcome_page = self.long_wait_select_single(
+            self.app, objectName='welcomePage', state='loaded')
+        start_btn = welcome_page.wait_select_single(
+            objectName='startTestButton')
         self.pointing_device.click_object(start_btn)
-        time.sleep(1)
         self.main_view.get_header().click_action_button('deselectAllAction')
         category_page = self.app.wait_select_single(
             objectName='categorySelectionPage')
-        list_item = category_page.select_single(
+        list_item = category_page.wait_select_single(
             objectName='listItem', item_mod_id=category_id)
         self.pointing_device.click_object(list_item)
         continue_btn = category_page.wait_select_single(
-            objectName='continueButton')
+            objectName='continueButton', visible=True)
         self.pointing_device.click_object(continue_btn)
-        time.sleep(1)
         self.main_view.get_header().click_action_button('deselectAllAction')
         test_selection_page = self.app.wait_select_single(
             objectName='testSelectionPage')
         for job_id in job_ids:
-            list_item = test_selection_page.select_single(
+            list_item = test_selection_page.wait_select_single(
                 objectName='listItem', item_mod_id=job_id)
             list_item.swipe_into_view()
             self.pointing_device.click_object(list_item)
         continue_btn = test_selection_page.wait_select_single(
             objectName='continueButton')
         self.pointing_device.click_object(continue_btn)
-        time.sleep(1)
 
     def launch_application(self):
         if platform.model() == 'Desktop':
@@ -134,4 +130,3 @@
     @property
     def main_view(self):
         return self.app.select_single(emulators.MainView)
-

=== modified file 'checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py'
--- checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py	2015-04-01 21:09:18 +0000
+++ checkbox-touch/tests/autopilot/checkbox_touch/test_checkbox_touch.py	2015-04-20 10:51:57 +0000
@@ -50,8 +50,10 @@
         in two flavours; one that passes and one that fails.
         """
         self.skipResumeIfShown()
-        start_btn = self.app.select_single(objectName='startTestButton')
-        self.assertThat(start_btn.text, Eventually(Equals("Start Testing")))
+        welcome_page = self.long_wait_select_single(
+            self.app, objectName='welcomePage', state='loaded')
+        start_btn = welcome_page.wait_select_single(
+            objectName='startTestButton')
         self.pointing_device.click_object(start_btn)
         category_page = self.app.wait_select_single(
             objectName='categorySelectionPage', visible=True)
@@ -108,3 +110,62 @@
             objectName='skippedLabel')
         self.assertThat(lbl_skipped.text.startswith(results['skipped']),
                         Equals(True))
+
+
+class SessionResumeTests(checkbox_touch.ClickAppTestCase):
+    def select_two_tests_and_quit(self):
+        self.start_and_select_tests(
+            '2015.com.canonical.certification::normal', [
+                '2015.com.canonical.certification::autopilot/user-verify-1',
+                '2015.com.canonical.certification::autopilot/user-verify-2'])
+        # make sure that test is shown (therefore session has been started)
+        self.app.wait_select_single(
+            objectName='userInteractVerifyIntroPage', visible=True)
+        self.app.process.terminate()
+
+    def test_rerun_after_resume(self):
+        self.select_two_tests_and_quit()
+        self.launch_application()
+        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+        # not doing long-wait, as the app was recently launched and it
+        # *shouldn't* take long to relaunch it
+        resume_page = self.app.wait_select_single(
+            objectName='resumeSessionPage', visible=True)
+        rerun_btn = resume_page.wait_select_single(
+            objectName='rerunButton', visible=True)
+        self.pointing_device.click_object(rerun_btn)
+        intro_page = self.app.wait_select_single(
+            objectName='userInteractVerifyIntroPage', visible=True)
+        test_name_label = intro_page.wait_select_single(
+            objectName='testNameLabel', visible=True)
+        self.assertThat(test_name_label.text,
+                        Eventually(Equals('autopilot/user-verify-1')))
+
+    def test_continue_after_resume(self):
+        self.select_two_tests_and_quit()
+        self.launch_application()
+        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+        resume_page = self.app.wait_select_single(
+            objectName='resumeSessionPage', visible=True)
+        continue_btn = resume_page.wait_select_single(
+            objectName='continueButton')
+        self.pointing_device.click_object(continue_btn)
+        intro_page = self.app.wait_select_single(
+            objectName='userInteractVerifyIntroPage', visible=True)
+        test_name_label = intro_page.wait_select_single(
+            objectName='testNameLabel', visible=True)
+        self.assertThat(test_name_label.text,
+                        Eventually(Equals('autopilot/user-verify-2')))
+
+    def test_restart_after_resume(self):
+        self.select_two_tests_and_quit()
+        self.launch_application()
+        self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+        resume_page = self.app.wait_select_single(
+            objectName='resumeSessionPage', visible=True)
+        restart_btn = resume_page.wait_select_single(
+            objectName='restartButton')
+        self.pointing_device.click_object(restart_btn)
+        welcome_page = self.app.wait_select_single(
+            objectName='welcomePage')
+        self.assertThat(welcome_page.visible, Eventually(Equals(True)))