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

[Nicholas Skaggs]

Restructure test launching, fix 1341681

Restructure test launching, fix 1341681

remove hud actions

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

FAILED: Continuous integration, rev:129
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/85/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1744/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1744/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/29

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:131
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/86/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1745/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/30

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-terminal-app/ap-restruct]

132. By Nicholas Skaggs on 2014-08-29

animation fixes, split tests

133. By Nicholas Skaggs on 2014-08-29

flake8 happiness

134. By Nicholas Skaggs on 2014-08-29

tweak test_header

135. By Nicholas Skaggs on 2014-08-29

flake8

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

FAILED: Continuous integration, rev:132
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/87/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/31/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:135
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/88/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1748/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1748/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/32

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

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/ubuntu-terminal-app/ap-restruct]

136. By Nicholas Skaggs on 2014-08-29

move circle menu helper

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

FAILED: Continuous integration, rev:136
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/89/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1750/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/33/console

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

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Looks like pyflakes issues:-

+ pyflakes .
./tests/autopilot/ubuntu_terminal_app/__init__.py:65: local variable 'kterm' is assigned to but never used
./debian/tmp/usr/lib/python3/dist-packages/ubuntu_terminal_app/__init__.py:65: local variable 'kterm' is assigned to but never used
./debian/ubuntu-terminal-app-autopilot/usr/lib/python3/dist-packages/ubuntu_terminal_app/__init__.py:65: local variable 'kterm' is assigned to but never used

[lp:~nskaggs/ubuntu-terminal-app/ap-restruct]

137. By Nicholas Skaggs on 2014-09-02

flake8 happiness

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

FAILED: Continuous integration, rev:137
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/91/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1784/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1784/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/35

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

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'src/app/qml/Terminal.qml'
--- src/app/qml/Terminal.qml	2014-08-26 13:31:30 +0000
+++ src/app/qml/Terminal.qml	2014-09-02 16:53:27 +0000
@@ -1,7 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import org.kde.konsole 0.1
-import Ubuntu.Unity.Action 1.0 as UnityActions
 import "config"
 import "extraPanel"
 
@@ -368,65 +367,4 @@
         }
 
     }
