Merge lp:~canonical-platform-qa/unity8/update-autopilot-tests-for-ap1.6 into lp:unity8

[Christopher Lee]

Update autopilot tests and helpers to work with autopilot 1.6

Updating the autopilot tests and helpers to work with the upcoming autopilot 1.6 release that will change the autopilot/cpo behaviour.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1824
http://jenkins.qa.ubuntu.com/job/unity8-ci/5924/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/245/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/204
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/205
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/167/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/245
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21624

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5924/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Please add the checklist at https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

[lp:~canonical-platform-qa/unity8/update-autopilot-tests-for-ap1.6]

1825. By Christopher Lee on 2015-07-06

Merge trunk and fix conflicts with emulator changes/removals

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1825
http://jenkins.qa.ubuntu.com/job/unity8-ci/5937/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/260/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/218
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/180/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/260
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/260/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21657

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5937/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Please clean your tags as described in https://wiki.ubuntu.com/Process/Merges/Checklists/Unity8

Unmerged revisions

1825. By Christopher Lee on 2015-07-06

Merge trunk and fix conflicts with emulator changes/removals

1824. By Christopher Lee on 2015-06-19

Fix use of DisplayIndicatorPage instead of IndicatorPage

1823. By Christopher Lee on 2015-06-19

Example using new CPO query name method

1822. By Christopher Lee on 2015-06-19

Initial updating of tests for autopilot 1.6 changes.

=== modified file 'tests/autopilot/unity8/dash.py'
--- tests/autopilot/unity8/dash.py	2015-06-22 15:47:34 +0000
+++ tests/autopilot/unity8/dash.py	2015-07-06 02:12:14 +0000
@@ -100,7 +100,7 @@
                 'No scope found with id {0}'.format(scope_id))
 
     def _get_scope_from_loader(self, loader):
-        return loader.wait_select_single('GenericScopeView')
+        return loader.wait_select_single(GenericScopeView)
 
     def _open_scope_scrolling(self, scope_loader):
         scroll = self._get_scroll_direction(scope_loader)
@@ -173,7 +173,10 @@
 
     def _get_search_text_field(self):
         page_header = self._get_current_page_header()
-        return page_header.select_single(objectName='searchTextField')
+        return page_header.select_single(
+            ubuntuuitoolkit.TextField,
+            objectName='searchTextField'
+        )
 
     def _get_current_page_header(self):
         dashContentList = self.select_single(objectName="dashContentList")

=== modified file 'tests/autopilot/unity8/indicators/__init__.py'
--- tests/autopilot/unity8/indicators/__init__.py	2015-04-28 15:20:13 +0000
+++ tests/autopilot/unity8/indicators/__init__.py	2015-07-06 02:12:14 +0000
@@ -61,8 +61,9 @@
         indicator_rotation_icon = self._main_window.select_single(
             objectName=self._name+'-panelItem')
         self._main_window.pointing_device.click_object(indicator_rotation_icon)
-        return self._main_window.wait_select_single(
-            objectName=self._name+'-page')
+        return DisplayIndicatorPage.from_proxy_object(
+            self._main_window.wait_select_single(objectName=self._name+'-page')
+        )
 
     def _make_indicator_icon_visible(self):
         indicators_bar = self._main_window.select_single('IndicatorsBar')
@@ -158,7 +159,7 @@
             'SwitchMenu', objectName='indicator.action.switch')
 
     def get_slider(self):
-        return self.select_single(objectName='slider')
+        return self.select_single(Slider, objectName='slider')
 
     def get_slider_menu(self):
         return self.select_single(objectName='indicator.action.slider')

=== modified file 'tests/autopilot/unity8/indicators/tests/test_action_latency.py'
--- tests/autopilot/unity8/indicators/tests/test_action_latency.py	2015-05-06 16:30:15 +0000
+++ tests/autopilot/unity8/indicators/tests/test_action_latency.py	2015-07-06 02:12:14 +0000
@@ -22,7 +22,10 @@
     fixture_setup,
     indicators,
 )
-from unity8.indicators import tests
+from unity8.indicators import (
+    TestIndicatorPage,
+    tests
+)
 
 from autopilot.matchers import Eventually
 from testtools.matchers import Equals, NotEquals
@@ -43,7 +46,11 @@
             self.indicator.is_indicator_icon_visible(),
             Eventually(Equals(True), timeout=20)
         )
-        self.indicator_page = self.indicator.open()
+        # Force to be TestIndicatorPage as CPOs need to be explicit, can't just
+        # select using objectName.
+        self.indicator_page = TestIndicatorPage.from_proxy_object(
+            self.indicator.open()
+        )
 
     def launch_indicator_service(self):
         launch_service_fixture = \

=== modified file 'tests/autopilot/unity8/shell/__init__.py'
--- tests/autopilot/unity8/shell/__init__.py	2015-06-22 15:47:34 +0000
+++ tests/autopilot/unity8/shell/__init__.py	2015-07-06 02:12:14 +0000
@@ -31,6 +31,7 @@
     greeter,
     launcher as launcher_helpers
 )
+from unity8.indicators import DisplayIndicatorPage
 
 
 logger = logging.getLogger(__name__)
@@ -127,9 +128,8 @@
         )
 
     def _get_indicator_page(self, indicator_name):
