Merge lp:~nskaggs/ubuntu-terminal-app/fix-circle-test into lp:ubuntu-terminal-app

[Nicholas Skaggs]

Fix check for circle menu test
Remove polling test emulator function

Fix check for circle menu test
Remove polling test emulator function

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:40
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/41/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1532
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/29

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/41/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

hm, ok wait_select_single() changes are ok, so +1 on those. Not sure about line 77.
This will fix the test but it *might* theoretically make this test broken in certain cases, like when the phone is in landscape orientation. Then the first press is done in the middle of the screen, the OSK pops up, takes up half of the screen and the longpress is not registered (because the press happens on the OSK).

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

I wanted to see how jenkins responded as well to the changes. We can disable the OSK for the run, or select someplace outside the middle of the screen to ensure we don't run into the OSK.

[lp:~nskaggs/ubuntu-terminal-app/fix-circle-test]

41. By Nicholas Skaggs on 2014-02-27

tweak circle menu to top in top third of screen

[Łukasz Zemczak (sil2100)]

I did the tap on the top of the screen with the following code:

        x, y = get_center_point(kterm)
        y = kterm.y + ((y - kterm.y) / 3)
        self.pointing_device.move(x, y)
        self.pointing_device.press()

But this was using autopilot.input._common's get_center_point, which seems to be a private function. Maybe we could use center_x or center_y instead?

[Łukasz Zemczak (sil2100)]

It's coooool! +1

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:41
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/42/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1533
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/42
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-trusty-amd64-ci/30

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/42/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	2013-08-14 22:40:48 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	2014-02-27 17:17:43 +0000
@@ -23,54 +23,37 @@
 class MainView(toolkit_emulators.MainView):
     """Terminal MainView Autopilot emulator."""
 
-    def _poll_for_object(self, function, timeout = 10):
-        """Wait until the function returns an object, or timesout"""
-        poll = 0
-        while function == None and poll < timeout:
-            poll += 1
-            sleep(1)
-
     def get_main_view(self):
-        self._poll_for_object(lambda: self.select_single("QQuickView"))
-        return self.select_single("QQuickView")
+        return self.wait_select_single("QQuickView")
 
     def get_header_item(self):
         """Get the header"""
-        self._poll_for_object(lambda: self.select_single("Header"))
-        return self.select_single("Header")
+        return self.wait_select_single("Header")
 
     def get_slider_item(self, slider):
-        self._poll_for_object(lambda: self.select_single("Slider", objectName=slider))
-        return self.select_single("Slider", objectName=slider)
+        return self.wait_select_single("Slider", objectName=slider)
 
     def get_kterm(self):
-        self._poll_for_object(lambda: self.select_single("KTerminalDisplay", objectName="kterm"))
-        return self.select_single("KTerminalDisplay", objectName="kterm")
+        return self.wait_select_single("KTerminalDisplay", objectName="kterm")
 
     def get_control_panel(self):
-        self._poll_for_object(lambda: self.select_single("CtrlKeys", objectName="kbCtrl"))
-        return self.select_single("CtrlKeys", objectName="kbCtrl")
+        return self.wait_select_single("CtrlKeys", objectName="kbCtrl")
 
     def get_function_panel(self):
-        self._poll_for_object(lambda: self.select_single("FnKeys", objectName="kbFn"))
-        return self.select_single("FnKeys", objectName="kbFn")
+        return self.wait_select_single("FnKeys", objectName="kbFn")
 
     def get_scroll_panel(self):
-        self._poll_for_object(lambda: self.select_single("ScrlKeys", objectName="kbScrl"))
-        return self.select_single("ScrlKeys", objectName="kbScrl")
+        return self.wait_select_single("ScrlKeys", objectName="kbScrl")
 
     def get_terminal_page(self):
-        self._poll_for_object(lambda: self.select_single("Terminal", objectName="pgTerm"))
-        return self.select_single("Terminal", objectName="pgTerm")
+        return self.wait_select_single("Terminal", objectName="pgTerm")
 
     def get_circle_menu(self):
-        self._poll_for_object(lambda: self.select_single("CircleMenu", objectName="cmenu"))
-        return self.select_single("CircleMenu", objectName="cmenu")
+        return self.wait_select_single("CircleMenu", objectName="cmenu")
 
     def get_panel_actions_popover(self):
         """Return the ActionSelectionPopover emulator of the popup action."""
-        self._poll_for_object(lambda: self.select_single(ActionSelectionPopover, objectName='panelpopover'))
-        return self.select_single(ActionSelectionPopover, objectName='panelpopover')
+        return self.wait_select_single(ActionSelectionPopover, objectName='panelpopover')
 
     def drag_horizontal_slider(self, slider, pos):
         """Drag slider until value is set"""
 
=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-01-07 16:35:37 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-02-27 17:17:43 +0000
@@ -113,15 +113,20 @@
         """Make sure that Circle Menu is visible
         on long tap"""
         kterm = self.main_view.get_terminal_page()
-        #in order to ensure the longtap is pressed, we click and wait for OSK to appear
-        self.pointing_device.click_object(kterm)
-        sleep(2)
-        self.pointing_device.move_to_object(kterm)
+        x, y, w, h = kterm.globalRect
+        tap_x = (x + w ) / 2
+        tap_y = (y + h ) / 3
+
+        #tap in the top third of the screen, to avoid OSK
+        self.pointing_device.move(tap_x, tap_y)
         self.pointing_device.press()
-        sleep(2)
+        #we can hold the press for a long time without issue
+        #so we'll ensure the app recieves our signal when under load
+        sleep(4)
         self.pointing_device.release()
-        menu = lambda: self.main_view.get_circle_menu().visible
-        self.assertThat(menu, Eventually(Equals(True)))
+
+        menu = self.main_view.get_circle_menu()
+        self.assertThat(menu.visible, Eventually(Equals(True)))
 
     def test_header(self):
         """Make sure that Header is visible