Merge lp:~nskaggs/ubuntu-sdk-tutorials/update-currency-tests into lp:ubuntu-sdk-tutorials

[Nicholas Skaggs]

update tests for currency converter

[Daniel Holbach (dholbach)]

daniel@daydream:/tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter$ sudo apt-get install python3-autopilot autopilot-desktop[sudo] password for daniel:
Reading package lists... Done
Building dependency tree
Reading state information... Done
autopilot-desktop is already the newest version.
python3-autopilot is already the newest version.
0 to upgrade, 0 to newly install, 0 to remove and 0 not to upgrade.
daniel@daydream:/tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter$ make test
qmltestrunner -input tests/unit
file:///tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter/tests/unit/tst_convert.qml:19:5: CurrencyConverter is not a type
         CurrencyConverter {
         ^
********* Start testing of qmltestrunner *********
Config: Using QtTest library 5.4.0, Qt 5.4.0 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 4.9.2)
QWARN : qmltestrunner::tst_convert::compile()
  /tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter/tests/unit/tst_convert.qml produced 1 error(s):
    /tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter/tests/unit/tst_convert.qml:19,5: CurrencyConverter is not a type
  Working directory: /tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter
  View: QQuickView, import paths:
    '/home/daniel/.local/share'
    '/usr/share'
    '/usr/local/share'
    '/usr/share/gnome'
    '/usr/share/ubuntu'
    '/tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter'
    '/usr/lib/x86_64-linux-gnu/qt5/bin'
    '/usr/lib/x86_64-linux-gnu/qt5/qml'
  Plugin paths:
    '.'

FAIL! : qmltestrunner::tst_convert::compile() CurrencyConverter is not a type
   Loc: [/tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter/tests/unit/tst_convert.qml(19)]
Totals: 0 passed, 1 failed, 0 skipped, 0 blacklisted
********* Finished testing of qmltestrunner *********
Makefile:32: recipe for target 'test' failed
make: *** [test] Error 1
daniel@daydream:/tmp/ubuntu-sdk-tutorials/getting-started/CurrencyConverter$

review: Needs Fixing

[Nicholas Skaggs (nskaggs)]

make test works now. Merging with dholbach's blessing.

[lp:~nskaggs/ubuntu-sdk-tutorials/update-currency-tests]

137. By Nicholas Skaggs on 2015-03-12

merge lp:~nskaggs/ubuntu-sdk-tutorials/update-currency-tests

