Merge lp:~nskaggs/stock-ticker-mobile-app/test-click-support into lp:stock-ticker-mobile-app

[Nicholas Skaggs]

This converts everything to using ubuntuuitoolkit emulator for the autopilot tests as well as allows the app to be tested via a click package

This converts everything to using ubuntuuitoolkit emulator for the autopilot tests as well as allows the app to be tested via a click package

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

FAILED: Continuous integration, rev:69
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/4/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-precise-amd64-ci/4/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-quantal-amd64-ci/4/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-raring-amd64-ci/4/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-saucy-amd64-ci/4/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/4/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:69
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/5/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-precise-amd64-ci/5/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-quantal-amd64-ci/5/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-raring-amd64-ci/5/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-saucy-amd64-ci/5/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/5/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:69
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/6/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-precise-amd64-ci/6/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-quantal-amd64-ci/6/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-raring-amd64-ci/6/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-saucy-amd64-ci/6/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/6/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:69
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/7/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-precise-amd64-ci/7/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-quantal-amd64-ci/7/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-raring-amd64-ci/7/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-saucy-amd64-ci/7/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/stock-ticker-mobile-app/test-click-support]

70. By Nicholas Skaggs on 2013-10-09

add multimedia required package, tweak db logging, set proper directory

71. By Nicholas Skaggs on 2013-10-09

fix test management

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

FAILED: Continuous integration, rev:71
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/8/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-precise-amd64-ci/8/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-quantal-amd64-ci/8/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-raring-amd64-ci/8/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-saucy-amd64-ci/8/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nskaggs/stock-ticker-mobile-app/test-click-support]

72. By Nicholas Skaggs on 2013-10-09

add autopilot packaging install file

[Nicholas Skaggs (nskaggs)]

Robert, do you know why this might be failing? I'm unsure if something in the qml doesn't confirm so that it is unable to use the emulator.

[Robert Steckroth (robertsteckroth)]

AUtopilot revamp is not working and approved for development.

review: Approve

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

FAILED: Continuous integration, rev:72
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/10/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-precise-amd64-ci/10/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-quantal-amd64-ci/10/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-raring-amd64-ci/10/console
    FAILURE: http://91.189.93.70:8080/job/stock-ticker-mobile-app-saucy-amd64-ci/10/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/stock-ticker-mobile-app-ci/10/rebuild

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Robert, I opened https://bugs.launchpad.net/stock-ticker-mobile-app/+bug/1238070 for the issue you mentioned with tests failing to run.

=== modified file 'debian/control'
--- debian/control	2013-06-13 20:26:45 +0000
+++ debian/control	2013-10-09 19:09:47 +0000
@@ -1,5 +1,5 @@
 Source: stock-ticker-mobile-app
-Section: misc 
+Section: misc
 Priority: extra
 Maintainer: Robert Steckroth, surgemcgee <[e-mail]>
 Build-Depends: debhelper (>= 9)
@@ -15,9 +15,20 @@
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,
-         qtdeclarative5-xmllistmodel-plugin
+         qtdeclarative5-xmllistmodel-plugin,
+         qtdeclarative5-qtmultimedia-plugin
 Description: A stock trading app with charts, news, and management
              Combining advanced features that are omitted from similar apps with a compact and easy to use design.
              Features include: interactive charts, user customizations, sorting, section resizing, and search auto-complete.
 
+Package: stock-ticker-mobile-app-autopilot
+Architecture: all
+Depends: libautopilot-qt,
+         libqt5test5,
+         stock-ticker-mobile-app (= ${source:Version}),
+         python-dateutil,
+         ubuntu-ui-toolkit-autopilot,
+Description: Autopilot tests for stock ticker Application
+ This package contains autopilot tests for the stock ticker application.
+
 