-        return self.select_single(
-            'IndicatorPage',
-            objectName=indicator_name+'-page'
+        return DisplayIndicatorPage.from_proxy_object(
+            self.select_single(objectName=indicator_name+'-page')
         )
 
     @autopilot_logging.log_action(logger.info)

=== added directory 'tests/autopilot/unity8/shell/emulators'
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2015-05-15 07:15:36 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2015-07-06 02:12:14 +0000
@@ -28,7 +28,10 @@
 from autopilot.matchers import Eventually
 from gi.repository import Notify
 from testtools.matchers import Equals, NotEquals
-from ubuntuuitoolkit import ubuntu_scenarios
+from ubuntuuitoolkit import (
+    UbuntuUIToolkitCustomProxyObjectBase,
+    ubuntu_scenarios
+)
 
 from unity8 import shell
 from unity8.process_helpers import unlock_unity
@@ -38,6 +41,11 @@
 logger = logging.getLogger(__name__)
 
 
+# CPO to assist during testing (gives it a pointing_device)
+class Notification(UbuntuUIToolkitCustomProxyObjectBase):
+    pass
+
+
 class NotificationsBase(UnityTestCase):
     """Base class for all notification tests that provides helper methods."""
 
@@ -143,7 +151,7 @@
         )
 
         get_notification = lambda: notify_list.wait_select_single(
-            'Notification', objectName='notification1')
+            Notification, objectName='notification1')
         notification = get_notification()
 
         notification.pointing_device.click_object(
@@ -185,7 +193,7 @@
         # verify and interact with the triggered snap-decision notification
         notify_list = self._get_notifications_list()
         get_notification = lambda: notify_list.wait_select_single(
-            'Notification', objectName='notification1')
+            Notification, objectName='notification1')
         notification = get_notification()
         self._assert_notification(
             notification, summary, body, False, False, 1.0)
@@ -234,7 +242,7 @@
         # verify and interact with the triggered snap-decision notification
         notify_list = self._get_notifications_list()
         get_notification = lambda: notify_list.wait_select_single(
-            'Notification', objectName='notification1')
+            Notification, objectName='notification1')
         notification = get_notification()
         self._assert_notification(
             notification, summary, body, True, False, 1.0)
@@ -282,7 +290,7 @@
         # verify and interact with the triggered snap-decision notification
         notify_list = self._get_notifications_list()
         get_notification = lambda: notify_list.wait_select_single(
-            'Notification', objectName='notification1')
+            Notification, objectName='notification1')
         notification = get_notification()
         self._assert_notification(
             notification, summary, body, True, False, 1.0)

=== modified file 'tests/autopilot/unity8/shell/tests/test_tutorial.py'
--- tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-04-29 19:21:18 +0000
+++ tests/autopilot/unity8/shell/tests/test_tutorial.py	2015-07-06 02:12:14 +0000
@@ -24,8 +24,7 @@
     fixture_setup,
     tests
 )
-# unused import to load the tutorial helpers custom proxy objects.
-from unity8 import tutorial as tutorial_helpers  # NOQA
+from unity8.tutorial import TutorialPage
 
 
 class TutorialTestCase(tests.UnityTestCase):
@@ -43,15 +42,30 @@
         tutorial = self.unity.select_single('Tutorial')
         self.assertThat(tutorial.running, Eventually(Equals(True)))
         greeter.swipe()
-        page = self.unity.wait_select_single(objectName='tutorialLeft')
+        page = self.unity.wait_select_single(
+            TutorialPage,
+            objectName='tutorialLeft'
+        )
         page.short_swipe_right()
-        page = self.unity.wait_select_single(objectName='tutorialLeftFinish')
+        page = self.unity.wait_select_single(
+            TutorialPage,
+            objectName='tutorialLeftFinish'
+        )
         page.tap()
-        page = self.unity.wait_select_single(objectName='tutorialRight')
+        page = self.unity.wait_select_single(
+            TutorialPage,
+            objectName='tutorialRight'
+        )
         page.swipe_left()
         page.tap()
-        page = self.unity.wait_select_single(objectName='tutorialBottom')
+        page = self.unity.wait_select_single(
+            TutorialPage,
+            objectName='tutorialBottom'
+        )
         page.swipe_up()
-        page = self.unity.wait_select_single(objectName='tutorialBottomFinish')
+        page = self.unity.wait_select_single(
+            TutorialPage,
+            objectName='tutorialBottomFinish'
+        )
         page.tap()
         self.assertThat(tutorial.running, Eventually(Equals(False)))

=== modified file 'tests/autopilot/unity8/tutorial.py'
--- tests/autopilot/unity8/tutorial.py	2015-04-29 19:21:18 +0000
+++ tests/autopilot/unity8/tutorial.py	2015-07-06 02:12:14 +0000
@@ -38,6 +38,13 @@
                         b'TutorialLeftFinish', b'TutorialRight',
                         b'TutorialBottom', b'TutorialBottomFinish')
 
+    @classmethod
+    def get_type_query_name(cls):
+        # Tutorial page name can be different, validate_dbus_object will remove
+        # the chaff.
+        # Note. this is not a very efficient query
+        return '*'
+
     @autopilot.logging.log_action(logger.info)
     def short_swipe_right(self):
         self.shown.wait_for(True)