=== renamed file 'getting-started/CurrencyConverter/main.qml' => 'getting-started/CurrencyConverter/Main.qml'
--- getting-started/CurrencyConverter/main.qml	2015-01-08 17:45:23 +0000
+++ getting-started/CurrencyConverter/Main.qml	2015-03-12 17:38:35 +0000
@@ -10,8 +10,6 @@
 
 MainView {
     id: root
-    // objectName for functional testing purposes (autopilot-qt5)
-    objectName: "mainView"
 
     // Note! applicationName needs to match the "name" field of the click manifest
     applicationName: "currencyconverter.yourname"

=== modified file 'getting-started/CurrencyConverter/Makefile'
--- getting-started/CurrencyConverter/Makefile	2015-01-08 17:45:23 +0000
+++ getting-started/CurrencyConverter/Makefile	2015-03-12 17:38:35 +0000
@@ -3,9 +3,7 @@
 # Notes for autopilot tests:
 # ---------------------------------------------------------------
 # In order to run autopilot tests:
-# sudo apt-add-repository ppa:autopilot/ppa
-# sudo apt-get update
-# sudo apt-get install python-autopilot autopilot-qt
+# sudo apt-get install python3-autopilot autopilot-desktop
 #
 # Notes for translations:
 # ---------------------------------------------------------------
@@ -30,9 +28,11 @@
 
 all: po/template.pot
 
-autopilot:
-	chmod +x tests/autopilot/run
-	tests/autopilot/run
+test:
+	qmltestrunner -input tests/unit
+	qmltestrunner -input tests/integration
+	chmod +x tests/acceptance/run
+	tests/acceptance/run
 
 check:
 	qmltestrunner -input tests/unit

=== renamed directory 'getting-started/CurrencyConverter/tests/autopilot' => 'getting-started/CurrencyConverter/tests/acceptance'
=== renamed directory 'getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter' => 'getting-started/CurrencyConverter/tests/acceptance/currencyconverter'
=== modified file 'getting-started/CurrencyConverter/tests/acceptance/currencyconverter/__init__.py'
--- getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/__init__.py	2013-06-05 16:58:12 +0000
+++ getting-started/CurrencyConverter/tests/acceptance/currencyconverter/__init__.py	2015-03-12 17:38:35 +0000
@@ -1,6 +1,6 @@
 # -#- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -#-
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013-2015 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
@@ -16,4 +16,78 @@
 #
 # Authored by: Nicholas Skaggs <[e-mail]>
 
-"""CurrencyConverter autopilot tests and emulators - top level package."""
+import ubuntuuitoolkit
+import logging
+import random
+
+logger = logging.getLogger(__name__)
+
+
+class CurrencyConverter(object):
+
+    """Autopilot helper object for the currencyconverter application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(Main)
+
+    @property
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class Main(ubuntuuitoolkit.MainView):
+
+    """Autopilot helper for the MainView."""
+
+    def __init__(self, *args):
+        super(Main, self).__init__(*args)
+        self.visible.wait_for(True)
+        self.wait_for_network()
+
+    def wait_for_network(self):
+        self.select_single("ActivityIndicator").running.wait_for(False)
+
+    def set_random_to_value(self):
+        """Sets a random value in the to currency field"""
+        self.get_to_currency_field()._set_field_to_random_value()
+
+    def set_random_from_value(self):
+        """Sets a random value in the from currency field"""
+        self.get_from_currency_field()._set_field_to_random_value()
+
+    def get_clear_button(self):
+        """Returns the clear button object"""
+        return self.select_single("Button", objectName="clearBtn")
+
+    def use_clear_button(self):
+        """Clicks the clear button"""
+        self.pointing_device.click_object(self.get_clear_button())
+
+    def get_from_currency_field(self):
+        """Returns the from currency field"""
+        return self.select_single(TextField, objectName="inputFrom")
+
+    def get_to_currency_field(self):
+        """Returns the to currency field"""
+        return self.select_single(TextField, objectName="inputTo")
+
+    def get_from_currency_button(self):
+        """Returns the select for the from currency field"""
+        return self.select_single("Button", objectName="selectorFrom")
+
+    def get_to_currency_button(self):
+        """Returns the select for the to currency field"""
+        return self.select_single("Button", objectName="selectorTo")
+
+
+class TextField(ubuntuuitoolkit.TextField):
+    """Autopilot helper for the Textfield."""
+
+    def _set_field_to_random_value(self):
+        value = str(random.random())
+        self.write(value)
+
+    def get_value(self):
+        return float(self.text)

=== modified file 'getting-started/CurrencyConverter/tests/acceptance/currencyconverter/tests/__init__.py'
--- getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/tests/__init__.py	2013-06-11 20:36:45 +0000
+++ getting-started/CurrencyConverter/tests/acceptance/currencyconverter/tests/__init__.py	2015-03-12 17:38:35 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013-2015 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
@@ -20,54 +20,48 @@
 """CurrencyConverter autopilot tests."""
 
 import os.path
-import os
-
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.platform import model
 from autopilot.testcase import AutopilotTestCase
-
-from CurrencyConverter.emulators.main_window import MainWindow
-from CurrencyConverter.emulators.ubuntusdk import ubuntusdk
+from autopilot import logging as autopilot_logging
+import logging
+import currencyconverter
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
 
 class CurrencyConverterTestCase(AutopilotTestCase):
-
     """A common test case class that provides several useful methods for
-    CurrencyConverter tests.
-
-    """
-
-    if model() == 'Desktop':
-        scenarios = [('with mouse', dict(input_device_class=Mouse))]
-    else:
-        scenarios = [('with touch', dict(input_device_class=Touch))]
-
-    local_location = "../../CurrencyConverter.qml"
+    CurrencyConverter tests."""
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location, 'Main.qml')
+
+    def get_launcher_and_type(self):
+        if os.path.exists(self.local_location_qml):
+            launcher = self.launch_test_local
+            test_type = 'local'
+        else:
+            launcher = self.launch_test_click
+            test_type = 'click'
+        return launcher, test_type
 
     def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
         super(CurrencyConverterTestCase, self).setUp()