-
-    UnityActions.ActionContext {
-        id: actionContext
-        active: mparent.visible
-        actions: [
-            UnityActions.Action {
-                text: i18n.tr("Upload Crash Reports")
-                keywords: i18n.tr("Whoopsie;Apport;Debugging;Bugs")
-                onTriggered: ksession.sendText("\x03\n/usr/share/apport/whoopsie-upload-all\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("Make Image Writable")
-                keywords: i18n.tr("System Image;Install Deb")
-                onTriggered: ksession.sendText("\x03\nsudo touch /userdata/.writable_image\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("List Running Applications")
-                keywords: i18n.tr("Apps")
-                onTriggered: ksession.sendText("\x03\nupstart-app-list\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("Installed Click Packages")
-                keywords: i18n.tr("Packages;Applications;Utilities")
-                onTriggered: ksession.sendText("\x03\nclick list\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("System Image Information")
-                keywords: i18n.tr("Image;Version;Channel")
-                onTriggered: ksession.sendText("\x03\nsudo system-image-cli -i\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("System Kernel Version")
-                onTriggered: ksession.sendText("\x03\nuname -a\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("Upstart Job Status")
-                keywords: i18n.tr("Init;Session;User Job")
-                onTriggered: ksession.sendText("\x03\ninitctl list | sort\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("Hack into the NSA")
-                keywords: i18n.tr("Government;Secret;Cracking")
-                onTriggered: ksession.sendText("\x03\nclear;echo -n \"That's not very nice, now tracing your location .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";sleep 1;echo -n \" .\";echo \"Trace failed\";echo \"You get away this time, but don't try again.\"\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("Watch Running Processes")
-                keywords: i18n.tr("Top;Memory;Usage")
-                onTriggered: ksession.sendText("\x03\ntop\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("Networking Status")
-                keywords: i18n.tr("Wireless;Ethernet;Access Points")
-                onTriggered: ksession.sendText("\x03\nnm-tool\n")
-            },
-            UnityActions.Action {
-                text: i18n.tr("Watch Star Wars Episode IV")
-                keywords: i18n.tr("Death Star;Skywalker;Leia;Darth Vader")
-                onTriggered: ksession.sendText("\x03\nnetcat -v towel.blinkenlights.nl 23\n")
-            }
-        ]
-    }
 }
 
=== modified file 'tests/autopilot/ubuntu_terminal_app/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/__init__.py	2013-05-31 13:10:55 +0000
+++ tests/autopilot/ubuntu_terminal_app/__init__.py	2014-09-02 16:53:27 +0000
@@ -1,8 +1,174 @@
 # -*- 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 tests and emulators - top level package."""
+#
+# 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 helpers."""
+
+from time import sleep
+import sqlite3
+import os.path
+import ubuntuuitoolkit
+
+
+class TerminalApp(object):
+
+    """Autopilot helper object for the terminal application."""
+
+    def __init__(self, app_proxy):
+        self.app = app_proxy
+        self.main_view = self.app.select_single(MainView)
+
+    @property
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """Autopilot custom proxy object for the MainView."""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True)
+
+    def get_slider_item(self, slider):
+        return self.wait_select_single("Slider", objectName=slider)
+
+    def get_control_panel(self):
+        return self.wait_select_single("CtrlKeys", objectName="kbCtrl")
+
+    def get_function_panel(self):
+        return self.wait_select_single("FnKeys", objectName="kbFn")
+
+    def get_text_panel(self):
+        return self.wait_select_single("ScrlKeys", objectName="kbScrl")
+
+    def get_terminal_page(self):
+        return self.wait_select_single("Terminal", objectName="pgTerm")
+
+    def get_circle_menu(self):
+        return self.wait_select_single("CircleMenu", objectName="cmenu")
+
+    def long_tap_terminal_center(self):
+        x, y, w, h = self.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()
+        # 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()
+
+    def drag_horizontal_slider(self, slider, pos):
+        """Drag slider until value is set"""
+        slItem = self.get_slider_item(slider)
+
+        slRect = slItem.select_single("SliderStyle")
+
+        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
+        # calculate the approximate slide step width
+        # we take half of the theoretical step value just to make
+        # sure we don't miss any values
+        step = w / ((slideMax - slideMin) * 2)
+        sx = x + step
+        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):
+                valuePos = int(sx + step)
+                self.pointing_device.drag(sx, sy, valuePos, sy)
+                sx = valuePos
+                sleep(1)
+                loop = loop + 1
+
+
+class DbMan(object):
+
+    """
+    Helper functions for dealing with sqlite databases
+    """
+
+    def get_db(self):
+        dbs_path = os.path.expanduser(
+            "~/.local/share/com.ubuntu.terminal/Databases")
+        if not os.path.exists(dbs_path):
+            return None
+
+        files = [f for f in os.listdir(dbs_path)
+                 if os.path.splitext(f)[1] == ".ini"]
+        for f in files:
+            ini_path = os.path.join(dbs_path, f)
+            with open(ini_path) as ini:
+                for line in ini:
+                    if "=" in line:
+                        key, val = line.strip().split("=")
+                        if key == "Name" and val == "UbuntuTerminalDB":
+                            try:
+                                return ini_path.replace(".ini", ".sqlite")
+                            except OSError:
+                                pass
+        return None
+
+    def clean_db(self):
+        path = self.get_db()
+        if path is None:
+            self.assertNotEquals(path, None)
+        try:
+            os.remove(path)
+        except OSError:
+            pass
+
+    def get_font_size_from_storage(self):
+        db = self.get_db()
+        conn = sqlite3.connect(db)
+
+        with conn:
+            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.execute("SELECT value FROM config WHERE item='colorScheme'")
+            row = cur.fetchone()
+            if row is None:
+                self.assertNotEquals(row, None)
+            return row[0]
 
=== removed file 'tests/autopilot/ubuntu_terminal_app/emulators.py'
--- tests/autopilot/ubuntu_terminal_app/emulators.py	2014-08-28 16:47:48 +0000
+++ tests/autopilot/ubuntu_terminal_app/emulators.py	1970-01-01 00:00:00 +0000
@@ -1,81 +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 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_slider_item(self, slider):
-        return self.wait_select_single("Slider", objectName=slider)
-
-    def get_control_panel(self):
-        return self.wait_select_single("CtrlKeys", objectName="kbCtrl")
-
-    def get_function_panel(self):
-        return self.wait_select_single("FnKeys", objectName="kbFn")
-
-    def get_scroll_panel(self):
-        return self.wait_select_single("ScrlKeys", objectName="kbScrl")
-
-    def get_terminal_page(self):
-        return self.wait_select_single("Terminal", objectName="pgTerm")
-
-    def get_circle_menu(self):
-        return self.wait_select_single("CircleMenu", objectName="cmenu")
-
-    def drag_horizontal_slider(self, slider, pos):
-        """Drag slider until value is set"""
-        slItem = self.get_slider_item(slider)
-
-        slRect = slItem.select_single("SliderStyle")
-
-        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
-        # calculate the approximate slide step width
-        # we take half of the theoretical step value just to make
-        # sure we don't miss any values
-        step = w / ((slideMax - slideMin) * 2)
-        sx = x + step
-        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):
-                valuePos = int(sx + step)
-                self.pointing_device.drag(sx, sy, valuePos, sy)
-                sx = valuePos
-                sleep(0.3)
-                loop = loop + 1
 
=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/__init__.py'
--- tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2014-06-27 15:14:32 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/__init__.py	2014-09-02 16:53:27 +0000
@@ -7,16 +7,16 @@
 
 """Terminal app autopilot tests."""
 
-import sqlite3
 import os.path
-
 import fixtures
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.platform import model
+import logging
+from autopilot import logging as autopilot_logging
 from autopilot.testcase import AutopilotTestCase
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-from ubuntu_terminal_app import emulators
+import ubuntuuitoolkit
+
+import ubuntu_terminal_app
+
+logger = logging.getLogger(__name__)
 
 
 class TerminalTestCase(AutopilotTestCase):
@@ -25,120 +25,51 @@
     app.
 
     """
-    if model() == 'Desktop':
-        scenarios = [('with mouse', dict(input_device_class=Mouse))]
-    else:
-        scenarios = [('with touch', dict(input_device_class=Touch))]
+
+    binary = 'terminal'
+    source_dir = os.path.dirname(os.path.dirname(os.path.abspath('.')))
+    local_location_binary = os.path.join(source_dir, 'src', 'app', binary)
+    installed_location_binary = os.path.join('/usr/bin/', binary)
+    installed_location_qml = '/usr/share/terminal/qml/ubuntu-terminal-app.qml'
 
     def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
         super(TerminalTestCase, self).setUp()
-
-        self.EXEC = 'terminal'
-        self.source_dir = os.path.dirname(
-            os.path.dirname(os.path.abspath('.')))
-        self.build_dir = self._get_build_dir()
-        self.local_location_binary = os.path.join(self.build_dir,
-                                                  'src', 'app', self.EXEC)
-        self.installed_location_binary = os.path.join('/usr/bin/', self.EXEC)
-        self.installed_location_qml = \
-            '/usr/share/terminal/qml/ubuntu-terminal-app.qml'
-
+        launcher_method, _ = self.get_launcher_method_and_type()
+        self.app = ubuntu_terminal_app.TerminalApp(launcher_method())
+
+    def get_launcher_method_and_type(self):
         if os.path.exists(self.local_location_binary):
-            self.launch_test_local()
+            launcher = self.launch_test_local
+            test_type = 'local'
         elif os.path.exists(self.installed_location_binary):
-            self.launch_test_installed()
+            launcher = self.launch_test_installed
+            test_type = 'deb'
         else:
-            self.launch_test_click()
-
-    def _get_build_dir(self):
-        build_dir = self.source_dir
-
-        return build_dir
-
+            launcher = self.launch_test_click
+            test_type = 'click'
+        return launcher, test_type
+
+    @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
         self.useFixture(fixtures.EnvironmentVariable(
-            'QML2_IMPORT_PATH', newvalue=os.path.join(self.build_dir,
+            'QML2_IMPORT_PATH', newvalue=os.path.join(self.source_dir,
                                                       'src', 'plugin')))
 
-        self.app = self.launch_test_application(
+        return self.launch_test_application(
             self.local_location_binary,
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
+    @autopilot_logging.log_action(logger.info)
     def launch_test_installed(self):
-        self.app = self.launch_test_application(
+        return self.launch_test_application(
             self.installed_location_binary,
             '-q', self.installed_location_qml,
             app_type='qt',
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
+    @autopilot_logging.log_action(logger.info)
     def launch_test_click(self):
-        self.app = self.launch_click_package(
+        return self.launch_click_package(
             "com.ubuntu.terminal",
-            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
-
-    @property
-    def main_view(self):
-        return self.app.select_single(emulators.MainView)
-
-
-class DbMan(object):
-
-    """
-    Helper functions for dealing with sqlite databases
-    """
-
-    def get_db(self):
-        dbs_path = os.path.expanduser(
-            "~/.local/share/com.ubuntu.terminal/Databases")
-        if not os.path.exists(dbs_path):
-            return None
-
-        files = [f for f in os.listdir(dbs_path)
-                 if os.path.splitext(f)[1] == ".ini"]
-        for f in files:
-            ini_path = os.path.join(dbs_path, f)
-            with open(ini_path) as ini:
-                for line in ini:
-                    if "=" in line:
-                        key, val = line.strip().split("=")
-                        if key == "Name" and val == "UbuntuTerminalDB":
-                            try:
-                                return ini_path.replace(".ini", ".sqlite")
-                            except OSError:
-                                pass
-        return None
-
-    def clean_db(self):
-        path = self.get_db()
-        if path is None:
-            self.assertNotEquals(path, None)
-        try:
-            os.remove(path)
-        except OSError:
-            pass
-
-    def get_font_size_from_storage(self):
-        db = self.get_db()
-        conn = sqlite3.connect(db)
-
-        with conn:
-            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.execute("SELECT value FROM config WHERE item='colorScheme'")
-            row = cur.fetchone()
-            if row is None:
-                self.assertNotEquals(row, None)
-            return row[0]
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 
=== modified file 'tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py'
--- tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-08-28 16:18:16 +0000
+++ tests/autopilot/ubuntu_terminal_app/tests/test_terminal.py	2014-09-02 16:53:27 +0000
@@ -11,112 +11,108 @@
 
 from autopilot.matchers import Eventually
 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 ubuntu_terminal_app.tests import TerminalTestCase
+from ubuntu_terminal_app import DbMan
+from ubuntuuitoolkit import ToolkitException
+from testscenarios import TestWithScenarios
 
 from time import sleep
 import random
 
 
-class TestMainWindow(TerminalTestCase, DbMan):
-
-    def setUp(self):
-        super(TestMainWindow, self).setUp()
-        self.assertThat(
-            self.main_view.visible, Eventually(Equals(True)))
-
-    def hide_panels(self):
-        """Click hide panels button"""
-        header = self.main_view.get_header()
-        header.click_action_button('hidepanelaction')
-        # Click on the button a second time in case that the
-        # actions list was open and the first click just closed it
-        # without further effect. If that was not the case, then
-        # be prepared to catch the exception, as once clicked on,
-        # the action to hide panels makes the button no longer visible
+class TestMainWindow(TerminalTestCase):
+
+    def test_circle_menu_shows(self):
+        """Make sure that Circle Menu is visible
+        on long tap"""
+        self.app.main_view.long_tap_terminal_center()
+        menu = self.app.main_view.get_circle_menu()
+        self.assertThat(menu.visible, Eventually(Equals(True)))
+
+    def test_header(self):
+        """Make sure that Header is visible
+        in Portrait Mode and not visible in landscape mode"""
+        kterm = self.app.main_view.get_terminal_page()
+        header = self.app.main_view.get_header()
+        if kterm.width > kterm.height:
+            self.assertThat(header.visible, Equals(False))
+        else:
+            self.assertThat(header.visible, Equals(True))
+
+
+class TestPanel(TerminalTestCase, TestWithScenarios):
+
+    scenarios = [
+        ('controlpanel',
+            {'button': 'controlkeysaction',
+             'helper_method': 'get_control_panel'
+             }),
+
+        ('functionpanel',
+            {'button': 'functionkeysaction',
+             'helper_method': 'get_function_panel'
+             }),
+
+        ('textpanel',
+            {'button': 'textkeysaction',
+             'helper_method': 'get_text_panel'
+             })
+    ]
+
+    def open_panel(self, button, helper_method):
+        """Open named panel"""
+        header = self.app.main_view.get_header()
+        header.click_action_button(button)
+        get_panel = getattr(self.app.main_view, helper_method)
+        return get_panel()
+
+    def hide_panel(self):
+        """Close any open panel"""
+        header = self.app.main_view.get_header()
+
+        # the overflow panel can be left open, so we need to try again
+        # https://bugs.launchpad.net/ubuntu-terminal-app/+bug/1363233
         try:
             header.click_action_button('hidepanelaction')
+            try:
+                sleep(2)
+                header.click_action_button('hidepanelaction')
+            except ToolkitException:
+                pass
         except ToolkitException:
             pass
 
+    def test_panels(self):
+        """Make sure that Panel is visible
+        when clicking the toolbar popup items and hides properly."""
+        panel = self.open_panel(self.button, self.helper_method)
+        self.assertThat(panel.visible, Eventually(Equals(True)))
+        self.hide_panel()
+        self.assertThat(panel.visible, Eventually(Equals(False)))
+
+
+class TestSettings(TerminalTestCase, DbMan):
+
     def click_item_selector_item(self, selector, value):
         """Clicks item from item selector"""
         # 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)
+        select = self.app.main_view.wait_select_single('ItemSelector',
+                                                       objectName=selector)
+        container = select.wait_select_single('Standard',
+                                              objectName='listContainer')
+        self.app.pointing_device.click_object(container)
+        select.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
-        when clicking the toolbar popup items and hides properly."""
-        header = self.main_view.get_header()
-        header.click_action_button('controlkeysaction')
-
-        panelCtrl = lambda: self.main_view.get_control_panel().visible
-        self.assertThat(panelCtrl, Eventually(Equals(True)))
-        self.hide_panels()
-        self.assertThat(panelCtrl, 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."""
-        header = self.main_view.get_header()
-        header.click_action_button('functionkeysaction')
-
-        panelFunc = lambda: self.main_view.get_function_panel().visible
-        self.assertThat(panelFunc, Eventually(Equals(True)))
-        self.hide_panels()
-        self.assertThat(panelFunc, Eventually(Equals(False)))
-
-    def test_textctrl_panel(self):
-        """Make sure that Text Control Keys Panel is visible
-        when clicking the toolbar popup items and hides properly."""
-        header = self.main_view.get_header()
-        header.click_action_button('textkeysaction')
-
-        panelScrl = lambda: self.main_view.get_scroll_panel().visible
-        self.assertThat(panelScrl, Eventually(Equals(True)))
-        self.hide_panels()
-        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()
-        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()
-        # 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 = self.main_view.get_circle_menu()
-        self.assertThat(menu.visible, Eventually(Equals(True)))
-
-    def test_header(self):
-        """Make sure that Header is visible
-        in Portrait Mode and not visible in landscape mode"""
-        header = lambda: self.main_view.get_header().visible
-        if model() == "Nexus 10" or model() == "Nexus 7":
-            self.assertThat(header, Eventually(Equals(False)))
-        else:
-            self.assertThat(header, Eventually(Equals(True)))
+        item = container.wait_select_single('Label', text=value)
+        self.app.pointing_device.click_object(item)
+        select.currentlyExpanded.wait_for(False)
+        # waiting for currentlyExpanded is not enough
+        # some animation is not accounted for and thus we sleep
+        sleep(1)
 
     def test_color_scheme_changes(self):
         """Make sure that color scheme is set correctly"""
@@ -133,28 +129,29 @@
 
         colorScheme = self.get_color_scheme_from_storage
         for scheme in schemeList:
-            self.main_view.get_header().click_action_button('SettingsButton')
+            header = self.app.main_view.get_header()
+            header.click_action_button('SettingsButton')
             self.click_item_selector_item("liSchemes", scheme)
-            self.main_view.go_back()
+            self.app.main_view.go_back()
             self.assertThat(colorScheme, Eventually(Equals(scheme)))
 
     def test_font_size_changes(self):
         """Make sure that font size is set correctly"""
-        header = self.main_view.get_header()
+        header = self.app.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.app.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)
+        self.app.main_view.drag_horizontal_slider("slFont", 32)
         self.assertThat(font_size, Eventually(Equals(32)))
 
         # change font size to random sizes
         for loop in range(1, 3):
             randSize = random.randrange(9, 31, 1)
-            self.main_view.drag_horizontal_slider("slFont", randSize)
+            self.app.main_view.drag_horizontal_slider("slFont", randSize)
             self.assertThat(font_size, Eventually(Equals(randSize)))