Merge lp:~nskaggs/ubuntu-terminal-app/convert-ap-to-sdk-emulator into lp:ubuntu-terminal-app

[Nicholas Skaggs]

This converts the terminal ap tests to the ubuntusdk emulator as well as cleans up and fixes all the tests; including the color scheme check

This converts the terminal ap tests to the ubuntusdk emulator as well as cleans up and fixes all the tests; including the color scheme check

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

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

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Top approving to force new build for ease of testing on device.

[lp:~nskaggs/ubuntu-terminal-app/convert-ap-to-sdk-emulator]

25. By Nicholas Skaggs on 2013-08-09

add ubuntu-ui-toolkit-autopilot dependency, sigh /me facepalms

26. By Nicholas Skaggs on 2013-08-09

change to polling to support gated review vm

27. By Nicholas Skaggs on 2013-08-09

remove polling, remove kterm scheme

28. By Nicholas Skaggs on 2013-08-09

comment out font size change test for now

29. By Nicholas Skaggs on 2013-08-13

migrated to object polling instead of asserts

30. By Nicholas Skaggs on 2013-08-13

fix valueselector function

Unmerged revisions

30. By Nicholas Skaggs on 2013-08-13

fix valueselector function

29. By Nicholas Skaggs on 2013-08-13

migrated to object polling instead of asserts

28. By Nicholas Skaggs on 2013-08-09

comment out font size change test for now

27. By Nicholas Skaggs on 2013-08-09

remove polling, remove kterm scheme

26. By Nicholas Skaggs on 2013-08-09

change to polling to support gated review vm

25. By Nicholas Skaggs on 2013-08-09

add ubuntu-ui-toolkit-autopilot dependency, sigh /me facepalms

24. By Nicholas Skaggs on 2013-08-09

add timeout for bad sliding and sleep for db calls

23. By Nicholas Skaggs on 2013-08-09

all tests now working

22. By Nicholas Skaggs on 2013-08-09

slider test for font works

21. By Nicholas Skaggs on 2013-08-08

add polling for header check

=== removed directory 'tests/autopilot/ubuntu_terminal_app/emulators'
=== added file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	2013-08-09 19:48:09 +0000
@@ -0,0 +1,138 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Terminal app autopilot emulators."""
+
+from time import sleep
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class MainView(toolkit_emulators.MainView):
+    """Terminal MainView Autopilot emulator."""
+
+    def get_header_item(self):
+        """Get the header"""
+        return  self.select_single("Header")
+
+    def get_slider_item(self, slider):
+        """Get the header"""
+        return  self.select_single("Slider", objectName=slider)
+
+    def get_kterm(self):
+        return  self.select_single("KTerminalDisplay", objectName="kterm")
+    def get_control_panel(self):
+        return  self.select_single("CtrlKeys", objectName="kbCtrl")
+
+    def get_function_panel(self):
+        return  self.select_single("FnKeys", objectName="kbFn")
+
+    def get_scroll_panel(self):
+        return  self.select_single("ScrlKeys", objectName="kbScrl")
+
+    def get_terminal_page(self):
+        return  self.select_single("Terminal", objectName="pgTerm")
+
+    def get_circle_menu(self):
+        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."""
+        return self.select_single(ActionSelectionPopover, objectName='panelpopover')
+
+    def drag_horizontal_slider(self, slider, pos):
+        """Drag slider until value is set"""
+        slItem = self.get_slider_item(slider)
+
+        # calculate required shift per position
+        slRect = slItem.select_single("SliderStyle")
+        thumbSpacing = slRect.thumbSpacing
+
+        slideMin = int(slItem.minimumValue)
+        slideMax = int(slItem.maximumValue)
+
+        if pos > slideMax:
+            raise ValueError("Pos cannot be greater than" + str(slideMax))
+
+        if pos < slideMin:
+            raise ValueError("Pos cannot be less than" + str(slideMin))
+
+        x, y, w, h = slRect.globalRect
+        sx = x + thumbSpacing
+        sy = y+h/2
+        loop = 1
+
+        #set the slider to minimum value and loop
+        self.pointing_device.move(sx, sy)
+        self.pointing_device.click()
+
+        #drag through the slider until the pos matches our desired value
+        #in case of bad sliding, loop will also timeout
+        while round(slItem.value) != pos and slItem.value<slideMax and loop<=(slideMax*2):
+            #we can speed it along at twice the thumbSpacing and still hit everything
+            valuePos = int(sx + (thumbSpacing * 2 * loop))
+            self.pointing_device.drag(sx, sy, valuePos, sy)
+            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

