Merge lp:~paulliu/unity8/shellRotation_macslow into lp:~macslow/unity8/shellRotation

[Ying-Chun Liu]

Add test fake sensors.
Add test rotation on webbrowser-app

Add test fake sensors.
Add test rotation on webbrowser-app

[Mirco Müller (macslow)]

I can only get your added tests test_fake_sensor() and test_rotation_with_webbrowser_app() to work when I add _environment['UBUNTU_PLATFORM_API_TEST_OVERRIDE']='sensors' to _restart_unity_with_testability() in <branch>/tests/autopilot/unity8/fixture_setup.py

I also get occasional failures like: http://pastebin.ubuntu.com/10723598

Do these tests always pass on your device?

[Mirco Müller (macslow)]

I can get test_fake_sensor() and test_rotation_with_webbrowser_app() to work and pass without the explicit _environment['UBUNTU_PLATFORM_API_TEST_OVERRIDE']='sensors'. But the success-rate is only 25% at best.

[Mirco Müller (macslow)]

Code-wise I'm fine with your branch and would like to approve it, but the failures I still see here make me hesitate a bit. But on the other hand, this is just to merge into my branch and not to trunk, so I would continue the battle there.

[Mirco Müller (macslow)]

See above.

review: Approve

=== modified file 'qml/Rotation/ImmediateRotationAction.qml'
--- qml/Rotation/ImmediateRotationAction.qml	2015-03-06 04:44:11 +0000
+++ qml/Rotation/ImmediateRotationAction.qml	2015-04-01 16:45:52 +0000
@@ -43,4 +43,3 @@
         info.transitioning = false;
     }
 }
-
 
=== modified file 'tests/autopilot/unity8/fixture_setup.py'
--- tests/autopilot/unity8/fixture_setup.py	2015-04-01 11:25:54 +0000
+++ tests/autopilot/unity8/fixture_setup.py	2015-04-01 16:45:52 +0000
@@ -147,7 +147,7 @@
         with open(fifo_path, 'w') as fifo:
             fifo.write('create accel 0 1000 0.1\n')
             fifo.write('create light 0 10 1\n')
-            fifo.write('create proximity\n') 
+            fifo.write('create proximity\n')
 
 class LaunchDashApp(fixtures.Fixture):
 
 
=== modified file 'tests/autopilot/unity8/shell/tests/test_rotation.py'
--- tests/autopilot/unity8/shell/tests/test_rotation.py	2015-03-30 14:53:21 +0000
+++ tests/autopilot/unity8/shell/tests/test_rotation.py	2015-04-01 16:45:52 +0000
@@ -31,6 +31,7 @@
 import ubuntuuitoolkit
 import logging
 from testtools.matchers import Equals, NotEquals
+from autopilot.matchers import Eventually
 
 logger = logging.getLogger(__name__)
 
@@ -46,16 +47,13 @@
         self._qml_mock_enabled = False
         #self._data_dirs_mock_enabled = False
 
-        # get unity8 with fake sensors running 
+        # get unity8 with fake sensors running
         #unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
         #self.useFixture(unity_with_sensors)
         #process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
         #self.fake_sensors = unity_with_sensors.fake_sensors
         #self.shell_proxy = unity_with_sensors.main_win.select_single(objectName="shell")
 
-        self.shell_proxy = self.launch_unity()
-        process_helpers.unlock_unity(self.shell_proxy)
-
     def _create_test_application(self):
         desktop_file_dict = ubuntuuitoolkit.fixture_setup.DEFAULT_DESKTOP_FILE_DICT
         desktop_file_dict.update({'X-Ubuntu-Single-Instance': 'true'})
@@ -80,9 +78,96 @@
         self.assertThat(self.orientation, Equals(tmp_o))
         self.assertThat(self.angle, Equals(tmp_a))
 
+    def test_fake_sensor(self):
+        unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
+        self.useFixture(unity_with_sensors)
+        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
+        fake_sensors = unity_with_sensors.fake_sensors
+        oriented_shell_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
+
+        fake_sensors.set_orientation_top_up()
+        target_orientation = 1
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+        fake_sensors.set_orientation_right_up()
+        target_orientation = 8
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+        fake_sensors.set_orientation_top_down()
+        target_orientation = 4
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+        fake_sensors.set_orientation_left_up()
+        target_orientation = 2
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(target_orientation), timeout=15))
+
+    def test_rotation_with_webbrowser_app(self):
+        """Do an orientation-change and verify that an app and the shell adapted correctly"""
+
+        unity_with_sensors = fixture_setup.LaunchUnityWithFakeSensors()
+        self.useFixture(unity_with_sensors)
+        process_helpers.unlock_unity(unity_with_sensors.unity_proxy)
+        fake_sensors = unity_with_sensors.fake_sensors
+        oriented_shell_proxy = unity_with_sensors.main_win.select_single('OrientedShell')
+        self.shell_proxy = unity_with_sensors.main_win.select_single('Shell')
+
+        # launch an application
+        self.launch_upstart_application('webbrowser-app')
+        unity_with_sensors.main_win.show_dash_from_launcher()
+        unity_with_sensors.main_win.launch_application('webbrowser-app')
+        self.assertThat(unity_with_sensors.main_win.get_current_focused_app_id(), Eventually(Equals('webbrowser-app')))
+
+        # get default orientation and angle
+        self.orientation = self.shell_proxy.orientation
+        self.angle = self.shell_proxy.orientationAngle
+
+        # check if fake sensors affect orientation and angle
+        fake_sensors.set_orientation_top_up()
+        self.orientation = 1
+        self.angle = 0
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        print("\nafter fake-sensor changed to top-up...")
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            print("unsupported orientations. skipped.")
+
+        fake_sensors.set_orientation_right_up()
+        self.orientation = 8
+        self.angle = 90
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        print("\nafter fake-sensor changed to right-up...")
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            print("unsupported orientations. skipped.")
+
+        fake_sensors.set_orientation_top_down()
+        self.orientation = 4
+        self.angle = 180
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        print("\nafter  top-down...")
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            print("unsupported orientations. skipped.")
+
+        fake_sensors.set_orientation_left_up()
+        self.orientation = 2
+        self.angle = 270
+        self.assertThat(oriented_shell_proxy.physicalOrientation, Eventually(Equals(self.orientation), timeout=15))
+        print("\nafter fake-sensor changed to left-up...")
+        if (self.orientation & oriented_shell_proxy.supportedOrientations):
+            self._assert_change_of_orientation_and_angle()
+        else:
+            print("unsupported orientations. skipped.")
+
     def test_rotation(self):
         """Do an orientation-change and verify that an app and the shell adapted correctly"""
 
+        shell_proxy = self.launch_unity()
+        process_helpers.unlock_unity(shell_proxy)
+
         # launch an application
         app_name = self._launch_fake_app()
         print("\nfake app-name: ", app_name)