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

[Nicholas Skaggs]

Remove unused code, and finally fix circle menu test on device (thanks Omer!)

Remove unused code, and finally fix circle menu test on device (thanks Omer!)

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

PASSED: Continuous integration, rev:33
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/19/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-precise-amd64-ci/14
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-quantal-amd64-ci/19
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-raring-amd64-ci/19
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-saucy-amd64-ci/14

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	2013-08-13 23:33:07 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	2013-08-14 22:43:39 +0000
@@ -30,10 +30,14 @@
             poll += 1
             sleep(1)
 
+    def get_main_view(self):
+        self._poll_for_object(lambda: self.select_single("QQuickView"))
+        return self.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.select_single("Header")
 
     def get_slider_item(self, slider):
         self._poll_for_object(lambda: self.select_single("Slider", objectName=slider))
@@ -41,44 +45,28 @@
 
     def get_kterm(self):
         self._poll_for_object(lambda: self.select_single("KTerminalDisplay", objectName="kterm"))
-        return  self.select_single("KTerminalDisplay", objectName="kterm")
+        return self.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.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.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.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.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")
 
-    def expand_width(self, val):
-        """Expand width of the main QML view"""
-        qmlView = self.get_qml_view()
-        startX = int(qmlView.x + qmlView.width)
-        stopX = int(qmlView.x + qmlView.width + val)
-        lineY = int(qmlView.height/2)
-        self.pointing_device.drag(startX, lineY, stopX, lineY)
-
-    def expand_height(self, val):
-        """Expand height of the main QML view"""
-        qmlView = self.get_qml_view()
-        startY = int(qmlView.y + qmlView.height)
-        stopY = int(qmlView.y + qmlView.height + val)
-        lineX = int(qmlView.width/2)
-        self.pointing_device.drag(lineX, startY, lineX, stopY)
-
     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'))
 
=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-08-14 15:27:36 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-08-14 22:43:39 +0000
@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals, GreaterThan, Not, Is
+from testtools.matchers import Equals, Not, Is
 from autopilot.platform import model
 
 from ubuntu_terminal_app.tests import TerminalTestCase, DbMan
@@ -114,6 +114,9 @@
         """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)
         self.pointing_device.press()
         sleep(2)
@@ -158,7 +161,6 @@
     def test_font_size_changes(self):
         """Make sure that font size is set correctly"""
         self.main_view.switch_to_tab("SettingsTab")
-        slider = self.main_view.get_slider_item("slFont")
 
         # change font size to max
         self.main_view.drag_horizontal_slider("slFont",32)