=== removed file 'tests/autopilot/ubuntu_terminal_app/emulators/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/emulators/__init__.py	2013-05-31 13:10:55 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.

=== removed file 'tests/autopilot/ubuntu_terminal_app/emulators/main_window.py'
--- tests/autopilot/ubuntu_terminal_app/emulators/main_window.py	2013-07-19 18:16:29 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,114 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""Terminal app autopilot emulators."""
-
-class MainWindow(object):
-    """An emulator class that makes it easy to interact with the
-    terminal-app."""
-    def __init__(self, autopilot, app):
-        self.app = app
-        self.autopilot = autopilot
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-        return self.app.select_single("QQuickView")
-
-    def get_header_item(self):
-        """Get the header"""
-        return  self.app.select_single("Header")
-
-    def get_slider_item(self, slider):
-        """Get the header"""
-        return  self.app.select_single("Slider", objectName=slider)
-
-    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.autopilot.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.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-
-    def click_action_selection_popup_item(self, popupLable):
-        """Clicks the toolbar popup item with popupLable"""
-        # The action selection is assumed to be the following format
-        # ActionSelectionPopover {
-        #    actions: ActionList {
-        #        Action {
-        #              text: 
-        li  = self.app.select_single("ActionSelectionPopover")
-        row = li.select_single("QQuickColumn")
-        loaderList = row.select_many("QQuickLoader")
-        for loader in loaderList:
-            labelList = loader.select_many("Label")
-            for label in labelList:
-                if label.text == popupLable:
-                    self.autopilot.pointing_device.click_object(label)
-
-    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.app.select_single("ValueSelector", objectName=selector)
-        self.autopilot.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.autopilot.pointing_device.click_object(label)
-
-    def tap_horizontal_slider(self, slider, pos):
-        """Tap slider at position"""
-        slItem = self.get_slider_item(slider)
-        x, y, w, h = slItem.globalRect
-
-        # pos to click inside the slider, px  
-        self.autopilot.pointing_device.move(x+pos, y+(h/2))
-        self.autopilot.pointing_device.click()
-
-    def drag_horizontal_slider(self, slider, pos):
-        """Drag slider by delta value"""
-        # The slider is assumed to be the following format
-        # Slider {
-        #    objectName: 
-        #    minimumValue: 
-        #    maximumValue:
-        slItem = self.get_slider_item(slider)
-        slRect = slItem.select_single("SliderStyle")
-
-        # calculate required shift per position
-        thumbSpace = slRect.thumbSpace
-        minVal = slItem.minimumValue
-        maxVal = slItem.maximumValue
-        shift  = thumbSpace/(maxVal-minVal)
-
-        # get thumb to drag
-        ushapes = slItem.select_many("UbuntuShape")
-        slThumb = ushapes[0]
-        for ushape in ushapes:
-            if ushape.width == slRect.thumbWidth:
-                slThumb = ushape
-
-        x, y, w, h = slThumb.globalRect
-        sx = x+w/2
-        sy = y+h/2 
-        self.autopilot.pointing_device.drag(sx, sy, sx+(shift*pos), sy)
-
-

=== removed file 'tests/autopilot/ubuntu_terminal_app/emulators/ubuntusdk.py'
--- tests/autopilot/ubuntu_terminal_app/emulators/ubuntusdk.py	2013-07-19 18:16:29 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013 Canonical Ltd
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Nicholas Skaggs <[e-mail]>
-
-from testtools.matchers import Equals, NotEquals, Not, Is
-from autopilot.matchers import Eventually
-
-class ubuntusdk(object):
-    """An emulator class that makes it easy to interact with the ubuntu sdk applications."""
-
-    def __init__(self, autopilot, app):
-        self.app = app
-        self.autopilot = autopilot
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-        return self.app.select_single("QQuickView")
-
-    def get_object(self, typeName, name):
-        """Get a specific object"""
-        return self.app.select_single(typeName, objectName=name)
-
-    def get_objects(self, typeName, name):
-        """Get more than one object"""
-        return self.app.select_many(typeName, objectName=name)
-
-    def get_tabs(self):
-        """Return all tabs"""
-        return self.app.select_single("Tabs")
-
-    def switch_to_tab(self, tab):
-        """Switch to the specified tab number"""
-        tabs = self.get_tabs()
-        currentTab = tabs.selectedTabIndex
-
-        #perform operations until tab == currentTab
-        while tab != currentTab:
-            if tab > currentTab:
-                self._next_tab()
-            if tab < currentTab:
-                self._previous_tab()
-            currentTab = tabs.selectedTabIndex
-
-    def _previous_tab(self):
-        """Switch to the previous tab"""
-        qmlView = self.get_qml_view()
-
-        startX = int(qmlView.x + qmlView.width * 0.10)
-        stopX = int(qmlView.x + qmlView.width * 0.45)
-        lineY = int(qmlView.y + qmlView.height * 0.05)
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.move(startX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def _next_tab(self):
-        """Switch to the next tab"""
-        qmlView = self.get_qml_view()
-
-        startX = int(qmlView.x + qmlView.width * 0.45)
-        stopX = int(qmlView.x + qmlView.width * 0.10)
-        lineY = int(qmlView.y + qmlView.height * 0.05)
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.move(startX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def toggle_toolbar(self):
-        """Toggle the toolbar between revealed and hidden"""
-        #check and see if the toolbar is open or not
-        if self.get_toolbar().opened:
-            self.hide_toolbar()
-        else:
-            self.open_toolbar()
-
-    def get_toolbar(self):
-        """Returns the toolbar in the main events view."""
-        return self.app.select_single("Toolbar")
-
-    def get_toolbar_button(self, buttonLabel):
-        """Returns the toolbar button at position index"""
-        toolbar = self.get_toolbar()
-        if not toolbar.opened:
-            self.open_toolbar()
-        row = toolbar.select_single("ToolbarItems")
-        loaderList = row.select_many("QQuickLoader")
-        for loader in loaderList:
-            buttonList = loader.select_many("Label")
-            for button in buttonList:
-                if button.text == buttonLabel:
-                    return button
-
-    def click_toolbar_button(self, buttonLabel):
-        """Clicks the toolbar button with buttonLabel"""
-        #The toolbar button is assumed to be the following format
-        # ToolbarItems {
-        #    ToolbarButton {
-        #       id: 
-        #       action: Action {
-        #                  text: 
-        button = self.get_toolbar_button(buttonLabel)
-        self.autopilot.pointing_device.click_object(button)
-
-    def open_toolbar(self):
-        """Open the toolbar"""
-        qmlView = self.get_qml_view()
-
-        lineX = int(qmlView.x + qmlView.width * 0.50)
-        startY = int(qmlView.y + qmlView.height - 1)
-        stopY = int(qmlView.y + qmlView.height * 0.95)
-
-        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-
-    def hide_toolbar(self):
-        """Hide the toolbar"""
-        qmlView = self.get_qml_view()
-
-        lineX = int(qmlView.x + qmlView.width * 0.50)
-        startY = int(qmlView.y + qmlView.height * 0.95)
-        stopY = int(qmlView.y + qmlView.height - 1)
-
-        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-
-    def set_popup_value(self, popover, button, value):
-        """Changes the given popover selector to the request value
-        At the moment this only works for values that are currently visible. To
-        access the remaining items, a help method to drag and recheck is needed."""
-        #The popover is assumed to be the following format
-        #Component {
-        #    id: actionSelectionPopover
-        #
-        #ActionSelectionPopover {
-        #                actions: ActionList {
-        #                    Action {
-
-        popList = self.get_object("ActionSelectionPopover", popover)
-        itemList = popList.select_many("Label")
-        for item in itemList:
-            if item.text == value:
-                self.autopilot.pointing_device.click_object(item)
-                return item

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2013-07-19 18:16:29 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2013-08-09 19:48:09 +0000
@@ -7,21 +7,21 @@
 
 """Terminal app autopilot tests."""
 
+import sqlite3
 import os.path
-import sqlite3
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
+from ubuntuuitoolkit import emulators as toolkit_emulators
 
-from ubuntu_terminal_app.emulators.main_window import MainWindow
-from ubuntu_terminal_app.emulators.ubuntusdk import ubuntusdk
+from ubuntu_terminal_app import emulators
 
 
 class TerminalTestCase(AutopilotTestCase):
 
-    """A common test case class that provides several useful methods for
-    terminal-app tests.
+    """A common testcase class that provides useful methods for the terminal
+    app.
 
     """
     if model() == 'Desktop':
