Merge lp:~nskaggs/ubuntu-terminal-app/ap-cleanup into lp:ubuntu-terminal-app

[Nicholas Skaggs]

R-enable test_color_scheme_changes, fix test_font_size_changes, remove extraneous code

R-enable test_color_scheme_changes, fix test_font_size_changes, remove extraneous code.

No attempts made to overhaul the tests to a page object model.

[Nicholas Skaggs (nskaggs)]

Going to open / reference a bug for needing a toolkit helper for itemselector. The test still uses a rudimentary method for this.

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

PASSED: Continuous integration, rev:129
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/83/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1715
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/27

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

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Whop whoop! Thanks!

review: Approve

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/ubuntu-terminal-app-autolanding/50/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1719
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-autolanding/16

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	2014-06-16 10:38:24 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	2014-08-28 16:48:12 +0000
@@ -24,15 +24,9 @@
 
     """Terminal MainView Autopilot emulator."""
 
-    def get_main_view(self):
-        return self.wait_select_single("QQuickView")
-
     def get_slider_item(self, slider):
         return self.wait_select_single("Slider", objectName=slider)
 
-    def get_kterm(self):
-        return self.wait_select_single("KTerminalDisplay", objectName="kterm")
-
     def get_control_panel(self):
         return self.wait_select_single("CtrlKeys", objectName="kbCtrl")
 
@@ -48,11 +42,6 @@
     def get_circle_menu(self):
         return self.wait_select_single("CircleMenu", objectName="cmenu")
 
-    def get_panel_actions_popover(self):
-        """Return the ActionSelectionPopover emulator of the popup action."""
-        return self.wait_select_single(ActionSelectionPopover,
-                                       objectName='panelpopover')
-
     def drag_horizontal_slider(self, slider, pos):
         """Drag slider until value is set"""
         slItem = self.get_slider_item(slider)
@@ -90,38 +79,3 @@
                 sx = valuePos
                 sleep(0.3)
                 loop = loop + 1