-        if os.path.exists(self.local_location):
-            self.launch_test_local()
-        else:
-            self.launch_test_installed()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+        self.app = currencyconverter.CurrencyConverter(self.launcher(),
+                                                       self.test_type)
 
+    @autopilot_logging.log_action(logger.info)
     def launch_test_local(self):
-        self.app = self.launch_test_application(
-            "qmlscene",
-            self.local_location,
-            app_type='qt')
-
-    def launch_test_installed(self):
-        self.app = self.launch_test_application(
-            "qmlscene",
-            "/usr/share/CurrencyConverter/CurrencyConverter.qml",
-            "--desktop_file_hint=/usr/share/applications/CurrencyConverter.desktop",
-            app_type='qt')
-
-    @property
-    def main_window(self):
-        return MainWindow(self.app)
-
-    @property
-    def ubuntusdk(self):
-        return ubuntusdk(self, self.app)
+        return self.launch_test_application(
+            base.get_qmlscene_launch_command(),
+            self.local_location_qml,
+            app_type='qt',
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_click(self):
+        return self.launch_click_package(
+            "com.ubuntu.developer.yourname.currencyconverter",
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)

=== renamed file 'getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/tests/test_CurrencyConverter.py' => 'getting-started/CurrencyConverter/tests/acceptance/currencyconverter/tests/test_currencyconverter.py'
--- getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/tests/test_CurrencyConverter.py	2013-06-11 20:36:45 +0000
+++ getting-started/CurrencyConverter/tests/acceptance/currencyconverter/tests/test_currencyconverter.py	2015-03-12 17:38:35 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013 Canonical Ltd
+# Copyright (C) 2013-2015 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
@@ -19,77 +19,32 @@
 
 """ Tests for CurrencyConverter """
 
-from __future__ import absolute_import
-
-from testtools.matchers import Equals, NotEquals, Not, Is
-from autopilot.matchers import Eventually
-
-from CurrencyConverter.tests import CurrencyConverterTestCase
-
-
-class TestCurrencyConverter(CurrencyConverterTestCase):
-    """ Tests the CurrencyConverter page features """
-
-    def setUp(self):
-        super(TestCurrencyConverter, self).setUp()
-        self.assertThat(
-            self.ubuntusdk.get_qml_view().visible, Eventually(Equals(True)))
-
-    def tearDown(self):
-        super(TestCurrencyConverter, self).tearDown()
-
-    """ Test if the currency rate is converted """
-    def test_convert_currency(self):
-        fromField = self.main_window.get_from_currency_field()
-        toField = self.main_window.get_to_currency_field()
-        fromCurrencyButton = self.main_window.get_from_currency_button()
-        toCurrencyButton = self.main_window.get_to_currency_button()
-
-        #store current values
-        oldToValue = toField.text
-
-        #input value to convert from
-        self.pointing_device.click_object(fromField)
-        self.keyboard.type('1')
-
-        #store current values
-        oldFromValue = fromField.text
-
-        #verify fromField was updated and toField is still the same
-        self.assertThat(toField.text, Eventually(NotEquals(oldToValue)))
-        self.assertThat(fromField.text, Eventually(Equals(oldFromValue)))
-
-        #store current values
-        oldFromValue = fromField.text
-        oldToValue = toField.text
-
-        #change the from currency
-        self.ubuntusdk.set_popup_value("popoverCurrencySelector", fromCurrencyButton, 'HUF')
-
-        #verify fromField was updated and toField is still the same
-        self.assertThat(fromField.text, Eventually(NotEquals(oldFromValue)))
-        self.assertThat(toField.text, Eventually(Equals(oldToValue)))
-
-        #store current values
-        oldFromValue = fromField.text
-        oldToValue = toField.text
-
-        #change the to currency
-        self.ubuntusdk.set_popup_value("popoverCurrencySelector", toCurrencyButton, 'BGN')
-
-        #verify fromField is the same and toField is updated
-        self.assertThat(fromField.text, Eventually(Equals(oldFromValue)))
-        self.assertThat(toField.text, Eventually(NotEquals(oldToValue)))
-
-    """ Test if the clear button clears the screen """
+from currencyconverter.tests import CurrencyConverterTestCase
+
+
+class TestMainWindow(CurrencyConverterTestCase):
+
+    def test_from_currency_convert(self):
+        """ Setting from currency value should update to currency """
+
+        self.app.main_view.set_random_from_value()
+        to_value = self.app.main_view.get_to_currency_field().get_value()
+        self.assertGreater(to_value, 0)
+
+    def test_to_currency_convert(self):
+        """ Setting to currency value should update from currency """
+
+        self.app.main_view.set_random_to_value()
+        from_value = self.app.main_view.get_from_currency_field().get_value()
+        self.assertGreater(from_value, 0)
+
     def test_clear_button(self):
-        clearButton = self.main_window.get_clear_button()
-        fromField = self.main_window.get_from_currency_field()
-        toField = self.main_window.get_to_currency_field()
-
-        #click the clear button
-        self.pointing_device.click_object(clearButton)
-
-        #confirm fields have been wiped
-        self.assertThat(fromField.text, Eventually(Equals('0.0')))
-        self.assertThat(toField.text, Eventually(Equals('0.0')))
+        """ Test if the clear button clears the screen """
+
+        self.app.main_view.set_random_from_value()
+        self.app.main_view.use_clear_button()
+
+        self.assertEquals(self.app.main_view.get_from_currency_field().text,
+                          '0.0')
+        self.assertEquals(self.app.main_view.get_to_currency_field().text,
+                          '0.0')

=== added file 'getting-started/CurrencyConverter/tests/acceptance/run'
--- getting-started/CurrencyConverter/tests/acceptance/run	1970-01-01 00:00:00 +0000
+++ getting-started/CurrencyConverter/tests/acceptance/run	2015-03-12 17:38:35 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [[ -z `which autopilot3` ]]; then
+  echo "Autopilot3 is not installed. Skip"
+  exit
+fi
+
+SCRIPTPATH=`dirname $0`
+pushd ${SCRIPTPATH}
+autopilot3 run -v currencyconverter
+popd
+

=== removed directory 'getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators'
=== removed file 'getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/__init__.py'
--- getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/__init__.py	2013-06-05 16:58:12 +0000
+++ getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/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 'getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/main_window.py'
--- getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/main_window.py	2013-06-11 20:36:45 +0000
+++ getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,44 +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]>
-
-
-class MainWindow(object):
-    """An emulator class that makes it easy to interact with the CurrencyConverter."""
-
-    def __init__(self, app):
-        self.app = app
-
-    def get_clear_button(self):
-        """Returns the clear button object"""
-        return self.app.select_single("Button", objectName="clearBtn")
-
-    def get_from_currency_field(self):
-        """Returns the from currency field"""
-        return self.app.select_single("TextField", objectName="inputFrom")
-
-    def get_to_currency_field(self):
-        """Returns the to currency field"""
-        return self.app.select_single("TextField", objectName="inputTo")
-
-    def get_from_currency_button(self):
-        """Returns the select for the from currency field"""
-        return self.app.select_single("Button", objectName="selectorFrom")
-
-    def get_to_currency_button(self):
-        """Returns the select for the to currency field"""
-        return self.app.select_single("Button", objectName="selectorTo")