@@ -34,6 +34,7 @@
     def setUp(self):
         self.pointing_device = Pointer(self.input_device_class.create())
         super(TerminalTestCase, self).setUp()
+
         if os.path.exists(self.local_location):
             self.launch_test_local()
         else:
@@ -43,23 +44,21 @@
         self.app = self.launch_test_application(
             "qmlscene",
             self.local_location,
-            app_type='qt')
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_installed(self):
         self.app = self.launch_test_application(
             "qmlscene",
             "/usr/share/ubuntu-terminal-app/ubuntu-terminal-app.qml",
-            "--desktop_file_hint=/usr/share/applications/ubuntu-terminal-app.desktop",
-            app_type='qt')
-
-    @property
-    def main_window(self):
-        return MainWindow(self, self.app)
-
-    @property
-    def ubuntu_sdk(self):
-        return ubuntusdk(self, self.app)
-
+            "--desktop_file_hint="
+            "/usr/share/applications/ubuntu-terminal-app.desktop",
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    @property
+    def main_view(self):
+        return self.app.select_single(emulators.MainView)
 
 class DbMan(object):
     """
@@ -99,19 +98,19 @@
         conn = sqlite3.connect(db)
 
         with conn:
-            cur = conn.cursor()    
+            cur = conn.cursor()
             cur.execute("SELECT value FROM config WHERE item='fontSize'")
             row = cur.fetchone()
             if row is None:
                 self.assertNotEquals(row, None)
             return int(row[0])
-            
+
     def get_color_scheme_from_storage(self):
         db = self.get_db()
         conn = sqlite3.connect(db)
 
         with conn:
-            cur = conn.cursor()    
+            cur = conn.cursor()
             cur.execute("SELECT value FROM config WHERE item='colorScheme'")
             row = cur.fetchone()
             if row is None:

=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-07-19 21:29:59 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2013-08-09 19:48:09 +0000
@@ -10,145 +10,187 @@
 from __future__ import absolute_import
 
 from autopilot.matchers import Eventually
-from testtools.matchers import Equals, GreaterThan
+from testtools.matchers import Equals, NotEquals,GreaterThan
+from autopilot.platform import model
 
 from ubuntu_terminal_app.tests import TerminalTestCase, DbMan
 
-import time
+from time import sleep
+import random
 
 class TestMainWindow(TerminalTestCase, DbMan):
 
     def setUp(self):
         super(TestMainWindow, self).setUp()
         self.assertThat(
-            self.ubuntu_sdk.get_qml_view().visible, Eventually(Equals(True)))
+            self.main_view.visible, Eventually(Equals(True)))
 
     def tearDown(self):
         super(TestMainWindow, self).tearDown()
 
-    def test_control_panel_shows(self):
+    def hide_panels(self):
+        """Click hide panels button"""
+        toolbar = self.main_view.open_toolbar()
+        timeout = 0
+        toolbar.click_button("PanelsButton")
+        panel_popover = self.main_view.get_panel_actions_popover()
+
+        #we have to poll the complex action because we can't check the animation for the header
+        while panel_popover == None and timeout < 10:
+            toolbar.click_button("PanelsButton")
+            panel_popover = self.main_view.get_panel_actions_popover()
+            sleep(1)
+            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 test_control_panel(self):
         """Make sure that Control Keys Panel is visible
