Merge lp:~canonical-platform-qa/ubuntu-system-tests/landscape-mode into lp:ubuntu-system-tests

[Richard Huddie]

Unmerged revisions

361. By Richard Huddie on 2016-03-23

over-ride launcher to use landscape co-ords.

360. By Richard Huddie on 2016-03-23

Use helpers to get landscape co-ords.

359. By Richard Huddie on 2016-03-23

Add helper to get co-ords based on orientation.

=== modified file 'ubuntu_system_tests/helpers/screen.py'
--- ubuntu_system_tests/helpers/screen.py	2015-12-02 11:18:18 +0000
+++ ubuntu_system_tests/helpers/screen.py	2016-04-01 09:35:35 +0000
@@ -19,6 +19,8 @@
 
 import dbus
 
+from ubuntu_system_tests.helpers import context
+
 SCREEN_BUS = 'com.canonical.Unity.Screen'
 PATH = '/'
 
@@ -40,3 +42,24 @@
     bus = dbus.SystemBus()
     screen = dbus.Interface(bus.get_object(SCREEN_BUS, PATH), SCREEN_BUS)
     screen.setTouchVisualizationEnabled(enabled)
+
+
+def get_native_coords(x, y):
+    """Return x,y co-ordinates for a specified position on screen if the device
+    is upright at zero degrees of rotation.
+
+    This is done by finding the current angle of rotation and then transforming
+    the specified x,y co-ordinates to the same point on screen when the device
+    is at zero degrees.
+    """
+    shell = context.shared.unity.select_single('Shell', objectName='shell')
+    angle = shell.orientationAngle
+
+    if angle == 90:
+        return shell.height - y, x
+    elif angle == 180:
+        return shell.height - x, shell.width - y
+    elif angle == 270:
+        return y, shell.width - x
+    else:
+        return x, y

=== modified file 'ubuntu_system_tests/helpers/unity8/dash.py'
--- ubuntu_system_tests/helpers/unity8/dash.py	2016-02-03 16:09:24 +0000
+++ ubuntu_system_tests/helpers/unity8/dash.py	2016-04-01 09:35:35 +0000
@@ -26,6 +26,7 @@
 from ubuntu_system_tests.helpers.autopilot import (
     patched_wait_select_single, validate_dbus_object, wait_select_many)
 from ubuntu_system_tests.helpers.autopilot.list import order_by_x_coord
+from ubuntu_system_tests.helpers.screen import get_native_coords
 from ubuntu_system_tests.helpers.ubuntuuitoolkit.pageheader import (
     DashPageHeader
 )
@@ -139,7 +140,9 @@
         start_x, start_y = get_center_point(overview_drag_handle)
         stop_x = start_x
         stop_y = 0
-        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+        start = get_native_coords(start_x, start_y)
+        stop = get_native_coords(stop_x, stop_y)
+        self.pointing_device.drag(*(start + stop))
         self.wait_for_dash_loaded()
         return self.wait_select_single(
             ScopesList,

=== modified file 'ubuntu_system_tests/helpers/unity8/shell.py'
--- ubuntu_system_tests/helpers/unity8/shell.py	2016-03-15 12:29:54 +0000
+++ ubuntu_system_tests/helpers/unity8/shell.py	2016-04-01 09:35:35 +0000
@@ -24,12 +24,16 @@
     exceptions,
     logging as autopilot_logging
 )
+from autopilot.introspection.types import Rectangle
 import ubuntuuitoolkit
 from unity8.shell.emulators import main_window
+from unity8.launcher import Launcher
 
+from ubuntu_system_tests.helpers import context
 from ubuntu_system_tests.helpers.autopilot import validate_dbus_object
 from ubuntu_system_tests.helpers.indicators.message import NotificationsIndicatorPage, NotificationsIndicatorItem  # NOQA
 from ubuntu_system_tests.helpers.notifications import Notifications
+from ubuntu_system_tests.helpers.screen import get_native_coords
 from ubuntu_system_tests.helpers.unity8 import (
     greeter as greeter_helpers, UNITY8_PATH_ROOT)
 
@@ -167,3 +171,25 @@
         item = self.select_single('IndicatorItem',
                                   objectName=indicator_name + '-panelItem')
         return item.hidden
+
+
+class Launcher(Launcher):
+
+    @classmethod
+    def validate_dbus_object(cls, path, state):
+        return validate_dbus_object(
+            path, state, UNITY8_PATH_ROOT, b'Launcher', objectName='launcher')
+
+    def _swipe_to_show_launcher(self):
+        #unity = context.shared.unity
+        #shell = unity.select_single('Shell', objectName='shell')
+        #view = Rectangle(
+        #    shell.globalRect.x, shell.globalRect.y, shell.width, shell.height)
+        view = self.get_root_instance().select_single('ShellView')
+        start_y = stop_y = view.y + view.height // 2
+
+        start_x = view.x + 1
+        stop_x = start_x + self.panelWidth - 1
+        start = get_native_coords(start_x, start_y)
+        stop = get_native_coords(stop_x, stop_y)
+        self.pointing_device.drag(*(start + stop))