-
-
-class ActionSelectionPopover(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
-
-    """ActionSelectionPopover Autopilot emulator."""
-    # TODO Move this to the ubuntu-ui-toolkit. Reported on
-    # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205205
-    # --elopio - 2013-07-25
-
-    def __init__(self, *args):
-        super(ActionSelectionPopover, self).__init__(*args)
-        self.pointing_device = toolkit_emulators.get_pointing_device()
-
-    def click_button(self, text):
-        """Click a button on the popover.
-
-        XXX We are receiving the text because there's no way to set the
-        objectName on the action. This is reported at
-        https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
-        --elopio - 2013-07-25
-
-        :parameter text: The text of the button.
-
-        """
-        button = self._get_button(text)
-        if button is None:
-            raise ValueError(
-                'Button with text "{0}" not found.'.format(text))
-        self.pointing_device.click_object(button)
-
-    def _get_button(self, text):
-        buttons = self.select_many('Empty')
-        for button in buttons:
-            if button.text == text:
-                return button

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-08-10 16:58:06 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-08-28 16:48:12 +0000
@@ -10,14 +10,13 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, Not, Is
+from testtools.matchers import Equals
 from autopilot.platform import model
 
 from ubuntu_terminal_app.tests import TerminalTestCase, DbMan
 from ubuntuuitoolkit import ToolkitException as ToolkitException
 
 from time import sleep
-import unittest
 import random
 
 
@@ -28,9 +27,6 @@
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-    def tearDown(self):
-        super(TestMainWindow, self).tearDown()
-
     def hide_panels(self):
         """Click hide panels button"""
         header = self.main_view.get_header()
@@ -47,33 +43,19 @@
 
     def click_item_selector_item(self, selector, value):
         """Clicks item from item selector"""
-        # The item selector is assumed to be the following format
-        # ListItem.ItemSelector {
-        #    objectName:
-        #    model:
-        self.assertThat(lambda: self.main_view.select_single("ItemSelector",
-                        objectName=selector), Eventually(Not(Is(None))))
-        item_selector = self.main_view.select_single("ItemSelector",
-                                                     objectName=selector)
-        # we need to regrab object as for some reason it can sometimes
-        # change and our ordering will be off down below
-        self.assertThat(lambda: self.main_view.select_single("ItemSelector",
-                        objectName=selector), Eventually(Not(Is(None))))
-        item_selector = self.main_view.select_single("ItemSelector",
-                                                     objectName=selector)
-        self.assertThat(lambda: item_selector.select_many("QQuickColumn"),
-                        Eventually(Not(Is(None))))
-        rows = item_selector.select_many("QQuickColumn")
-        self.assertThat(lambda: rows[0].select_single("QQuickListView",
-                        objectName="listView"), Eventually(Not(Is(None))))
-        items = rows[0].select_single("QQuickListView", objectName="listView")
-        self.pointing_device.click_object(items)
-        for ritem in items:
-            if ritem.text == value:
-                self.pointing_device.click_object(ritem)
-                # the first label is always the "color scheme"
-                itemLabel = lambda: ritem.text
-                self.assertThat(itemLabel, Eventually(Equals(value)))
+        # This needs a toolkit helper
+        # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1272345
+        item_selector = self.main_view.wait_select_single('ItemSelector',
+                                                          objectName=selector)
+        selector = item_selector.wait_select_single('Standard',
+                                                    objectName='listContainer')
+        self.pointing_device.click_object(selector)
+        item_selector.currentlyExpanded.wait_for(True)
+        # waiting for currentlyExpanded is not enough
+        # some animation is not accounted for and thus we sleep
+        sleep(2)
+        item = selector.wait_select_single('Label', text=value)
+        self.pointing_device.click_object(item)
 
     def test_control_panel(self):
         """Make sure that Control Keys Panel is visible
@@ -136,28 +118,24 @@
         else:
             self.assertThat(header, Eventually(Equals(True)))
 
-    @unittest.skip("This test randomly fails and is not consistent")
     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",
+        schemeList = ("BlackOnRandomLight",
                       "BlackOnWhite",
                       "BlackOnLightYellow",
+                      "DarkPastels",
                       "GreenOnBlack",
+                      "Linux",
                       "WhiteOnBlack")
 
+        colorScheme = self.get_color_scheme_from_storage
         for scheme in schemeList:
+            self.main_view.get_header().click_action_button('SettingsButton')
             self.click_item_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.main_view.go_back()
             self.assertThat(colorScheme, Eventually(Equals(scheme)))
 
     def test_font_size_changes(self):
@@ -165,22 +143,18 @@
         header = self.main_view.get_header()
         header.click_action_button('SettingsButton')
 
+        font_size = self.get_font_size_from_storage
+
+        # change font size to min
+        self.main_view.drag_horizontal_slider("slFont", 8)
+        self.assertThat(font_size, Eventually(Equals(8)))
+
         # change font size to max
         self.main_view.drag_horizontal_slider("slFont", 32)
-        sleep(1)
-        font_size = self.get_font_size_from_storage()
-        self.assertThat(font_size, Equals(32))
-
-        # change font size to min
-        self.main_view.drag_horizontal_slider("slFont", 8)
-        sleep(1)
-        font_size = self.get_font_size_from_storage()
-        self.assertThat(font_size, Equals(8))
+        self.assertThat(font_size, Eventually(Equals(32)))
 
         # change font size to random sizes
         for loop in range(1, 3):
-            randSize = random.randrange(8, 32, 1)
+            randSize = random.randrange(9, 31, 1)
             self.main_view.drag_horizontal_slider("slFont", randSize)
-            sleep(1)
-            font_size = self.get_font_size_from_storage()
-            self.assertThat(font_size, Equals(randSize))
+            self.assertThat(font_size, Eventually(Equals(randSize)))