-        when clicking the toolbar popup items."""
-        self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_action_selection_popup_item("Control keys")
-        panelCtrl = self.ubuntu_sdk.get_object("CtrlKeys", "kbCtrl")
-        self.assertThat(panelCtrl.visible, Eventually(Equals(True)))
-
-    def test_function_panel_shows(self):
-        """Make sure that Function Keys Panel is visible
-        when clicking the toolbar popup items."""
-        self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_action_selection_popup_item("Function keys")
-        panelFunc = self.ubuntu_sdk.get_object("FnKeys", "kbFn")
-        self.assertThat(panelFunc.visible, Eventually(Equals(True)))
-
-    def test_TextCtrl_Panel_shows(self):
+        when clicking the toolbar popup items and hides properly."""
+        toolbar = self.main_view.open_toolbar()
+        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)))
+
+        self.hide_panels()
+
+        panelCtrl = self.main_view.get_control_panel()
+        self.assertThat(lambda: panelCtrl.visible, Eventually(Equals(False)))
+
+    def test_function_panel(self):
+        """Make sure that function Keys Panel is visible
+        when clicking the toolbar popup items and hides properly."""
+        toolbar = self.main_view.open_toolbar()
+        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)))
+
+        self.hide_panels()
+
+        panelFunc = self.main_view.get_function_panel()
+        self.assertThat(lambda: panelFunc.visible, Eventually(Equals(False)))
+
+    def test_textctrl_panel(self):
         """Make sure that Text Control Keys Panel is visible
-        when clicking the toolbar popup items."""
-        self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_action_selection_popup_item("Text ctrl keys")
-        panelScrl = self.ubuntu_sdk.get_object("ScrlKeys", "kbScrl")
-        self.assertThat(panelScrl.visible, Eventually(Equals(True)))
-
-    def test_panels_hide(self):
-        """Make sure that all panels are hide
-        when clicking the toolbar popup items."""
-        self.ubuntu_sdk.click_toolbar_button("Panels")
-        self.main_window.click_action_selection_popup_item("Hide extra panel")
-        panelCtrl = self.ubuntu_sdk.get_object("CtrlKeys", "kbCtrl")
-        panelFunc = self.ubuntu_sdk.get_object("FnKeys", "kbFn")
-        panelScrl = self.ubuntu_sdk.get_object("ScrlKeys", "kbScrl")
-        self.assertThat(panelCtrl.visible, Eventually(Equals(False)))
-        self.assertThat(panelFunc.visible, Eventually(Equals(False)))
-        self.assertThat(panelScrl.visible, Eventually(Equals(False)))
+        when clicking the toolbar popup items and hides properly."""
+        toolbar = self.main_view.open_toolbar()
+        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)))
+
+        self.hide_panels()
+
+        panelScrl = self.main_view.get_scroll_panel()
+        self.assertThat(lambda: panelScrl.visible, Eventually(Equals(False)))
 
     def test_circle_menu_shows(self):
         """Make sure that Circle Menu is visible
         on long tap"""
-        kterm = self.ubuntu_sdk.get_object("Terminal", "pgTerm")
-        menu = self.ubuntu_sdk.get_object("CircleMenu", "cmenu")
+        kterm = self.main_view.get_terminal_page()
+        menu = self.main_view.get_circle_menu()
         self.pointing_device.click_object(kterm)
         self.pointing_device.press()
-        time.sleep(1)
+        sleep(2)
         self.pointing_device.release()
         self.assertThat(menu.visible, Eventually(Equals(True)))
 
-    def test_header_shows(self):
+    def test_header(self):
         """Make sure that Header is visible