=== added file 'debian/stock-ticker-mobile-app-autopilot.install'
--- debian/stock-ticker-mobile-app-autopilot.install	1970-01-01 00:00:00 +0000
+++ debian/stock-ticker-mobile-app-autopilot.install	2013-10-09 19:09:47 +0000
@@ -0,0 +1,1 @@
+tests/autopilot/stock_ticker/* usr/lib/python2.7/dist-packages/stock_ticker/

=== removed directory 'tests/autopilot/stock_ticker/emulators'
=== added file 'tests/autopilot/stock_ticker/emulators.py'
--- tests/autopilot/stock_ticker/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/stock_ticker/emulators.py	2013-10-09 19:09:47 +0000
@@ -0,0 +1,67 @@
+# -*- 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/>.
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+
+
+class MainView(toolkit_emulators.MainView):
+
+    def move_subtabs_bar_up(self):
+        """Moves the subtabs bar to a different location"""
+        qmlView = self.select("QQuickView")
+        sub_bar = self.select("QQuickRectangle", objectName='subTabsBar')
+        button_width = sub_bar.select_single('UbuntuShape', objectName='detailsTab').width
+        self.pointing_device.move_to_object(sub_bar)
+
+        self.pointing_device.drag( self.pointing_device.x-button_width-5, self.pointing_device.y,
+                                             self.pointing_device.x-button_width-5, qmlView.height*0.3)
+
+    def flick_page_up(self, obj):
+        """Moves the pointer around the charts sub tab"""
+        startX = obj.x + 2
+        stopX = obj.x + obj.width - 2
+        lineY = obj.y + obj.height - 2
+        self.pointing_device.drag(startX, lineY, stopX/1.5, obj.y+2)
+
+    def hold_page_down(self, obj):
+        """Grabs and holds the provided object downwards"""
+
+        self.pointing_device.move_to_object(obj)
+        self.pointing_device.press()
+        self.pointing_device.move(self.pointing_device.x, obj.y+obj.height+60)
+
+    def release_mouse_press(self):
+        """Releases the mouse pointer"""
+        self.pointing_device.release()
+
+    def flick_page_right(self, obj):
+        """Drag the pointer to the right of the provided object"""
+        startX = obj.x + 40 # add the chart left padding
+        stopX = obj.width - 2
+        lineY = obj.y + obj.height - 2
+        self.pointing_device.drag(startX, lineY, stopX, lineY/1.5)
+
+    def after_program_fully_loaded(self):
+        """Returns when all of the applications ActivityIndicator.running state is False."""
+
+        add_activity_indicator = self.select('ActivityIndicator', objectName='addActivityIndicator')
+        current_activity_indicator = self.select('ActivityIndicator', objectName='currentActivityIndicator')
+        charts_activity_indicator = self.select('ActivityIndicator', objectName='chartsActivityIndicator')
+        news_activity_indicator = self.select('ActivityIndicator', objectName='newsActivityIndicator')
+        self.assertThat(add_activity_indicator.running, Eventually(Equals(False)))
+        self.assertThat(current_activity_indicator.running, Eventually(Equals(False)))
+        self.assertThat(charts_activity_indicator.running, Eventually(Equals(False)))
+        self.assertThat(news_activity_indicator.running, Eventually(Equals(False)))

=== removed file 'tests/autopilot/stock_ticker/emulators/__init__.py'
--- tests/autopilot/stock_ticker/emulators/__init__.py	2013-07-08 21:08:59 +0000
+++ tests/autopilot/stock_ticker/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,17 +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]>

=== removed file 'tests/autopilot/stock_ticker/emulators/ubuntusdk.py'
--- tests/autopilot/stock_ticker/emulators/ubuntusdk.py	2013-07-16 12:36:53 +0000
+++ tests/autopilot/stock_ticker/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
@@ -1,153 +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]>
-#              Robert Steckroth, Surgemcgee Bust0ut <[e-mail]>
-
-from testtools.matchers import Equals, NotEquals, Not, Is
-from autopilot.matchers import Eventually
-import time
-
-
-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 switch_to_tab(self, tab):
-        """Switch to the specified tab number"""
-        tabs = self.app.select_single("Tabs", objectName="rootTabs")
-        currentTab = tabs.selectedTabIndex
-      
-        #perform operations until tab == currentTab
-        while tab != currentTab:
-            if tab < currentTab:
-               self._previous_tab()
-            if tab > currentTab:
-               self._next_tab()
-            currentTab = tabs.selectedTabIndex
-
-    def click_object(self, obj):
-        self.autopilot.pointing_device.click_object(obj)
-
-    def move_subtabs_bar_up(self):
-        """Moves the subtabs bar to a different location"""
-        qmlView = self.get_qml_view()
-        sub_bar = self.app.select_single("QQuickRectangle", objectName='subTabsBar')
-        button_width = sub_bar.select_single('UbuntuShape', objectName='detailsTab').width
-        self.autopilot.pointing_device.move_to_object(sub_bar)
-
-        self.autopilot.pointing_device.drag( self.autopilot.pointing_device.x-button_width-5, self.autopilot.pointing_device.y,
-                                             self.autopilot.pointing_device.x-button_width-5, qmlView.height*0.3)
-
-
-    def flick_page_up(self, obj):    
-        """Moves the pointer around the charts sub tab"""
-        startX = obj.x + 2
-        stopX = obj.x + obj.width - 2
-        lineY = obj.y + obj.height - 2
-        self.autopilot.pointing_device.drag(startX, lineY, stopX/1.5, obj.y+2)
-
-    def hold_page_down(self, obj):    
-        """Grabs and holds the provided object downwards"""
-
-        self.autopilot.pointing_device.move_to_object(obj)
-        self.autopilot.pointing_device.press()
-        self.autopilot.pointing_device.move(self.autopilot.pointing_device.x, obj.y+obj.height+60)
-
-    def release_mouse_press(self):
-        """Releases the mouse pointer"""
-        self.autopilot.pointing_device.release()
-
-
-    def flick_page_right(self, obj):    
-        """Drag the pointer to the right of the provided object"""
-        startX = obj.x + 40 # add the chart left padding
-        stopX = obj.width - 2
-        lineY = obj.y + obj.height - 2
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY/1.5)
-
-    def after_program_fully_loaded(self):
-        """Returns when all of the applications ActivityIndicator.running state is False."""
-
-        add_activity_indicator = self.app.select_single('ActivityIndicator', objectName='addActivityIndicator')        
-        current_activity_indicator = self.app.select_single('ActivityIndicator', objectName='currentActivityIndicator')        
-        charts_activity_indicator = self.app.select_single('ActivityIndicator', objectName='chartsActivityIndicator')        
-        news_activity_indicator = self.app.select_single('ActivityIndicator', objectName='newsActivityIndicator')        
-        self.autopilot.assertThat(add_activity_indicator.running, Eventually(Equals(False)))
-        self.autopilot.assertThat(current_activity_indicator.running, Eventually(Equals(False)))
-        self.autopilot.assertThat(charts_activity_indicator.running, Eventually(Equals(False)))
-        self.autopilot.assertThat(news_activity_indicator.running, Eventually(Equals(False)))
-
-
-    def open_toolbar(self):
-        """Open the toolbar"""
-        qmlView = self.get_qml_view()
-
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height - 1
-        stopY = 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 = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height * 0.95
-        stopY = qmlView.y + qmlView.height - 1
-
-        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-
-    def _previous_tab(self):
-        """Switch to the previous tab"""
-        qmlView = self.get_qml_view()
-
-        startX = qmlView.x + 20 
-        stopX = qmlView.width * .7 
-        lineY = qmlView.y + 20 
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.move(stopX-80, lineY) # move back into the previous tab
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-        time.sleep(1) # give the app time to move the title text into position
-
-    def _next_tab(self):
-        """Switch to the next tab"""
-        qmlView = self.get_qml_view()
-
-        startX = qmlView.x + qmlView.width * 0.90
-        stopX = qmlView.x + 20
-        lineY = qmlView.y + 20
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.move(stopX+20, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-        time.sleep(1) # give the app time to move the title text into position
-        
-
-
-
-

=== modified file 'tests/autopilot/stock_ticker/tests/__init__.py'
--- tests/autopilot/stock_ticker/tests/__init__.py	2013-07-10 01:46:45 +0000
+++ tests/autopilot/stock_ticker/tests/__init__.py	2013-10-09 19:09:47 +0000
@@ -13,26 +13,29 @@
 #
 # 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]>
-
 
 """Stock_ticker autopilot tests."""
 
 import os.path
 import os
+import shutil
+import logging
 
 from autopilot.input import Mouse, Touch, Pointer
 from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
-
-from stock_ticker.emulators.ubuntusdk import ubuntusdk
+from autopilot.matchers import Eventually
+from testtools.matchers import GreaterThan, Equals
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+from stock_ticker import emulators
+
+logger = logging.getLogger(__name__)
+
 
 class StockTickerTestCase(AutopilotTestCase):
-
-    """The package base class to provide ubuntu_sdk to the test_Clases with autopilot included and app assinged by autopilot (also used with ubuntu_sdk).
-
-    """
+    """A common test case class that provides several useful methods for
+    StockTicker tests."""
 
     if model() == 'Desktop':
         scenarios = [('with mouse', dict(input_device_class=Mouse))]
@@ -40,34 +43,76 @@
         scenarios = [('with touch', dict(input_device_class=Touch))]
 
     local_location = "../../Stock_Ticker.qml"
+    installed_location = "/usr/share/stock-ticker-mobile-app/Stock_Tickers.qml"
+    sqlite_dir = os.path.expanduser(
+        "~/.local/share/stock-ticker-mobile-app/Databases")
+    backup_dir = sqlite_dir + ".backup"
 
     def setUp(self):
+        super(StockTickerTestCase, self).setUp()
         self.pointing_device = Pointer(self.input_device_class.create())
-        super(StockTickerTestCase, self).setUp()
+
+        #backup and wipe db's before testing
+        self.temp_move_sqlite_db()
+        self.addCleanup(self.restore_sqlite_db)
+
         if os.path.exists(self.local_location):
             self.launch_test_local()
-        else:
+        elif os.path.exists(self.installed_location):
             self.launch_test_installed()
+        else:
+            self.launch_test_click()
 
     def launch_test_local(self):
         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/stock-ticker-mobile-app/Stock_Ticker.qml",
-            "--desktop_file_hint=/usr/share/applications/stock-ticker-app.desktop",
-            app_type='qt')
+            self.installed_location,
+            "--desktop_file_hint=/usr/share/applications/"
+            "stock-ticker-app.desktop",
+            app_type='qt',
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    def launch_test_click(self):
+        self.app = self.launch_click_package(
+            "com.ubuntu.stock-ticker-mobile",
+            emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+    def temp_move_sqlite_db(self):
+        try:
+            shutil.rmtree(self.backup_dir)
+        except:
+            pass
+        else:
+            logger.warning("Prexisting backup database found and removed")
+
+        try:
+            shutil.move(self.sqlite_dir, self.backup_dir)
+        except:
+            logger.warning("No current database found")
+        else:
+            logger.debug("Backed up database")
+
+    def restore_sqlite_db(self):
+        if os.path.exists(self.backup_dir):
+            if os.path.exists(self.sqlite_dir):
+                try:
+                    shutil.rmtree(self.sqlite_dir)
+                except:
+                    logger.error("Failed to remove test database and restore" /
+                                 "database")
+                    return
+            try:
+                shutil.move(self.backup_dir, self.sqlite_dir)
+            except:
+                logger.error("Failed to restore database")
 
     @property
-    def ubuntu_sdk(self):
-        return ubuntusdk(self, self.app)
-
-
-
-
-
-
+    def main_view(self):
+        return self.app.select_single(emulators.MainView)

=== modified file 'tests/autopilot/stock_ticker/tests/test_Management_page.py'
--- tests/autopilot/stock_ticker/tests/test_Management_page.py	2013-07-16 02:12:46 +0000
+++ tests/autopilot/stock_ticker/tests/test_Management_page.py	2013-10-09 19:09:47 +0000
@@ -31,39 +31,28 @@
     def setUp(self):
         super(TestManagementPage, self).setUp()
         self.assertThat(
-            self.ubuntu_sdk.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestManagementPage, self).tearDown() 
-
-       
+            self.main_view.visible, Eventually(Equals(True)))
+
     def test_add_remove_stock(self):
-        """Tests adding a stock by typing it into the text feild, selecting it from the autocomplete drop down and clicking the add button in the listview."""
-
-        tabs = self.app.select_single("Tabs", objectName="rootTabs")
-
-        self.ubuntu_sdk.switch_to_tab(1)
-        self.assertThat(tabs.selectedTabIndex, Eventually(Equals(1)))
-
-        self.ubuntu_sdk.after_program_fully_loaded()
-    
-        add_text_feild = self.app.select_single('TextField', objectName='addStockTextField')        
-      
-        self.ubuntu_sdk.click_object(add_text_feild)
-
-        self.ubuntu_sdk.autopilot.keyboard.press_and_release('End', delay=0.2)
-        self.ubuntu_sdk.autopilot.keyboard.press_and_release(' ', delay=0.3)
-        self.ubuntu_sdk.autopilot.keyboard.press_and_release('g', delay=0.3)
-#        self.ubuntu_sdk.autopilot.keyboard.press_and_release('o', delay=0.3)
-#        self.ubuntu_sdk.autopilot.keyboard.press_and_release('o', delay=0.3)
-#        self.ubuntu_sdk.autopilot.keyboard.press_and_release('g', delay=0.3)
+        """Tests adding a stock by typing it into the text field, selecting it from the autocomplete drop down and clicking the add button in the listview."""
+        self.main_view.switch_to_tab_by_index(1)
+
+        self.main_view.after_program_fully_loaded()
+
+        add_text_field = self.app.select_single('TextField', objectName='addStockTextField')
+
+        self.pointing_device.click_object(add_text_field)
+
+        self.keyboard.press_and_release('End', delay=0.2)
+        self.keyboard.press_and_release(' ', delay=0.3)
+        self.keyboard.press_and_release('g', delay=0.3)
 
         add_text_popover = self.app.select_single('Popover', objectName='autoCompletePopup')
         self.assertThat(add_text_popover.visible, Eventually(Equals(True)))
 
         autocomplete_activity_indicator = add_text_popover.select_single('ActivityIndicator', objectName='autocompleteActivity')
         self.assertThat(autocomplete_activity_indicator.running, Eventually(Equals(False)))
-                
+
         search_matches = add_text_popover.select_single('QQuickListView', objectName='matchListView')
 
         management_item = self.app.select_single('QQuickItem', objectName='managementAdd')
@@ -82,7 +71,7 @@
 
         self.assertThat(search_match_name.text, Eventually(Equals('GOOG Google Inc. NASDAQ')))
 
-        self.ubuntu_sdk.click_object(search_match_name)
+        self.pointing_device.click_object(search_match_name)
 
         self.assertThat(management_listview.count, Eventually(Equals(add_list_count+1))) # the listElement was added to the management_listview
 
@@ -90,7 +79,7 @@
 
         cmpy_index = -1
         for o in management_delegate:
-            add_list_item = o.select_single('QQuickText', objectName='companyNameText')  
+            add_list_item = o.select_single('QQuickText', objectName='companyNameText')
             cmpy_index += 1
             if add_list_item and hasattr(add_list_item, 'text'):
                 if add_list_item.text == 'Google Inc.':
@@ -99,24 +88,7 @@
         self.assertThat(add_list_item.text, Eventually(Equals('Google Inc.')))
 
         remove_button = management_delegate[cmpy_index].select_single('QQuickItem', objectName='removeButton')
-        self.ubuntu_sdk.click_object(remove_button)
-
- 
+        self.pointing_device.click_object(remove_button)
+
+
         self.assertThat(management_listview.count, Eventually(Equals(add_list_count)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

=== modified file 'tests/autopilot/stock_ticker/tests/test_Subtabs.py'
--- tests/autopilot/stock_ticker/tests/test_Subtabs.py	2013-07-16 02:12:46 +0000
+++ tests/autopilot/stock_ticker/tests/test_Subtabs.py	2013-10-09 19:09:47 +0000
@@ -32,54 +32,50 @@
     def setUp(self):
         super(TestSubtabs, self).setUp()
         self.assertThat(
-            self.ubuntu_sdk.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestSubtabs, self).tearDown() 
-
-       
+            self.main_view.visible, Eventually(Equals(True)))
+
     def test_chart_subtab(self):
         """Tests if the chart is visible and interacting with the user input."""
 
         tabs = self.app.select_single("Tabs", objectName="rootTabs")
 
-        self.ubuntu_sdk.switch_to_tab(0)
+        self.main_view.switch_to_tab(0)
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
 
-        self.ubuntu_sdk.after_program_fully_loaded()
+        self.main_view.after_program_fully_loaded()
 
         sub_bar = self.app.select_single("QQuickRectangle", objectName='subTabsBar')
         charts_button = sub_bar.select_single('UbuntuShape', objectName='chartsTab')
         details_button = sub_bar.select_single('UbuntuShape', objectName='detailsTab')
-    
+
         subtab_pages = self.app.select_single('QQuickItem', objectName='currentRectSizer').get_children()
 
-        self.ubuntu_sdk.click_object(details_button)
+        self.pointing_device.click_object(details_button)
         self.assertThat(subtab_pages[2].visible, Eventually(Equals(True)))
 
-        self.ubuntu_sdk.click_object(charts_button)
+        self.pointing_device.click_object(charts_button)
 
         self.assertThat(subtab_pages[2].visible, Eventually(Equals(False)))
         self.assertThat(subtab_pages[1].visible, Eventually(Equals(True)))
-      
+
         chart_dot = self.app.select_single('QQuickImage', objectName='chartDot')
         chart_info = self.app.select_single('QQuickText', objectName='dayInfoText')
 
-        self.ubuntu_sdk.click_object(subtab_pages[1])
+        self.pointing_device.click_object(subtab_pages[1])
 
         dot_x = chart_dot.x
         info_text = chart_info.text
 
 
-        self.ubuntu_sdk.move_subtabs_bar_up()
-
-        self.ubuntu_sdk.flick_page_right(subtab_pages[1])
-
-        self.assertThat(chart_dot.x, NotEquals(dot_x))       
-
-        self.assertThat(chart_info.text, NotEquals(info_text))       
-
-        self.assertThat(dot_x < chart_dot.x, Equals(True))       
+        self.main_view.move_subtabs_bar_up()
+
+        self.main_view.flick_page_right(subtab_pages[1])
+
+        self.assertThat(chart_dot.x, NotEquals(dot_x))
+
+        self.assertThat(chart_info.text, NotEquals(info_text))
+
+        self.assertThat(dot_x < chart_dot.x, Equals(True))
 
 
     def test_details_subtab(self):
@@ -87,22 +83,22 @@
 
         tabs = self.app.select_single("Tabs", objectName="rootTabs")
 
-        self.ubuntu_sdk.switch_to_tab(0)
+        self.main_view.switch_to_tab(0)
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
 
-        self.ubuntu_sdk.after_program_fully_loaded()
+        self.main_view.after_program_fully_loaded()
 
         sub_bar = self.app.select_single("QQuickRectangle", objectName='subTabsBar')
 
         news_button = sub_bar.select_single('UbuntuShape', objectName='newsTab')
         details_button = sub_bar.select_single('UbuntuShape', objectName='detailsTab')
-    
+
         subtab_pages = self.app.select_single('QQuickItem', objectName='currentRectSizer').get_children()
 
-        self.ubuntu_sdk.click_object(news_button)
+        self.pointing_device.click_object(news_button)
         self.assertThat(subtab_pages[3].visible, Eventually(Equals(True)))
 
-        self.ubuntu_sdk.click_object(details_button)
+        self.pointing_device.click_object(details_button)
 
         self.assertThat(subtab_pages[3].visible, Eventually(Equals(False)))
         self.assertThat(subtab_pages[2].visible, Eventually(Equals(True)))
@@ -113,12 +109,12 @@
 
         self.assertThat(details_listview.contentY, Eventually(Equals(details_listview.contentY)))
 
-        self.ubuntu_sdk.move_subtabs_bar_up()
-        self.ubuntu_sdk.hold_page_down(subtab_pages[2])
-
-        self.assertThat(details_listview.contentY, Eventually(NotEquals(contentY)))      
-
-        self.ubuntu_sdk.release_mouse_press()
+        self.main_view.move_subtabs_bar_up()
+        self.main_view.hold_page_down(subtab_pages[2])
+
+        self.assertThat(details_listview.contentY, Eventually(NotEquals(contentY)))
+
+        self.main_view.release_mouse_press()
 
         self.assertThat(details_listview.contentY, Eventually(Equals(contentY)))
 
@@ -126,25 +122,21 @@
 
     def test_news_subtab(self):
         """Tests if the details sub tab is visible and interacting with the user input."""
-
-        tabs = self.app.select_single("Tabs", objectName="rootTabs")
-
-        self.ubuntu_sdk.switch_to_tab(0)
-        self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
-
-        self.ubuntu_sdk.after_program_fully_loaded()
+        self.main_view.switch_to_tab_by_index(0)
+
+        self.main_view.after_program_fully_loaded()
 
         sub_bar = self.app.select_single("QQuickRectangle", objectName='subTabsBar')
 
         news_button = sub_bar.select_single('UbuntuShape', objectName='newsTab')
         details_button = sub_bar.select_single('UbuntuShape', objectName='detailsTab')
-    
+
         subtab_pages = self.app.select_single('QQuickItem', objectName='currentRectSizer').get_children()
 
-        self.ubuntu_sdk.click_object(details_button)
+        self.pointing_device.click_object(details_button)
         self.assertThat(subtab_pages[2].visible, Eventually(Equals(True)))
 
-        self.ubuntu_sdk.click_object(news_button)
+        self.pointing_device.click_object(news_button)
 
         self.assertThat(subtab_pages[2].visible, Eventually(Equals(False)))
         self.assertThat(subtab_pages[3].visible, Eventually(Equals(True)))
@@ -155,12 +147,12 @@
 
         self.assertThat(news_listview.contentY, Eventually(Equals(contentY)))
 
-        self.ubuntu_sdk.move_subtabs_bar_up()
-        self.ubuntu_sdk.hold_page_down(subtab_pages[3])
-
-        self.assertThat(news_listview.contentY, Eventually(NotEquals(contentY)))      
-
-        self.ubuntu_sdk.release_mouse_press()
+        self.main_view.move_subtabs_bar_up()
+        self.main_view.hold_page_down(subtab_pages[3])
+
+        self.assertThat(news_listview.contentY, Eventually(NotEquals(contentY)))
+
+        self.main_view.release_mouse_press()
 
         self.assertThat(news_listview.contentY, Eventually(Equals(contentY)))
 

=== modified file 'tests/autopilot/stock_ticker/tests/test_Toolbar_actions.py'
--- tests/autopilot/stock_ticker/tests/test_Toolbar_actions.py	2013-08-29 16:14:12 +0000
+++ tests/autopilot/stock_ticker/tests/test_Toolbar_actions.py	2013-10-09 19:09:47 +0000
@@ -31,19 +31,16 @@
     def setUp(self):
         super(TestToolbar, self).setUp()
         self.assertThat(
-            self.ubuntu_sdk.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestToolbar, self).tearDown() # why doesn't this not exist in base test package class?
+            self.main_view.visible, Eventually(Equals(True)))
 
     def _open_toolbar(self):
         """Switches to the Watched tab and opens the toolbar"""
 
         tabs = self.app.select_single("Tabs", objectName="rootTabs")
-        self.ubuntu_sdk.switch_to_tab(0)
+        self.main_view.switch_to_tab(0)
         self.assertThat(tabs.selectedTabIndex, Eventually(Equals(0)))
 
-        self.ubuntu_sdk.open_toolbar()
+        self.main_view.open_toolbar()
 
         toolbar = self.app.select_single("Toolbar")
 
@@ -51,45 +48,45 @@
 
         return toolbar
 
-        
+
     def test_application_reset(self):
         """Tests if the sub tabs bar is resizing and if the appication resets back to the defaults."""
 
-        self.ubuntu_sdk.after_program_fully_loaded()
+        self.main_view.after_program_fully_loaded()
 
-        toolbar = self._open_toolbar()
+        toolbar = self.main_view.open_toolbar()
         toolbar_type = toolbar.select_single('ToolbarItems')
         toolbar_all = toolbar_type.select_single('QQuickRow').get_children()
 
-        toolbar_item = {}       
+        toolbar_item = {}
         for o in toolbar_all:
             if o.objectName:
                 toolbar_item[o.objectName] = o
 
-        self.ubuntu_sdk.click_object(toolbar_item['resetData'])
+        self.pointing_device.click_object(toolbar_item['resetData'])
         reset_dialog = self.app.select_single('Dialog', objectName='resetDataDialog')
-        self.ubuntu_sdk.click_object(reset_dialog.select_single('Button', objectName='resetConfirm'))
+        self.pointing_device.click_object(reset_dialog.select_single('Button', objectName='resetConfirm'))
 
-        self.ubuntu_sdk.hide_toolbar()
+        self.main_view.close_toolbar()
 
         top_window = self.app.select_single('QQuickItem', objectName='currentRectSizer')  # going to set this and then make sure it back to its default height
         top_window_height = top_window.height
-        self.ubuntu_sdk.move_subtabs_bar_up()
+        self.main_view.move_subtabs_bar_up()
         self.assertThat(top_window_height, NotEquals(top_window.height))
 
 
-        self._open_toolbar()
-        self.ubuntu_sdk.click_object(toolbar_item['resetData'])
+        self.main_view.open_toolbar()
+        self.pointing_device.click_object(toolbar_item['resetData'])
 
         reset_dialog_a = self.app.select_single('Dialog', objectName='resetDataDialog') # re-assign due to the way component wrapped objects behave
-        self.ubuntu_sdk.click_object(reset_dialog_a.select_single('Button', objectName='resetConfirm'))
-        
-        self.ubuntu_sdk.hide_toolbar()
+        self.pointing_device.click_object(reset_dialog_a.select_single('Button', objectName='resetConfirm'))
+
+        self.main_view.close_toolbar()
 
         self.assertThat(top_window_height, Equals(top_window.height))
 
 
-       
+