=== removed file 'getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/ubuntusdk.py'
--- getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/ubuntusdk.py	2013-06-11 22:58:27 +0000
+++ getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/emulators/ubuntusdk.py	1970-01-01 00:00:00 +0000
@@ -1,165 +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 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._previous_tab()
-            if tab < currentTab:
-                self._next_tab()
-            currentTab = tabs.selectedTabIndex
-
-    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, button):
-        """Returns the toolbar button at position index"""
-        toolbar = self.get_toolbar()
-        item = toolbar.get_children_by_type("QQuickItem")[0]
-        row = item.get_children_by_type("QQuickRow")[0]
-        buttonLoaders = row.get_children_by_type("QQuickLoader")
-        buttonLoader = buttonLoaders[button]
-        return buttonLoader
-
-    def click_toolbar_button(self, value):
-        """Clicks the toolbar button with value"""
-        #The toolbar button is assumed to be the following format
-        #ToolbarActions {
-        #           Action {
-        #               objectName: "name"
-        #                text: value
-        toolbar = self.get_toolbar()
-        if not toolbar.opened:
-            self.open_toolbar()
-        item = toolbar.get_children_by_type("QQuickItem")[0]
-        row = item.get_children_by_type("QQuickRow")[0]
-        buttonList = row.get_children_by_type("QQuickLoader")
-        for button in buttonList:
-            itemList = lambda: self.get_objects("Action", button)
-
-            for item in itemList():
-                if item.get_properties()['text'] == value:
-                    self.autopilot.pointing_device.click_object(item)
-
-    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 - 200
-
-        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    def hide_toolbar(self):
-        """Hide the toolbar"""
-        qmlView = self.get_qml_view()
-
-        lineX = qmlView.x + qmlView.width * 0.50
-        startY = qmlView.y + qmlView.height - 200
-        stopY = qmlView.y + qmlView.height - 1
-
-        self.autopilot.pointing_device.drag(lineX, startY, lineX, stopY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()
-
-    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
-        #    Popover {
-        #        Column {
-        #            ListView {
-        #                delegate: Standard {
-        #                    objectName: "name"
-        #                    text: value
-
-        self.autopilot.pointing_device.click_object(button)
-        #we'll get all matching objects, incase the popover is reused between buttons
-        itemList = lambda: self.get_objects("Standard", popover)
-
-        for item in itemList():
-            if item.get_properties()['text'] == value:
-                self.autopilot.pointing_device.click_object(item)
-
-    def get_tabs(self):
-        """Return all tabs"""
-        return self.get_object("Tabs", "rootTabs")
-
-    def _previous_tab(self):
-        """Switch to the previous tab"""
-        qmlView = self.get_qml_view()
-
-        startX = qmlView.x + qmlView.width * 0.20
-        stopX = qmlView.x + qmlView.width * 0.50
-        lineY = qmlView.y + qmlView.height * 0.05
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, 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 = qmlView.x + qmlView.width * 0.50
-        stopX = qmlView.x + qmlView.width * 0.20
-        lineY = qmlView.y + qmlView.height * 0.05
-
-        self.autopilot.pointing_device.drag(startX, lineY, stopX, lineY)
-        self.autopilot.pointing_device.click()
-        self.autopilot.pointing_device.click()

=== removed file 'getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/test_main.py'
--- getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/test_main.py	2015-01-08 17:45:23 +0000
+++ getting-started/CurrencyConverter/tests/autopilot/CurrencyConverter/test_main.py	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for the Hello World"""
-
-import os
-
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
-
-import CurrencyConverter
-
-
-class MainViewTestCase(CurrencyConverter.ClickAppTestCase):
-    """Generic tests for the Hello World"""
-
-    def test_initial_label(self):
-        label = self.main_view.select_single(objectName='label')
-        self.assertThat(label.text, Equals('Hello..'))
-
-    def test_click_button_should_update_label(self):
-        button = self.main_view.select_single(objectName='button')
-        self.pointing_device.click_object(button)
-        label = self.main_view.select_single(objectName='label')
-        self.assertThat(label.text, Eventually(Equals('..world!')))
-

=== removed file 'getting-started/CurrencyConverter/tests/autopilot/run'
--- getting-started/CurrencyConverter/tests/autopilot/run	2015-01-08 17:45:23 +0000
+++ getting-started/CurrencyConverter/tests/autopilot/run	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
-  exit
-fi
-
-SCRIPTPATH=`dirname $0`
-pushd ${SCRIPTPATH}
-autopilot run CurrencyConverter
-popd
-

=== renamed directory 'getting-started/CurrencyConverter/tests/qmltests' => 'getting-started/CurrencyConverter/tests/integration'
=== renamed file 'getting-started/CurrencyConverter/tests/qmltests/tst_CurrencyConverter.qml' => 'getting-started/CurrencyConverter/tests/integration/tst_currencyconverter.qml'
--- getting-started/CurrencyConverter/tests/qmltests/tst_CurrencyConverter.qml	2014-03-05 13:39:26 +0000
+++ getting-started/CurrencyConverter/tests/integration/tst_currencyconverter.qml	2015-03-12 17:38:35 +0000
@@ -2,7 +2,7 @@
 import Ubuntu.Components 0.1 // we need units.gu() here
 import QtTest 1.0 // for TestCase, compare() etc
 import Ubuntu.Test 0.1 // for UbuntuTestCase, findChild() etc
-import "../../"
+import "../.."
 
 // Part 2 (read tst_currency.qml first if you haven't)
 
@@ -10,16 +10,16 @@
 // This time we wrap the TestCase into an Item because we need to display
 // the CurrencyConverter.
 // Just like before, you can run it with
-// qmltestrunner -input tst_CurrencyConverter.qml
+// qmltestrunner -input tst_currencyconverter.qml
 // Additionally you can open it in qmlscene:
-// qmlscene tst_CurrencyConverter.qml
+// qmlscene tst_currencyconverter.qml
 
 Item {
     width: units.gu(40)
     height: units.gu(30)
 
     // Create an instance of the QML element we want to test
-    CurrencyConverter {
+    Main {
         id: currencyConverter
         anchors.fill: parent
     }
@@ -58,13 +58,13 @@
             keyClick(Qt.Key_5)
 
             // Now the field should contain the value 0.05 because 0.0 is already in there in the beginning
-            tryCompare(inputFrom, "text", "0.05", "Input field \"From:\" does does not contain the value 0.05")
+            tryCompare(inputFrom, "text", "0.05")
 
             var clearBtn = findChild(currencyConverter, "clearBtn")
             mouseClick(clearBtn, clearBtn.width / 2, clearBtn.height / 2)
             
             // Now the field should be set back to "0.0"
-            tryCompare(inputFrom, "text", "0.0", "Input field \"From:\" is not reset to 0.00")
+            tryCompare(inputFrom, "text", "0.0")
         }
 
 

=== renamed file 'getting-started/CurrencyConverter/tests/qmltests/tst_convert.qml' => 'getting-started/CurrencyConverter/tests/unit/tst_convert.qml'
--- getting-started/CurrencyConverter/tests/qmltests/tst_convert.qml	2014-03-05 13:39:26 +0000
+++ getting-started/CurrencyConverter/tests/unit/tst_convert.qml	2015-03-12 17:38:35 +0000
@@ -16,7 +16,7 @@
 
     // The element we want to test. As we are not painting
     // anything, don't bother with the size.
-    CurrencyConverter {
+    Main {
         id: currencyConverter
     }
 

=== removed file 'getting-started/CurrencyConverter/tests/unit/tst_hellocomponent.qml'
--- getting-started/CurrencyConverter/tests/unit/tst_hellocomponent.qml	2015-01-08 17:45:23 +0000
+++ getting-started/CurrencyConverter/tests/unit/tst_hellocomponent.qml	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-import QtQuick 2.0
-import QtTest 1.0
-import Ubuntu.Components 1.1
-import "../../components"
-
-// See more details @ http://qt-project.org/doc/qt-5.0/qtquick/qml-testcase.html
-
-// Execute tests with:
-//   qmltestrunner
-
-Item {
-    // The objects
-    HelloComponent {
-        id: objectUnderTest
-    }
-
-    TestCase {
-        name: "HelloComponent"
-
-        function init() {
-            console.debug(">> init");
-            compare("",objectUnderTest.text,"text was not empty on init");
-            console.debug("<< init");
-        }
-
-        function cleanup() {
-            console.debug(">> cleanup");
-            console.debug("<< cleanup");
-        }
-
-        function initTestCase() {
-            console.debug(">> initTestCase");
-            console.debug("<< initTestCase");
-        }
-
-        function cleanupTestCase() {
-            console.debug(">> cleanupTestCase");
-            console.debug("<< cleanupTestCase");
-        }
-
-        function test_canReadAndWriteText() {
-            var expected = "Hello World";
-
-            objectUnderTest.text = expected;
-
-            compare(expected,objectUnderTest.text,"expected did not equal result");
-        }
-    }
-}
-