-        in Portrait Mode"""
-        qmlView = self.ubuntu_sdk.get_qml_view()
-        header = self.main_window.get_header_item()
-        self.main_window.expand_width(10)
-        self.assertThat(qmlView.height, Eventually(GreaterThan(qmlView.width)))
-        self.assertThat(header.visible, Eventually(Equals(True)))
+        in Portrait Mode and not visible in landscape mode"""
+        header = self.main_view.get_header_item().visible
+        if model() == "Nexus 10" or model() == "Nexus 7":
+            self.assertThat(lambda: header, Eventually(Equals(False)))
+        else:
+            self.assertThat(lambda: header, Eventually(Equals(True)))
 
-    def test_header_hides(self):
-        """Make sure that Header is not visible
-        in Landscape Mode"""
-        qmlView = self.ubuntu_sdk.get_qml_view()
-        header = self.main_window.get_header_item()
-        self.main_window.expand_width(400)
-        self.assertThat(qmlView.width, Eventually(GreaterThan(qmlView.height)))
-        self.assertThat(header.visible, Eventually(Equals(False)))
-    
-    
-    # broken testcase. should be uncommented 
+    # broken testcase. should be uncommented
     # and tested with latest update of ubuntu sdk
-    
-    #def test_color_scheme_changes(self):
-    #    """Make sure that color scheme is set correctly"""
-    #    qmlView = self.ubuntu_sdk.get_qml_view()
-    #    # kterm = self.ubuntu_sdk.get_object("KTerminalDisplay", "kterm")
-    #    self.ubuntu_sdk.switch_to_tab(1)
-
-    #    schemeList = ("DarkPastels", 
-    #        "Linux",
-    #        "BlackOnRandomLight",
-    #        "BlackOnWhite",
-    #        "BlackOnLightYellow",
-    #        "GreenOnBlack",
-    #        "WhiteOnBlack",
-    #        )
-
-    #    for scheme in schemeList:
-    #        self.main_window.click_value_selector_item("liSchemes",scheme)
-    #        # This assert uses KTerminalDisplay property (old rev)
-    #        # self.assertThat(kterm.colorScheme, Eventually(Equals(scheme)))
-    #        time.sleep(0.3)
-    #        # This assert uses localstorage (new rev)
-    #        colorScheme = self.get_color_scheme_from_storage()
-    #        self.assertThat(colorScheme, Equals(scheme))
+
+    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)
+            sleep(1)
+            # 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, Equals(scheme))
 
 
     def test_font_size_changes(self):
         """Make sure that font size is set correctly"""
