Merge lp:~nskaggs/ubuntu-terminal-app/polling-test-idea into lp:ubuntu-terminal-app

[Nicholas Skaggs]

Change to polling instead of using assert, fix lambda silliness, and enable all tests

Change to polling instead of using assert, fix lambda silliness, and enable all tests

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

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

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	2013-08-09 19:46:40 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	2013-08-13 23:40:45 +0000
@@ -23,30 +23,45 @@
 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_header_item(self):
         """Get the header"""
+        self._poll_for_object(lambda: self.select_single("Header"))
         return  self.select_single("Header")
 
     def get_slider_item(self, slider):
-        """Get the header"""
-        return  self.select_single("Slider", objectName=slider)
+        self._poll_for_object(lambda: self.select_single("Slider", objectName=slider))
+        return self.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")
+
     def get_control_panel(self):
+        self._poll_for_object(lambda: 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")
 
     def get_scroll_panel(self):
+        self._poll_for_object(lambda: 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")
 
     def get_circle_menu(self):
-        return  self.select_single("CircleMenu", objectName="cmenu")
+        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"""
@@ -66,6 +81,7 @@
 
     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')
 
     def drag_horizontal_slider(self, slider, pos):

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-08-09 22:26:21 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-08-13 23:40:45 +0000
@@ -10,7 +10,7 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, NotEquals,GreaterThan
+from testtools.matchers import Equals, NotEquals, GreaterThan, Not, Is
 from autopilot.platform import model
 
 from ubuntu_terminal_app.tests import TerminalTestCase, DbMan
@@ -43,29 +43,30 @@
             timeout+=1
         panel_popover.click_button("Hide extra panel")
 
-    #def click_value_selector_item(self, selector, value):
-        #"""Clicks value from value selector"""
-        ## The value selector is assumed to be the following format
-        ## ListItem.ValueSelector {
-        ##    objectName:
-        ##    values:
-        #val_selector = self.main_view.select_single("ValueSelector", objectName=selector)
-        #self.assertThat(lambda: val_selector, Eventually(NotEquals(None)))
-        #self.pointing_device.click_object(val_selector)
-        #rows = val_selector.select_single("QQuickColumn")
-        #rects = rows.select_many("QQuickRectangle")
-        #for ritem in rects:
-            #labelList = ritem.select_many("LabelVisual")
-            #for label in labelList:
-                #if label.text == value:
-                    #self.pointing_device.click_object(label)
-                    ##check to make sure update is complete
-                    #self.assertThat(lambda: val_selector.select_single("QQuickRepeater").state, Eventually(Equals("closed")))
-                    ##check label match
-                    #valBase = val_selector.select_single("Base")
-                    ##the first label is always the "color scheme"
-                    #valLabel = valBase.select_many("LabelVisual")[1]
-                    #self.assertThat(lambda: valLabel.text, Eventually(Equals(value)))
+    def click_value_selector_item(self, selector, value):
+        """Clicks value from value selector"""
+        # The value selector is assumed to be the following format
+        # ListItem.ValueSelector {
+        #    objectName:
+        #    values:
+        val_selector = lambda: self.main_view.select_single("ValueSelector", objectName=selector)
+        self.assertThat(val_selector, Eventually(Not(Is(None))))
+        self.pointing_device.click_object(val_selector)
+        rows = val_selector.select_single("QQuickColumn")
+        rects = rows.select_many("QQuickRectangle")
+        for ritem in rects:
+            labelList = ritem.select_many("LabelVisual")
+            for label in labelList:
+                if label.text == value:
+                    self.pointing_device.click_object(label)
+                    #check to make sure update is complete
+                    valState = lambda: val_selector.select_single("QQuickRepeater").state
+                    self.assertThat(valState, Eventually(Equals("closed")))
+                    #check label match
+                    valBase = val_selector.select_single("Base")
+                    #the first label is always the "color scheme"
+                    valLabel = lambda: valBase.select_many("LabelVisual")[1].text
+                    self.assertThat(valLabel, Eventually(Equals(value)))
 
     def test_control_panel(self):
         """Make sure that Control Keys Panel is visible
@@ -74,16 +75,12 @@
         toolbar.click_button("PanelsButton")
 
         panel_popover = self.main_view.get_panel_actions_popover()
-        self.assertThat(lambda: panel_popover, Eventually(NotEquals(None)))
         panel_popover.click_button("Control keys")
 
-        panelCtrl = self.main_view.get_control_panel()
-        self.assertThat(lambda: panelCtrl.visible, Eventually(Equals(True)))
-
+        panelCtrl = lambda: self.main_view.get_control_panel().visible
+        self.assertThat(panelCtrl, Eventually(Equals(True)))
         self.hide_panels()
-
-        panelCtrl = self.main_view.get_control_panel()
-        self.assertThat(lambda: panelCtrl.visible, Eventually(Equals(False)))
+        self.assertThat(panelCtrl, Eventually(Equals(False)))
 
     def test_function_panel(self):
         """Make sure that function Keys Panel is visible
@@ -92,16 +89,12 @@
         toolbar.click_button("PanelsButton")
 
         panel_popover = self.main_view.get_panel_actions_popover()
-        self.assertThat(lambda: panel_popover, Eventually(NotEquals(None)))
         panel_popover.click_button("Function keys")
 
-        panelFunc = self.main_view.get_function_panel()
-        self.assertThat(lambda: panelFunc.visible, Eventually(Equals(True)))
-
+        panelFunc = lambda: self.main_view.get_function_panel().visible
+        self.assertThat(panelFunc, Eventually(Equals(True)))
         self.hide_panels()
-
-        panelFunc = self.main_view.get_function_panel()
-        self.assertThat(lambda: panelFunc.visible, Eventually(Equals(False)))
+        self.assertThat(panelFunc, Eventually(Equals(False)))
 
     def test_textctrl_panel(self):
         """Make sure that Text Control Keys Panel is visible
@@ -110,60 +103,56 @@
         toolbar.click_button("PanelsButton")
 
         panel_popover = self.main_view.get_panel_actions_popover()
-        self.assertThat(lambda: panel_popover, Eventually(NotEquals(None)))
         panel_popover.click_button("Text ctrl keys")
 
-        panelScrl = self.main_view.get_scroll_panel()
-        self.assertThat(lambda: panelScrl.visible, Eventually(Equals(True)))
-
+        panelScrl = lambda: self.main_view.get_scroll_panel().visible
+        self.assertThat(panelScrl, Eventually(Equals(True)))
         self.hide_panels()
-
-        panelScrl = self.main_view.get_scroll_panel()
-        self.assertThat(lambda: panelScrl.visible, Eventually(Equals(False)))
+        self.assertThat(panelScrl, Eventually(Equals(False)))
 
     def test_circle_menu_shows(self):
         """Make sure that Circle Menu is visible
         on long tap"""
         kterm = self.main_view.get_terminal_page()
-        menu = self.main_view.get_circle_menu()
         self.pointing_device.click_object(kterm)
         self.pointing_device.press()
         sleep(2)
         self.pointing_device.release()
-        self.assertThat(menu.visible, Eventually(Equals(True)))
+        menu = lambda: self.main_view.get_circle_menu().visible
+        self.assertThat(menu, Eventually(Equals(True)))
 
     def test_header(self):
         """Make sure that Header is visible
         in Portrait Mode and not visible in landscape mode"""
-        header = self.main_view.get_header_item().visible
+        header = lambda: self.main_view.get_header_item().visible
         if model() == "Nexus 10" or model() == "Nexus 7":
-            self.assertThat(lambda: header, Eventually(Equals(False)))
+            self.assertThat(header, Eventually(Equals(False)))
         else:
-            self.assertThat(lambda: header, Eventually(Equals(True)))
-
-    #def test_color_scheme_changes(self):
-        #"""Make sure that color scheme is set correctly"""
-        #kterm = self.main_view.get_kterm()
-        #self.main_view.switch_to_tab("SettingsTab")
-
-        ##are these string translatable?
-        ##if so, we need to do this another way
-        #schemeList = ("DarkPastels",
-            #"Linux",
-            #"BlackOnRandomLight",
-            #"BlackOnWhite",
-            #"BlackOnLightYellow",
-            #"GreenOnBlack",
-            #"WhiteOnBlack",
-            #)
-
-        #for scheme in schemeList:
-            #self.click_value_selector_item("liSchemes",scheme)
-            ## This assert uses KTerminalDisplay property (old rev)
-            #self.assertThat(kterm.colorScheme, Eventually(Equals(scheme)))
-            ## This assert uses localstorage (new rev)
-            #colorScheme = self.get_color_scheme_from_storage()
-            #self.assertThat(lambda: colorScheme, Eventually(Equals(scheme)))
+            self.assertThat(header, Eventually(Equals(True)))
+
+    def test_color_scheme_changes(self):
+        """Make sure that color scheme is set correctly"""
+        kterm = self.main_view.get_kterm()
+        self.main_view.switch_to_tab("SettingsTab")
+
+        #are these string translatable?
+        #if so, we need to do this another way
+        schemeList = ("DarkPastels",
+            "Linux",
+            "BlackOnRandomLight",
+            "BlackOnWhite",
+            "BlackOnLightYellow",
+            "GreenOnBlack",
+            "WhiteOnBlack",
+            )
+
+        for scheme in schemeList:
+            self.click_value_selector_item("liSchemes",scheme)
+            # This assert uses KTerminalDisplay property (old rev)
+            self.assertThat(kterm.colorScheme, Eventually(Equals(scheme)))
+            # This assert uses localstorage (new rev)
+            colorScheme = self.get_color_scheme_from_storage
+            self.assertThat(colorScheme, Eventually(Equals(scheme)))
 
 
     def test_font_size_changes(self):