-        self.ubuntu_sdk.switch_to_tab(1)
-        slider = self.main_window.get_slider_item("slFont")
-
-        # start and end positions
-        i = int(slider.minimumValue) + 1
-        iMax = int(slider.maximumValue)
-
-        # return to start position of the slider
-        self.main_window.tap_horizontal_slider("slFont",5)
-        time.sleep(0.3)
+        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)
+        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))
 
-        p = 1
-        while ( i < (iMax+1) ):
-            # WARNING - MAGIC nums: should be removed with better case
-            if (i == 18):
-                p = 1.4
-            if (i == 20):
-                p = 1
-
-            self.main_window.drag_horizontal_slider("slFont",p)
-            time.sleep(0.3)
+        ## change font size to random sizes
+        for loop in range(1,3):
+            randSize = random.randrange(8,32,1)
+            self.main_view.drag_horizontal_slider("slFont",randSize)
+            sleep(1)
             font_size = self.get_font_size_from_storage()
-            self.assertThat(font_size, Equals(i))
-            i+=1
-
-
-
-
+            self.assertThat(font_size, Equals(randSize))

=== modified file 'ubuntu-terminal-app.qml'
--- ubuntu-terminal-app.qml	2013-07-19 18:16:29 +0000
+++ ubuntu-terminal-app.qml	2013-08-09 19:48:09 +0000
@@ -17,20 +17,25 @@
         id: actionSelectionPopover
 
         ActionSelectionPopover {
+            objectName: "panelpopover"
             actions: ActionList {
                 Action {
+                    objectName: "controlkeysaction"
                     text: i18n.tr("Control keys")
                     onTriggered: pgTerm.showExtraPanel(1)
                 }
                 Action {
+                    objectName: "functionkeysaction"
                     text: i18n.tr("Function keys")
                     onTriggered: pgTerm.showExtraPanel(2)
                 }
                 Action {
+                    objectName: "textkeysaction"
                     text: i18n.tr("Text ctrl keys")
                     onTriggered: pgTerm.showExtraPanel(3)
                 }
                 Action {
+                    objectName: "hidepanelaction"
                     text: i18n.tr("Hide extra panel")
                     onTriggered: pgTerm.showExtraPanel(0)
                 }
@@ -42,9 +47,9 @@
         id: tabs
         objectName: "rootTabs"
         anchors.fill: parent
-        
+
         Tab {
-            objectName: "Tab1"
+            objectName: "TerminalTab"
             title: i18n.tr("Terminal")
             page: Page {
 
@@ -56,14 +61,15 @@
                     header.visible = width < height;
                 }
 
-                Terminal { 
+                Terminal {
                     id: pgTerm
-                    objectName: "pgTerm"  
+                    objectName: "pgTerm"
                 }
 
                 tools: ToolbarItems {
                     ToolbarButton {
                            id: toolbarAction
+                           objectName: "PanelsButton"
                            action: Action {
                                 text: "Panels"
                                 iconSource: Qt.resolvedUrl("avatar.png")
@@ -77,7 +83,7 @@
         }
 
         Tab {
-            objectName: "Tab2"
+            objectName: "SettingsTab"
             title: i18n.tr("Settings")
             page: Page {
                 Configs { id: pgConf }