Merge lp:~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot into lp:qtcreator-plugin-ubuntu

[Nicholas Skaggs]

Update qml based templates to best practicies

Update the qml template for autopilot. I also copied the qml templates from the single qml template to all the other templates. This means all qml templates should have the same test templates covering unit and functional testing.

FYI, This will fail if someone makes a project with something like a "-" or other character in it. This is because autopilot imports the folder as a module and it needs to be valid. This is not a new problem but it would also be nice to solve it while we are in here :-) Ideas?

For review purposes, don't be put off by the diff size. All the template updates are the same, so you can focus on one.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:393
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/539/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/73

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/539/rebuild

review: Approve (continuous-integration)

[lp:~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot]

394. By Nicholas Skaggs on 2015-05-15

rename main -> tests

395. By Nicholas Skaggs on 2015-05-15

fix package naming

396. By Nicholas Skaggs on 2015-05-15

fix naming

397. By Nicholas Skaggs on 2015-05-15

update other cmake template

398. By Nicholas Skaggs on 2015-05-15

flake8 and renames

399. By Nicholas Skaggs on 2015-05-15

more flake8

400. By Nicholas Skaggs on 2015-05-15

reversed __init__.py files

401. By Nicholas Skaggs on 2015-05-15

flake8

402. By Nicholas Skaggs on 2015-05-15

update all other qml templates to be the same

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:396
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/540/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/540/rebuild

review: Approve (continuous-integration)

[lp:~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot]

403. By Nicholas Skaggs on 2015-05-15

update wizard descriptions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/541/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/541/rebuild

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

LGTM

review: Approve

[Nicholas Skaggs (nskaggs)]

Just fyi, I've confirmed this also runs as expected on the device, from the sdk, adt, etc.

[lp:~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot]

404. By Nicholas Skaggs on 2015-05-22

merge benjamin's fixes to show testfiles

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/545/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/6

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/545/rebuild

review: Approve (continuous-integration)

[lp:~nskaggs/qtcreator-plugin-ubuntu/update-qml-autopilot]

405. By Nicholas Skaggs on 2015-05-26

merge benjamin's fixes

- Unify naming of unittest subdirectories (qml vs unit)
- Add custom "check" and "autopilot" targets to easily run tests
- Fix targets in CMake buildfiles

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/546/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-wily-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/546/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt	2015-05-06 08:49:21 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt	2015-05-26 21:42:21 +0000
@@ -58,15 +58,17 @@
 
 add_custom_target("autopilot" chmod +x ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
                     COMMAND ${CMAKE_SOURCE_DIR}/app/tests/autopilot/run
-                    DEPENDS %ProjectName%backend %ProjectName%backend-qmldir
-                    WORKING_DIRECTORY ./app)
-
-add_custom_target("check" /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
-                    DEPENDS %ProjectName%backend %ProjectName%backend-qmldir
-                    WORKING_DIRECTORY ./app)
-
-add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/%ProjectName%.qml
-                    DEPENDS %ProjectName%backend %ProjectName%backend-qmldir
+                    DEPENDS %ClickHookName:s%backend %ClickHookName:s%backend-qmldir
+                    WORKING_DIRECTORY ./app)
+
+add_custom_target("check"
+                    COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/backend/tests/unit -import ${CMAKE_BINARY_DIR}/backend
+                    COMMAND /usr/bin/qmltestrunner -input ${CMAKE_SOURCE_DIR}/app/tests/unit -import ${CMAKE_BINARY_DIR}/backend
+                    DEPENDS %ClickHookName:s%backend %ClickHookName:s%backend-qmldir
+                    WORKING_DIRECTORY ./app)
+
+add_custom_target("run" /usr/bin/qmlscene -I ${CMAKE_BINARY_DIR}/backend  ${CMAKE_SOURCE_DIR}/app/Main.qml
+                    DEPENDS %ClickHookName:s%backend %ClickHookName:s%backend-qmldir
                     WORKING_DIRECTORY ./app)
 
 # No op custom target for all not compiled files, so they show up in the QtCreator project tree
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/CMakeLists.txt	2015-01-15 09:48:38 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/CMakeLists.txt	2015-05-26 21:42:21 +0000
@@ -9,3 +9,10 @@
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DESKTOP_DIR})
 install(FILES ${QML_JS_FILES} DESTINATION ${%ProjectName:u%_DIR})
 
+# Make the autpilot files visible in qtcreator
+file(GLOB_RECURSE AUTOPILOT_TEST_FILES *.py)
+add_custom_target(%ProjectName:l%_AutopilotFiles ALL SOURCES ${AUTOPILOT_TEST_FILES})
+
+# Make the unit test files visible in qtcreator
+file(GLOB_RECURSE UNIT_TEST_FILES tests/unit/*.qml)
+add_custom_target(%ProjectName:l%_UnitTestFiles ALL SOURCES ${UNIT_TEST_FILES})
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/__init__.py	2014-02-05 22:28:56 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/__init__.py	2015-05-26 21:42:21 +0000
@@ -1,132 +1,41 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Ubuntu Touch App autopilot tests."""
-
-from os import remove
-import os.path
-from tempfile import mktemp
-import subprocess
-
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.matchers import Eventually
-from autopilot.platform import model
-from testtools.matchers import Is, Not, Equals
-from autopilot.testcase import AutopilotTestCase
-
-def get_module_include_path():
-    return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            'backend',
-            'modules')
-        )
-
-
-class UbuntuTouchAppTestCase(AutopilotTestCase):
-    """A common test case class that provides several useful methods for the tests."""
-
-    if model() == 'Desktop':
-        scenarios = [
-        ('with mouse', dict(input_device_class=Mouse))
-        ]
-    else:
-        scenarios = [
-        ('with touch', dict(input_device_class=Touch))
-        ]
+"""Application autopilot helpers."""
+
+import logging
+import ubuntuuitoolkit
+
+logger = logging.getLogger(__name__)
+
+
+class AppException(ubuntuuitoolkit.ToolkitException):
+
+    """Exception raised when there are problems with the Application."""
+
+
+class TouchApp(object):
+
+    """Autopilot helper object for the application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(MainView)
 
     @property
-    def main_window(self):
-        return MainWindow(self.app)
-
-
-    def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(UbuntuTouchAppTestCase, self).setUp()
-        self.launch_test_qml()
-
-
-    def launch_test_qml(self):
-        # If the test class has defined a 'test_qml' class attribute then we
-        # write it to disk and launch it inside the QML Scene. If not, then we
-        # silently do nothing (presumably the test has something else planned).
-        arch = subprocess.check_output(["dpkg-architecture",
-        "-qDEB_HOST_MULTIARCH"]).strip()
-        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
-            qml_path = mktemp(suffix='.qml')
-            open(qml_path, 'w').write(self.test_qml)
-            self.addCleanup(remove, qml_path)
-
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
-            qml_path = self.test_qml_file
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
-
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-
-        return self.app.select_single("QQuickView")
-
-    def get_mainview(self):
-        """Get the QML MainView"""
-
-        mainView = self.app.select_single("MainView")
-        self.assertThat(mainView, Not(Is(None)))
-        return mainView
-
-
-    def get_object(self,objectName):
-        """Get a object based on the objectName"""
-
-        obj = self.app.select_single(objectName=objectName)
-        self.assertThat(obj, Not(Is(None)))
-        return obj
-
-
-    def mouse_click(self,objectName):
-        """Move mouse on top of the object and click on it"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.click()
-
-
-    def mouse_press(self,objectName):
-        """Move mouse on top of the object and press mouse button (without releasing it)"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-
-    def mouse_release(self):
-        """Release mouse button"""
-
-        self.pointing_device.release()     
-
-
-    def type_string(self, string):
-        """Type a string with keyboard"""
-
-        self.keyboard.type(string)
-
-
-    def type_key(self, key):
-        """Type a single key with keyboard"""
-
-        self.keyboard.key(key)
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """A helper that makes it easy to interact with the mainview"""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True, 30)
+
+    def get_button(self):
+        return self.select_single('Button', objectName="button")
+
+    def get_label(self):
+        return self.select_single('Label', objectName="label")
 \ No newline at end of file
 
=== renamed directory 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main' => 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/tests'
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/tests/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main/__init__.py	2015-01-17 04:53:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/tests/__init__.py	2015-05-26 21:42:21 +0000
@@ -1,1 +1,54 @@
-""" A Main.qml test suite """
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Ubuntu Touch App Autopilot tests."""
+
+import os
+import logging
+
+import %ProjectName%
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot import logging as autopilot_logging
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
+
+class BaseTestCase(AutopilotTestCase):
+
+    """A common test case class
+
+    """
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location, 'Main.qml')
+    click_package = '{0}.{1}'.format('%ProjectName%', '%ClickDomain%')
+
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+        self.app = %ProjectName%.TouchApp(self.launcher(), self.test_type)
+
+    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
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        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(
+            self.click_package,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 \ No newline at end of file
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/tests/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main/test_main.py	2015-05-06 08:49:21 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/tests/test_main.py	2015-05-26 21:42:21 +0000
@@ -1,23 +1,21 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 
-"""Tests for the Hello World"""
-
 from autopilot.matchers import Eventually
-from textwrap import dedent
-from testtools.matchers import Is, Not, Equals
-from testtools import skip
-import os
-from %ProjectName% import UbuntuTouchAppTestCase
-
-
-class MainTests(UbuntuTouchAppTestCase):
-    """Generic tests for the Hello World"""
-
-    test_qml_file = "%s/%s/Main.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../..")
-
-    def test_0_can_select_mainView(self):
-        """Must be able to select the mainview."""
-
-        mainView = self.get_mainview()
-        self.assertThat(mainView.visible,Eventually(Equals(True)))
-
+from testtools.matchers import Equals
+from %ProjectName% import tests
+
+
+class MainViewTestCase(tests.BaseTestCase):
+    """Tests for the mainview"""
+
+    def setUp(self):
+        super(MainViewTestCase, self).setUp()
+
+    def test_click_button(self):
+        # Find and click the button
+        button = self.app.main_view.get_button()
+        self.app.pointing_device.click_object(button)
+
+        # Make an assertion about what should happen
+        label = self.app.main_view.get_label()
+        self.assertThat(label.text, Eventually(Equals('..world!')))
 \ No newline at end of file
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/run	2014-06-30 15:20:18 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/run	2015-05-26 21:42:21 +0000
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
   exit
 fi
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run %ProjectName%
-popd
+autopilot3 run %ProjectName%
+popd
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/unit'
=== added file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/unit/tst_main.qml'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/unit/tst_main.qml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/unit/tst_main.qml	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import "../../"
+// See more details at https://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Test.UbuntuTestCase
+
+// Execute these tests with:
+//   qmltestrunner
+
+Item {
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    // The objects
+    Main {
+        id: main
+    }
+
+    UbuntuTestCase {
+        name: "MainTestCase"
+
+        when: windowShown
+
+
+        function init() {
+            var label = findChild(main, "label");
+            // See the compare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#compare-method
+            compare("Hello world..", label.text);
+        }
+
+        function test_clickButtonMustChangeLabel() {
+            var button = findChild(main, "button");
+            var buttonCenter = centerOf(button)
+            mouseClick(button, buttonCenter.x, buttonCenter.y);
+            var label = findChild(main, "label");
+            // See the tryCompare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#tryCompare-method
+            tryCompare(label, "text", "..from Cpp Backend", 1);
+        }
+    }
+}
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/backend/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/backend/CMakeLists.txt	2014-07-10 15:35:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/backend/CMakeLists.txt	2015-05-26 21:42:21 +0000
@@ -8,6 +8,9 @@
     modules/%ClickHookName:s%/mytype.cpp
 )
 
+# Make the unit test files visible on qtcreator
+add_custom_target(%ClickHookName:s%backend_UNITTEST_QML_FILES ALL SOURCES "tests/unit/tst_mytype.qml")
+
 add_library(%ClickHookName:s%backend MODULE
     ${%ClickHookName:s%backend_SRCS}
 )
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml	2015-05-06 08:49:21 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml	2015-05-26 21:42:21 +0000
@@ -1,73 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wizard version="1" kind="project" firstpage="10" id="A4_UbuntuAppWBackendPlusTabsCMake'" category="A.UbuntuProject"
-        platformIndependent="true" 
+        platformIndependent="true"
         class="ubuntu-project-cmake"
-				featuresRequired=""
+                featuresRequired=""
         >
     <icon>../share/ubuntu.png</icon>
     <description>A simple C++ based QtQuick2 Extension Library with
 simple UI written in QML.
 
-Includes also
+Also includes:
  - a unit test for C++
  - unit and functional tests for QML
 </description>
     <displayname>QML App with C++ plugin (cmake)</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
-        <file source="CMakeLists.txt"                          target="CMakeLists.txt" openproject="true"/>
-        <file source="backend/CMakeLists.txt"                  target="backend/CMakeLists.txt" openeditor="false"/>
-        <file source="backend/modules/displayName/backend.h"   target="backend/modules/%ClickHookName:s%/backend.h" openeditor="false"/>
-        <file source="backend/modules/displayName/backend.cpp" target="backend/modules/%ClickHookName:s%/backend.cpp" openeditor="false"/>
-        <file source="backend/modules/displayName/mytype.h"    target="backend/modules/%ClickHookName:s%/mytype.h" openeditor="false"/>
-        <file source="backend/modules/displayName/mytype.cpp"  target="backend/modules/%ClickHookName:s%/mytype.cpp" openeditor="false"/>
-        <file source="backend/modules/displayName/qmldir"      target="backend/modules/%ClickHookName:s%/qmldir" openeditor="false"/>
-        <file source="backend/tests/unit/tst_mytype.qml"       target="backend/tests/unit/tst_mytype.qml" openeditor="false"/>
-        <file source="app/graphics/[e-mail]"          target="app/graphics/[e-mail]" openeditor="false" binary="true"/>
-	<file source="app/displayName.desktop.in"              target="app/%ClickHookName%.desktop.in" openeditor="false"/>
-        <file source="app/graphics/displayName.png"            target="app/graphics/%ProjectName%.png" openeditor="false" binary="true"/>
-        <file source="app/CMakeLists.txt"                      target="app/CMakeLists.txt" openeditor="false"/>
-        <file source="app/tests/autopilot/run"                 target="app/tests/autopilot/run" openeditor="false"/>
-        <file source="app/tests/autopilot/displayName/main/test_main.py" target="app/tests/autopilot/%ProjectName%/main/test_main.py" openeditor="false"/>
-        <file source="app/tests/autopilot/displayName/__init__.py"       target="app/tests/autopilot/%ProjectName%/__init__.py" openeditor="false"/>
-        <file source="app/tests/autopilot/displayName/main/__init__.py"  target="app/tests/autopilot/%ProjectName%/main/__init__.py" openeditor="false"/>
-        <file source="cmake/Click.cmake"                                 target="cmake/Click.cmake" openeditor="false"/>
-        <file source="manifest.json.in"   			               target="manifest.json.in" openeditor="true"/>
-        <file source="../share/displayName.apparmor"   			   target="%ClickHookName%.apparmor" openeditor="false"/>
-        <file source="app/Main.qml"                     target="app/Main.qml" openeditor="true"/>
-        <file source="po/CMakeLists.txt"                       target="po/CMakeLists.txt"     openeditor="false"/>
+        <file source="CMakeLists.txt"                                     target="CMakeLists.txt"                                       openproject="true"/>
+        <file source="backend/CMakeLists.txt"                             target="backend/CMakeLists.txt"                               openeditor="false"/>
+        <file source="backend/modules/displayName/backend.h"              target="backend/modules/%ClickHookName:s%/backend.h"          openeditor="false"/>
+        <file source="backend/modules/displayName/backend.cpp"            target="backend/modules/%ClickHookName:s%/backend.cpp"        openeditor="false"/>
+        <file source="backend/modules/displayName/mytype.h"               target="backend/modules/%ClickHookName:s%/mytype.h"           openeditor="false"/>
+        <file source="backend/modules/displayName/mytype.cpp"             target="backend/modules/%ClickHookName:s%/mytype.cpp"         openeditor="false"/>
+        <file source="backend/modules/displayName/qmldir"                 target="backend/modules/%ClickHookName:s%/qmldir"             openeditor="false"/>
+        <file source="backend/tests/unit/tst_mytype.qml"                  target="backend/tests/unit/tst_mytype.qml"                    openeditor="false"/>
+        <file source="app/graphics/[e-mail]"                     target="app/graphics/[e-mail]"                       openeditor="false" binary="true"/>
+        <file source="app/displayName.desktop.in"                         target="app/%ClickHookName%.desktop.in"                       openeditor="false"/>
+        <file source="app/graphics/displayName.png"                       target="app/graphics/%ProjectName%.png"                       openeditor="false" binary="true"/>
+        <file source="app/CMakeLists.txt"                                 target="app/CMakeLists.txt"                                   openeditor="false"/>
+        <file source="app/tests/autopilot/run"                            target="app/tests/autopilot/run"                              openeditor="false"/>
+        <file source="app/tests/autopilot/displayName/tests/test_main.py" target="app/tests/autopilot/%ProjectName%/tests/test_main.py" openeditor="false"/>
+        <file source="app/tests/autopilot/displayName/__init__.py"        target="app/tests/autopilot/%ProjectName%/__init__.py"        openeditor="false"/>
+        <file source="app/tests/autopilot/displayName/tests/__init__.py"  target="app/tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
+        <file source="app/tests/unit/tst_main.qml"                        target="app/tests/unit/tst_main.qml"                          openeditor="false"/>
+        <file source="cmake/Click.cmake"                                  target="cmake/Click.cmake"                                    openeditor="false"/>
+        <file source="manifest.json.in"                                   target="manifest.json.in"                                     openeditor="true"/>
+        <file source="../share/displayName.apparmor"                      target="%ClickHookName%.apparmor"                             openeditor="false"/>
+        <file source="app/Main.qml"                                       target="app/Main.qml"                                         openeditor="true"/>
+        <file source="po/CMakeLists.txt"                                  target="po/CMakeLists.txt"                                    openeditor="false"/>
    </files>
 
-	  <!-- Create a 2nd wizard page with click package parameters -->
-		<fieldpagetitle>Click package parameters</fieldpagetitle>
-		<fields>
-			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-			                defaulttext="" placeholdertext="Nickname"/>
-			  <fielddescription>Nickname:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickMaintainer">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="" placeholdertext="Maintainer"/>
-			  <fielddescription>Maintainer:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="myapp" placeholdertext="app hook name"/>
-			  <fielddescription>App name:</fielddescription>
-			</field>
+      <!-- Create a 2nd wizard page with click package parameters -->
+        <fieldpagetitle>Click package parameters</fieldpagetitle>
+        <fields>
+            <field mandatory="true" name="ClickDomain">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+                            defaulttext="" placeholdertext="Nickname"/>
+              <fielddescription>Nickname:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickMaintainer">
+              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+                            defaulttext="" placeholdertext="Maintainer"/>
+              <fielddescription>Maintainer:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickHookName">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+                            defaulttext="myapp" placeholdertext="app hook name"/>
+              <fielddescription>App name:</fielddescription>
+            </field>
       <field name="ClickFrameworkVersion">
           <fieldcontrol class="QComboBox" defaultindex="0">
               <comboentries>
-								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-								<comboentry value="ubuntu-sdk-dummy-framework">
+                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+                                <comboentry value="ubuntu-sdk-dummy-framework">
                     <comboentrytext>Dummy Framework</comboentrytext>
                 </comboentry>
               </comboentries>
           </fieldcontrol>
           <fielddescription>Framework:</fielddescription>
       </field>
-		</fields>
+        </fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro	2015-01-16 10:50:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.pro	2015-05-26 21:42:21 +0000
@@ -4,14 +4,18 @@
 RESOURCES += %ClickHookName%.qrc
 
 QML_FILES += $$files(*.qml,true) \
-					   $$files(*.js,true)
+             $$files(*.js,true)
 
 CONF_FILES +=  %ClickHookName%.apparmor \
                %ClickHookName%.desktop \
                %ClickHookName%.png
 
+AP_TEST_FILES += tests/autopilot/run \
+                 $$files(tests/*.py,true)
+
 OTHER_FILES += $${CONF_FILES} \
-               $${QML_FILES}
+               $${QML_FILES} \
+               $${AP_TEST_FILES}
 
 #specify where the qml/js files are installed to
 qml_files.path = /%ClickHookName%
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName'
=== added file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/__init__.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/__init__.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Application autopilot helpers."""
+
+import logging
+import ubuntuuitoolkit
+
+logger = logging.getLogger(__name__)
+
+
+class AppException(ubuntuuitoolkit.ToolkitException):
+
+    """Exception raised when there are problems with the Application."""
+
+
+class TouchApp(object):
+
+    """Autopilot helper object for the application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(MainView)
+
+    @property
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """A helper that makes it easy to interact with the mainview"""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True, 30)
+
+    def get_button(self):
+        return self.select_single('Button', objectName="button")
+
+    def get_label(self):
+        return self.select_single('Label', objectName="label")
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/tests'
=== added file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,54 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Ubuntu Touch App Autopilot tests."""
+
+import os
+import logging
+
+import %ProjectName%
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot import logging as autopilot_logging
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
+
+class BaseTestCase(AutopilotTestCase):
+
+    """A common test case class
+
+    """
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location, 'Main.qml')
+    click_package = '{0}.{1}'.format('%ProjectName%', '%ClickDomain%')
+
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+        self.app = %ProjectName%.TouchApp(self.launcher(), self.test_type)
+
+    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
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        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(
+            self.click_package,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 \ No newline at end of file
 
=== added file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from %ProjectName% import tests
+
+
+class MainViewTestCase(tests.BaseTestCase):
+    """Tests for the mainview"""
+
+    def setUp(self):
+        super(MainViewTestCase, self).setUp()
+
+    def test_click_button(self):
+        # Find and click the button
+        button = self.app.main_view.get_button()
+        self.app.pointing_device.click_object(button)
+
+        # Make an assertion about what should happen
+        label = self.app.main_view.get_label()
+        self.assertThat(label.text, Eventually(Equals('..world!')))
 \ No newline at end of file
 
=== added file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/run	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/autopilot/run	2015-05-26 21:42:21 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
+  exit
+fi
+
+SCRIPTPATH=`dirname $0`
+pushd ${SCRIPTPATH}
+autopilot3 run %ProjectName%
+popd
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/unit'
=== added file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/unit/tst_main.qml'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/unit/tst_main.qml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/tests/unit/tst_main.qml	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import "../../"
+// See more details at https://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Test.UbuntuTestCase
+
+// Execute these tests with:
+//   qmltestrunner
+
+Item {
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    // The objects
+    Main {
+        id: main
+    }
+
+    UbuntuTestCase {
+        name: "MainTestCase"
+
+        when: windowShown
+
+
+        function init() {
+            var label = findChild(main, "label");
+            // See the compare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#compare-method
+            compare("Hello world..", label.text);
+        }
+
+        function test_clickButtonMustChangeLabel() {
+            var button = findChild(main, "button");
+            var buttonCenter = centerOf(button)
+            mouseClick(button, buttonCenter.x, buttonCenter.y);
+            var label = findChild(main, "label");
+            // See the tryCompare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#tryCompare-method
+            tryCompare(label, "text", "..from Cpp Backend", 1);
+        }
+    }
+}
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro	2015-01-16 10:50:52 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/projectName.pro	2015-05-26 21:42:21 +0000
@@ -31,4 +31,14 @@
 # compiled and installed into the right place in the click package
 UBUNTU_PO_FILES+=$$files(po/*.po)
 
+aptest.target   = autopilot
+aptest.commands = QML2_IMPORT_PATH=$$OUT_PWD/backend bash $$PWD/app/tests/autopilot/run
+aptest.depends  = sub-app sub-backend-App
+
+unittest.target   = check
+unittest.commands = /usr/bin/qmltestrunner -input $$PWD/backend/tests/unit -import $$OUT_PWD/backend
+unittest.commands += && /usr/bin/qmltestrunner -input $$PWD/app/tests/unit -import $$OUT_PWD/backend
+unittest.depends  = sub-app sub-backend-App
+
+QMAKE_EXTRA_TARGETS += aptest unittest
 
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml	2015-02-04 17:42:14 +0000
+++ share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/wizard.xml	2015-05-26 21:42:21 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wizard version="1" kind="project" firstpage="10" id="A4_UbuntuAppBackendQmake'" category="A.UbuntuProject"
-        platformIndependent="true" 
+        platformIndependent="true"
         class="ubuntu-project-qmake"
-				featuresRequired=""
+                featuresRequired=""
         >
     <icon>../share/ubuntu.png</icon>
     <description>A simple C++ based QtQuick2 Extension Library with
 simple UI written in QML.
 
-Includes also
+Also includes:
  - a unit test for C++
  - unit and functional tests for QML
 
@@ -21,11 +21,16 @@
 <!-- MANIFEST PARTS -->
       <file source="manifest.json.in" openeditor="true"/>
 <!-- APP PARTS -->
-      <file source="appName/appName.pro"   		 target="%ClickHookName%/%ClickHookName%.pro" openeditor="false"/>
-      <file source="appName/appName.png"   		 target="%ClickHookName%/%ClickHookName%.png" openeditor="false" binary="true"/>
+      <file source="appName/appName.pro"         target="%ClickHookName%/%ClickHookName%.pro" openeditor="false"/>
+      <file source="appName/appName.png"         target="%ClickHookName%/%ClickHookName%.png" openeditor="false" binary="true"/>
       <file source="appName/Main.qml"                    target="%ClickHookName%/Main.qml" openeditor="true"/>
       <file source="appName/appName.desktop"             target="%ClickHookName%/%ClickHookName%.desktop"  openeditor="false"/>
       <file source="appName/appName.apparmor"            target="%ClickHookName%/%ClickHookName%.apparmor" openeditor="false"/>
+      <file source="appName/tests/autopilot/run"                            target="%ClickHookName%/tests/autopilot/run"                              openeditor="false"/>
+      <file source="appName/tests/autopilot/displayName/tests/test_main.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/test_main.py" openeditor="false"/>
+      <file source="appName/tests/autopilot/displayName/__init__.py"        target="%ClickHookName%/tests/autopilot/%ProjectName%/__init__.py"        openeditor="false"/>
+      <file source="appName/tests/autopilot/displayName/tests/__init__.py"  target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
+      <file source="appName/tests/unit/tst_main.qml"                         target="%ClickHookName%/tests/unit/tst_main.qml"                           openeditor="false"/>
       <file source="backend/displayName/backend.h"       target="backend/%ClickHookName:s%/backend.h" openeditor="false"/>
       <file source="backend/displayName/backend.cpp"     target="backend/%ClickHookName:s%/backend.cpp" openeditor="false"/>
       <file source="backend/displayName/mytype.h"        target="backend/%ClickHookName:s%/mytype.h" openeditor="false"/>
@@ -35,36 +40,36 @@
       <file source="backend/tests/unit/tst_mytype.qml"   target="backend/tests/unit/tst_mytype.qml" openeditor="false"/>
    </files>
 
-	  <!-- Create a 2nd wizard page with click package parameters -->
-		<fieldpagetitle>Click package parameters</fieldpagetitle>
-		<fields>
-			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-			                defaulttext="" placeholdertext="Nickname"/>
-			  <fielddescription>Nickname:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickMaintainer">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="" placeholdertext="Maintainer"/>
-			  <fielddescription>Maintainer:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="app" placeholdertext="app hook name"/>
-			  <fielddescription>App name:</fielddescription>
-			</field>
-		  <field name="ClickFrameworkVersion">
-		      <fieldcontrol class="QComboBox" defaultindex="0">
-		          <comboentries>
-								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-								<comboentry value="ubuntu-sdk-dummy-framework">
-		                <comboentrytext>Dummy Framework</comboentrytext>
-		            </comboentry>
-		          </comboentries>
-		      </fieldcontrol>
-		      <fielddescription>Framework:</fielddescription>
-		  </field>
-		</fields>
+      <!-- Create a 2nd wizard page with click package parameters -->
+        <fieldpagetitle>Click package parameters</fieldpagetitle>
+        <fields>
+            <field mandatory="true" name="ClickDomain">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+                            defaulttext="" placeholdertext="Nickname"/>
+              <fielddescription>Nickname:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickMaintainer">
+              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+                            defaulttext="" placeholdertext="Maintainer"/>
+              <fielddescription>Maintainer:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickHookName">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+                            defaulttext="app" placeholdertext="app hook name"/>
+              <fielddescription>App name:</fielddescription>
+            </field>
+          <field name="ClickFrameworkVersion">
+              <fieldcontrol class="QComboBox" defaultindex="0">
+                  <comboentries>
+                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+                                <comboentry value="ubuntu-sdk-dummy-framework">
+                        <comboentrytext>Dummy Framework</comboentrytext>
+                    </comboentry>
+                  </comboentries>
+              </fieldcontrol>
+              <fielddescription>Framework:</fielddescription>
+          </field>
+        </fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro	2015-01-12 09:34:07 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.pro	2015-05-26 21:42:21 +0000
@@ -9,14 +9,24 @@
 
 RESOURCES += %ClickHookName%.qrc
 
-OTHER_FILES += %ClickHookName%.apparmor \
+QML_FILES += $$files(*.qml,true) \
+             $$files(*.js,true)
+
+CONF_FILES +=  %ClickHookName%.apparmor \
                %ClickHookName%.desktop \
                %ClickHookName%.png
 
+AP_TEST_FILES += tests/autopilot/run \
+                 $$files(tests/*.py,true)
+
+#show all the files in QtCreator
+OTHER_FILES += $${CONF_FILES} \
+               $${QML_FILES} \
+               $${AP_TEST_FILES}
+
 #specify where the config files are installed to
 config_files.path = /%ClickHookName%
-config_files.files += $${OTHER_FILES}
-message($$config_files.files)
+config_files.files += $${CONF_FILES}
 INSTALLS+=config_files
 
 # Default rules for deployment.
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName'
=== added file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/__init__.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/__init__.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Application autopilot helpers."""
+
+import logging
+import ubuntuuitoolkit
+
+logger = logging.getLogger(__name__)
+
+
+class AppException(ubuntuuitoolkit.ToolkitException):
+
+    """Exception raised when there are problems with the Application."""
+
+
+class TouchApp(object):
+
+    """Autopilot helper object for the application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(MainView)
+
+    @property
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """A helper that makes it easy to interact with the mainview"""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True, 30)
+
+    def get_button(self):
+        return self.select_single('Button', objectName="button")
+
+    def get_label(self):
+        return self.select_single('Label', objectName="label")
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/tests'
=== added file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,54 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Ubuntu Touch App Autopilot tests."""
+
+import os
+import logging
+
+import %ProjectName%
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot import logging as autopilot_logging
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
+
+class BaseTestCase(AutopilotTestCase):
+
+    """A common test case class
+
+    """
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location, 'Main.qml')
+    click_package = '{0}.{1}'.format('%ProjectName%', '%ClickDomain%')
+
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+        self.app = %ProjectName%.TouchApp(self.launcher(), self.test_type)
+
+    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
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        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(
+            self.click_package,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 \ No newline at end of file
 
=== added file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from %ProjectName% import tests
+
+
+class MainViewTestCase(tests.BaseTestCase):
+    """Tests for the mainview"""
+
+    def setUp(self):
+        super(MainViewTestCase, self).setUp()
+
+    def test_click_button(self):
+        # Find and click the button
+        button = self.app.main_view.get_button()
+        self.app.pointing_device.click_object(button)
+
+        # Make an assertion about what should happen
+        label = self.app.main_view.get_label()
+        self.assertThat(label.text, Eventually(Equals('..world!')))
 \ No newline at end of file
 
=== added file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/run	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/autopilot/run	2015-05-26 21:42:21 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
+  exit
+fi
+
+SCRIPTPATH=`dirname $0`
+pushd ${SCRIPTPATH}
+autopilot3 run %ProjectName%
+popd
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/unit'
=== added file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/unit/tst_main.qml'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/unit/tst_main.qml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/tests/unit/tst_main.qml	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import "../../"
+// See more details at https://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Test.UbuntuTestCase
+
+// Execute these tests with:
+//   qmltestrunner
+
+Item {
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    // The objects
+    Main {
+        id: main
+    }
+
+    UbuntuTestCase {
+        name: "MainTestCase"
+
+        when: windowShown
+
+
+        function init() {
+            var label = findChild(main, "label");
+            // See the compare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#compare-method
+            compare("Hello..", label.text);
+        }
+
+        function test_clickButtonMustChangeLabel() {
+            var button = findChild(main, "button");
+            var buttonCenter = centerOf(button)
+            mouseClick(button, buttonCenter.x, buttonCenter.y);
+            var label = findChild(main, "label");
+            // See the tryCompare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#tryCompare-method
+            tryCompare(label, "text", "..world!", 1);
+        }
+    }
+}
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro	2015-01-12 09:34:07 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/projectName.pro	2015-05-26 21:42:21 +0000
@@ -28,4 +28,13 @@
 # compiled and installed into the right place in the click package
 UBUNTU_PO_FILES+=$$files(po/*.po)
 
+aptest.target   = autopilot
+aptest.commands = bash $$PWD/app/tests/autopilot/run
+aptest.depends  = sub-app
+
+unittest.target   = check
+unittest.commands = /usr/bin/qmltestrunner -input $$PWD/app/tests/unit
+unittest.depends  = sub-app
+
+QMAKE_EXTRA_TARGETS += aptest unittest
 
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml	2015-02-04 17:42:14 +0000
+++ share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/wizard.xml	2015-05-26 21:42:21 +0000
@@ -1,60 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wizard version="1" kind="project" firstpage="10" id="B_UbuntuAppSimpleQmake" category="A.UbuntuProject"
-        platformIndependent="true" 
+        platformIndependent="true"
         class="ubuntu-project-qmake"
-				featuresRequired=""
+                featuresRequired=""
         >
     <icon>../share/ubuntu.png</icon>
     <description>Creates a C++ Ubuntu application project with a sample UI containing a Label and a Button.
 
+Also includes:
+ - unit and functional tests for QML
+
 This templates requires a Kit using at least a 15.04 click chroot.
 </description>
     <displayname>QtQuick App with QML UI (qmake)</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
-     	<file source="projectName.pro" 	         target="%ProjectName%.pro" openproject="true"/>
+        <file source="projectName.pro"           target="%ProjectName%.pro" openproject="true"/>
 <!-- MANIFEST PARTS -->
-			<file source="manifest.json.in" openeditor="true"/>
+            <file source="manifest.json.in" openeditor="true"/>
 <!-- APP PARTS -->
-			<file source="appName/appName.pro"   		 target="%ClickHookName%/%ClickHookName%.pro" openeditor="false"/>
-			<file source="appName/appName.qrc"   		 target="%ClickHookName%/%ClickHookName%.qrc" openeditor="false"/>
-			<file source="appName/appName.png"   		 target="%ClickHookName%/%ClickHookName%.png" openeditor="false" binary="true"/>
-			<file source="appName/Main.qml"          target="%ClickHookName%/Main.qml" openeditor="true"/>
-			<file source="appName/main.cpp"          target="%ClickHookName%/main.cpp" openeditor="true"/>
-			<file source="appName/appName.desktop"   target="%ClickHookName%/%ClickHookName%.desktop"  openeditor="false"/>
-      <file source="appName/appName.apparmor"  target="%ClickHookName%/%ClickHookName%.apparmor" openeditor="false"/>
+            <file source="appName/appName.pro"           target="%ClickHookName%/%ClickHookName%.pro" openeditor="false"/>
+            <file source="appName/appName.qrc"           target="%ClickHookName%/%ClickHookName%.qrc" openeditor="false"/>
+            <file source="appName/appName.png"           target="%ClickHookName%/%ClickHookName%.png" openeditor="false" binary="true"/>
+            <file source="appName/Main.qml"          target="%ClickHookName%/Main.qml" openeditor="true"/>
+            <file source="appName/main.cpp"          target="%ClickHookName%/main.cpp" openeditor="true"/>
+            <file source="appName/appName.desktop"   target="%ClickHookName%/%ClickHookName%.desktop"  openeditor="false"/>
+            <file source="appName/appName.apparmor"  target="%ClickHookName%/%ClickHookName%.apparmor" openeditor="false"/>
+            <file source="appName/tests/autopilot/run"                            target="%ClickHookName%/tests/autopilot/run"                              openeditor="false"/>
+            <file source="appName/tests/autopilot/displayName/tests/test_main.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/test_main.py" openeditor="false"/>
+            <file source="appName/tests/autopilot/displayName/__init__.py"        target="%ClickHookName%/tests/autopilot/%ProjectName%/__init__.py"        openeditor="false"/>
+            <file source="appName/tests/autopilot/displayName/tests/__init__.py"  target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
+            <file source="appName/tests/unit/tst_main.qml"                        target="%ClickHookName%/tests/unit/tst_main.qml"                          openeditor="false"/>
    </files>
 
-	  <!-- Create a 2nd wizard page with click package parameters -->
-		<fieldpagetitle>Click package parameters</fieldpagetitle>
-		<fields>
-			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-			                defaulttext="" placeholdertext="Nickname"/>
-			  <fielddescription>Nickname:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickMaintainer">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="" placeholdertext="Maintainer"/>
-			  <fielddescription>Maintainer:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="app" placeholdertext="app hook name"/>
-			  <fielddescription>App name:</fielddescription>
-			</field>
-		  <field name="ClickFrameworkVersion">
-		      <fieldcontrol class="QComboBox" defaultindex="0">
-		          <comboentries>
-								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-								<comboentry value="ubuntu-sdk-dummy-framework">
-		                <comboentrytext>Dummy Framework</comboentrytext>
-		            </comboentry>
-		          </comboentries>
-		      </fieldcontrol>
-		      <fielddescription>Framework:</fielddescription>
-		  </field>
-		</fields>
+      <!-- Create a 2nd wizard page with click package parameters -->
+        <fieldpagetitle>Click package parameters</fieldpagetitle>
+        <fields>
+            <field mandatory="true" name="ClickDomain">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+                            defaulttext="" placeholdertext="Nickname"/>
+              <fielddescription>Nickname:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickMaintainer">
+              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+                            defaulttext="" placeholdertext="Maintainer"/>
+              <fielddescription>Maintainer:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickHookName">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+                            defaulttext="app" placeholdertext="app hook name"/>
+              <fielddescription>App name:</fielddescription>
+            </field>
+          <field name="ClickFrameworkVersion">
+              <fieldcontrol class="QComboBox" defaultindex="0">
+                  <comboentries>
+                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+                                <comboentry value="ubuntu-sdk-dummy-framework">
+                        <comboentrytext>Dummy Framework</comboentrytext>
+                    </comboentry>
+                  </comboentries>
+              </fieldcontrol>
+              <fielddescription>Framework:</fielddescription>
+          </field>
+        </fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro	2015-01-15 12:51:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.pro	2015-05-26 21:42:21 +0000
@@ -4,14 +4,18 @@
 RESOURCES += %ClickHookName%.qrc
 
 QML_FILES += $$files(*.qml,true) \
-					   $$files(*.js,true)
+             $$files(*.js,true)
 
 CONF_FILES +=  %ClickHookName%.apparmor \
                %ClickHookName%.desktop \
                %ClickHookName%.png
 
+AP_TEST_FILES += tests/autopilot/run \
+                 $$files(tests/*.py,true)               
+
 OTHER_FILES += $${CONF_FILES} \
-               $${QML_FILES}
+               $${QML_FILES} \
+               $${AP_TEST_FILES}
 
 #specify where the qml/js files are installed to
 qml_files.path = /%ClickHookName%
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot'
=== added directory 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName'
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/__init__.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/__init__.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Application autopilot helpers."""
+
+import logging
+import ubuntuuitoolkit
+
+logger = logging.getLogger(__name__)
+
+
+class AppException(ubuntuuitoolkit.ToolkitException):
+
+    """Exception raised when there are problems with the Application."""
+
+
+class TouchApp(object):
+
+    """Autopilot helper object for the application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(MainView)
+
+    @property
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """A helper that makes it easy to interact with the mainview"""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True, 30)
+
+    def get_button(self):
+        return self.select_single('Button', objectName="button")
+
+    def get_label(self):
+        return self.select_single('Label', objectName="label")
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/tests'
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/tests/__init__.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,54 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Ubuntu Touch App Autopilot tests."""
+
+import os
+import logging
+
+import %ProjectName%
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot import logging as autopilot_logging
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
+
+class BaseTestCase(AutopilotTestCase):
+
+    """A common test case class
+
+    """
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location, 'Main.qml')
+    click_package = '{0}.{1}'.format('%ProjectName%', '%ClickDomain%')
+
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+        self.app = %ProjectName%.TouchApp(self.launcher(), self.test_type)
+
+    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
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        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(
+            self.click_package,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 \ No newline at end of file
 
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/displayName/tests/test_main.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from %ProjectName% import tests
+
+
+class MainViewTestCase(tests.BaseTestCase):
+    """Tests for the mainview"""
+
+    def setUp(self):
+        super(MainViewTestCase, self).setUp()
+
+    def test_click_button(self):
+        # Find and click the button
+        button = self.app.main_view.get_button()
+        self.app.pointing_device.click_object(button)
+
+        # Make an assertion about what should happen
+        label = self.app.main_view.get_label()
+        self.assertThat(label.text, Eventually(Equals('..world!')))
 \ No newline at end of file
 
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/run	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/autopilot/run	2015-05-26 21:42:21 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
+  exit
+fi
+
+SCRIPTPATH=`dirname $0`
+pushd ${SCRIPTPATH}
+autopilot3 run %ProjectName%
+popd
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/unit'
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/unit/tst_main.qml'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/unit/tst_main.qml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/tests/unit/tst_main.qml	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import "../../"
+// See more details at https://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Test.UbuntuTestCase
+
+// Execute these tests with:
+//   qmltestrunner
+
+Item {
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    // The objects
+    Main {
+        id: main
+    }
+
+    UbuntuTestCase {
+        name: "MainTestCase"
+
+        when: windowShown
+
+
+        function init() {
+            var label = findChild(main, "label");
+            // See the compare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#compare-method
+            compare("Hello..", label.text);
+        }
+
+        function test_clickButtonMustChangeLabel() {
+            var button = findChild(main, "button");
+            var buttonCenter = centerOf(button)
+            mouseClick(button, buttonCenter.x, buttonCenter.y);
+            var label = findChild(main, "label");
+            // See the tryCompare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#tryCompare-method
+            tryCompare(label, "text", "..world!", 1);
+        }
+    }
+}
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro	2015-01-15 12:51:26 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/projectName.pro	2015-05-26 21:42:21 +0000
@@ -28,4 +28,12 @@
 # compiled and installed into the right place in the click package
 UBUNTU_PO_FILES+=$$files(po/*.po)
 
-
+aptest.target   = autopilot
+aptest.commands = bash $$PWD/app/tests/autopilot/run
+aptest.depends  = sub-app
+
+unittest.target   = check
+unittest.commands = /usr/bin/qmltestrunner -input $$PWD/app/tests/unit 
+unittest.depends  = sub-app
+
+QMAKE_EXTRA_TARGETS += aptest unittest
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml	2015-02-04 17:42:14 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/wizard.xml	2015-05-26 21:42:21 +0000
@@ -1,58 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wizard version="1" kind="project" firstpage="10" id="A3_UbuntuAppSimpleQmake'" category="A.UbuntuProject"
-        platformIndependent="true" 
+        platformIndependent="true"
         class="ubuntu-project-qmake"
-				featuresRequired=""
+                featuresRequired=""
         >
     <icon>../share/ubuntu.png</icon>
-    <description>Creates a Qt Quick 2 application project with a sample UI containing a Label and a Button. This project contains QML code only.
+    <description>Creates a Qt Quick 2 application project with a sample UI containing a Label and a Button. Also includes unit and functional tests. This project contains QML code only.
 
 This templates requires a Kit using at least a 15.04 click chroot.
 </description>
     <displayname>QML App with Simple UI (qmake)</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
-     	<file source="projectName.pro" 	         target="%ProjectName%.pro" openproject="true"/>
+        <file source="projectName.pro"           target="%ProjectName%.pro" openproject="true"/>
 <!-- MANIFEST PARTS -->
-			<file source="manifest.json.in" openeditor="true"/>
+            <file source="manifest.json.in" openeditor="true"/>
 <!-- APP PARTS -->
-			<file source="appName/appName.pro"   		 target="%ClickHookName%/%ClickHookName%.pro" openeditor="false"/>
-			<file source="appName/appName.png"   		 target="%ClickHookName%/%ClickHookName%.png" openeditor="false" binary="true"/>
-			<file source="appName/Main.qml"          target="%ClickHookName%/Main.qml" openeditor="true"/>
-			<file source="appName/appName.desktop"   target="%ClickHookName%/%ClickHookName%.desktop"  openeditor="false"/>
-      <file source="appName/appName.apparmor"  target="%ClickHookName%/%ClickHookName%.apparmor" openeditor="false"/>
+            <file source="appName/appName.pro"           target="%ClickHookName%/%ClickHookName%.pro" openeditor="false"/>
+            <file source="appName/appName.png"           target="%ClickHookName%/%ClickHookName%.png" openeditor="false" binary="true"/>
+            <file source="appName/Main.qml"          target="%ClickHookName%/Main.qml" openeditor="true"/>
+            <file source="appName/appName.desktop"   target="%ClickHookName%/%ClickHookName%.desktop"  openeditor="false"/>
+            <file source="appName/appName.apparmor"  target="%ClickHookName%/%ClickHookName%.apparmor" openeditor="false"/>
+            <file source="appName/tests/autopilot/run"                            target="%ClickHookName%/tests/autopilot/run"                              openeditor="false"/>
+            <file source="appName/tests/autopilot/displayName/tests/test_main.py" target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/test_main.py" openeditor="false"/>
+            <file source="appName/tests/autopilot/displayName/__init__.py"        target="%ClickHookName%/tests/autopilot/%ProjectName%/__init__.py"        openeditor="false"/>
+            <file source="appName/tests/autopilot/displayName/tests/__init__.py"  target="%ClickHookName%/tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
+            <file source="appName/tests/unit/tst_main.qml"                        target="%ClickHookName%/tests/unit/tst_main.qml"                           openeditor="false"/>
    </files>
 
-	  <!-- Create a 2nd wizard page with click package parameters -->
-		<fieldpagetitle>Click package parameters</fieldpagetitle>
-		<fields>
-			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-			                defaulttext="" placeholdertext="Nickname"/>
-			  <fielddescription>Nickname:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickMaintainer">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="" placeholdertext="Maintainer"/>
-			  <fielddescription>Maintainer:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="app" placeholdertext="app hook name"/>
-			  <fielddescription>App name:</fielddescription>
-			</field>
-		  <field name="ClickFrameworkVersion">
-		      <fieldcontrol class="QComboBox" defaultindex="0">
-		          <comboentries>
-								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-								<comboentry value="ubuntu-sdk-dummy-framework">
-		                <comboentrytext>Dummy Framework</comboentrytext>
-		            </comboentry>
-		          </comboentries>
-		      </fieldcontrol>
-		      <fielddescription>Framework:</fielddescription>
-		  </field>
-		</fields>
+      <!-- Create a 2nd wizard page with click package parameters -->
+        <fieldpagetitle>Click package parameters</fieldpagetitle>
+        <fields>
+            <field mandatory="true" name="ClickDomain">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+                            defaulttext="" placeholdertext="Nickname"/>
+              <fielddescription>Nickname:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickMaintainer">
+              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+                            defaulttext="" placeholdertext="Maintainer"/>
+              <fielddescription>Maintainer:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickHookName">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+                            defaulttext="app" placeholdertext="app hook name"/>
+              <fielddescription>App name:</fielddescription>
+            </field>
+          <field name="ClickFrameworkVersion">
+              <fieldcontrol class="QComboBox" defaultindex="0">
+                  <comboentries>
+                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+                                <comboentry value="ubuntu-sdk-dummy-framework">
+                        <comboentrytext>Dummy Framework</comboentrytext>
+                    </comboentry>
+                  </comboentries>
+              </fieldcontrol>
+              <fielddescription>Framework:</fielddescription>
+          </field>
+        </fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/__init__.py	2015-02-04 17:44:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/__init__.py	2015-05-26 21:42:21 +0000
@@ -1,76 +1,41 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Ubuntu Touch App Autopilot tests."""
-
-import os
-
+"""Application autopilot helpers."""
+
+import logging
 import ubuntuuitoolkit
 
-from autopilot import introspection
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
-from ubuntuuitoolkit import base
-
-
-PACKAGE_ID = '%ProjectName:l%.%ClickDomain:l%'
-
-
-def get_path_to_source_root():
-    return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__), '..', '..', '..', '..'))
-
-
-class ApplicationCustomProxyObject(
-        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-
-    """Autopilot custom proxy object for the app."""
-
-    @classmethod
-    def validate_dbus_object(cls, path, state):
-        application_name = PACKAGE_ID
-        name = introspection.get_classname_from_path(path)
-        if str(name) == application_name:
-            if state['applicationName'][1] == application_name:
-                return True
-        return False
+logger = logging.getLogger(__name__)
+
+
+class AppException(ubuntuuitoolkit.ToolkitException):
+
+    """Exception raised when there are problems with the Application."""
+
+
+class TouchApp(object):
+
+    """Autopilot helper object for the application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(MainView)
 
     @property
-    def main_view(self):
-        return self.select_single(ubuntuuitoolkit.MainView)
-
-
-class ClickAppTestCase(base.UbuntuUIToolkitAppTestCase):
-
-    """Common test case that provides several useful methods for the tests."""
-
-    project_name = '%ProjectName%'
-
-    def launch_application(self):
-        app_qml_source_location = self._get_app_qml_source_path()
-        if os.path.exists(app_qml_source_location):
-            app = self._launch_application_from_source(
-                app_qml_source_location)
-        else:
-            app = self._launch_installed_application()
-
-        self.assertThat(app.main_view.visible, Eventually(Equals(True)))
-        return app
-
-    def _get_app_qml_source_path(self):
-        qml_file_name = 'Main.qml'
-        return os.path.join(self._get_path_to_project_source(), qml_file_name)
-
-    def _get_path_to_project_source(self):
-        return os.path.join(get_path_to_source_root(), self.project_name)
-
-    def _launch_application_from_source(self, app_qml_source_location):
-        return self.launch_test_application(
-            base.get_qmlscene_launch_command(),
-            app_qml_source_location,
-            app_type='qt',
-            emulator_base=ApplicationCustomProxyObject)
-
-    def _launch_installed_application(self):
-        return self.launch_click_package(
-            PACKAGE_ID, emulator_base=ApplicationCustomProxyObject)
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """A helper that makes it easy to interact with the mainview"""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True, 30)
+
+    def get_button(self):
+        return self.select_single('Button', objectName="button")
+
+    def get_label(self):
+        return self.select_single('Label', objectName="label")
 \ No newline at end of file
 
=== removed file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/test_main.py	2015-02-04 17:44:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/test_main.py	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Tests for the Hello World"""
-
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
-
-import %ProjectName%
-
-
-class MainViewTestCase(%ProjectName%.ClickAppTestCase):
-    """Generic tests for the Hello World"""
-
-    def test_initial_label(self):
-        app = self.launch_application()
-        label = app.main_view.select_single(objectName='label')
-        self.assertThat(label.text, Equals('Hello..'))
-
-    def test_click_button_should_update_label(self):
-        app = self.launch_application()
-        button = app.main_view.select_single(objectName='button')
-        app.pointing_device.click_object(button)
-        label = app.main_view.select_single(objectName='label')
-        self.assertThat(label.text, Eventually(Equals('..world!')))
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/tests'
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/tests/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/tests/__init__.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,54 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Ubuntu Touch App Autopilot tests."""
+
+import os
+import logging
+
+import %ProjectName%
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot import logging as autopilot_logging
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
+
+class BaseTestCase(AutopilotTestCase):
+
+    """A common test case class
+
+    """
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location, 'Main.qml')
+    click_package = '{0}.{1}'.format('%ProjectName%', '%ClickDomain%')
+
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+        self.app = %ProjectName%.TouchApp(self.launcher(), self.test_type)
+
+    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
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        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(
+            self.click_package,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 \ No newline at end of file
 
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/tests/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/tests/test_main.py	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/displayName/tests/test_main.py	2015-05-26 21:42:21 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from %ProjectName% import tests
+
+
+class MainViewTestCase(tests.BaseTestCase):
+    """Tests for the mainview"""
+
+    def setUp(self):
+        super(MainViewTestCase, self).setUp()
+
+    def test_click_button(self):
+        # Find and click the button
+        button = self.app.main_view.get_button()
+        self.app.pointing_device.click_object(button)
+
+        # Make an assertion about what should happen
+        label = self.app.main_view.get_label()
+        self.assertThat(label.text, Eventually(Equals('..world!')))
 \ No newline at end of file
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/run	2015-02-04 17:44:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/tests/autopilot/run	2015-05-26 21:42:21 +0000
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
   exit
 fi
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
 autopilot3 run %ProjectName%
-popd
+popd
 \ No newline at end of file
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml	2015-02-04 17:42:14 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/wizard.xml	2015-05-26 21:42:21 +0000
@@ -1,61 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wizard version="1" kind="project" firstpage="10" id="A1_UbuntuAppSimple'" category="A.UbuntuProject"
-        platformIndependent="true" 
+        platformIndependent="true"
         class="ubuntu-project-plain-qml"
-				featuresRequired=""
+                featuresRequired=""
         >
     <icon>../share/ubuntu.png</icon>
-    <description>Creates a Qt Quick 2 application project with a sample UI containing a Label and a Button. This project contains QML code only.
-
-Includes also unit and functional tests.
+    <description>Creates a Qt Quick 2 application project with a sample UI containing a Label and a Button. Also includes unit and functional tests. This project contains QML code only.
 </description>
     <displayname>QML App with Simple UI (qmlproject)</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
-			<file source="../share/manifest.json"   						target="manifest.json" openeditor="true"/>
-	         	<file source="../share/displayName.qmlproject" 				target="%ProjectName%.qmlproject" openproject="true"/>
-			<file source="Main.qml"   										target="Main.qml" openeditor="true"/>
-			<file source="displayName.png"   							target="%ProjectName%.png" openeditor="false" binary="true"/>
-			<file source="displayName.desktop"   					target="%ClickHookName%.desktop" openeditor="false"/>
-			<file source="tests/autopilot/displayName/test_main.py"   target="tests/autopilot/%ProjectName%/test_main.py" openeditor="false"/>
-			<file source="tests/autopilot/displayName/__init__.py"   	target="tests/autopilot/%ProjectName%/__init__.py" openeditor="false"/>
-			<file source="tests/autopilot/run"  										  target="tests/autopilot/run" openeditor="false"/>
-			<file source="tests/qml/tst_main.qml" target="tests/qml/tst_main.qml" openeditor="false"/>
-			<file source="Makefile"   																target="Makefile" openeditor="false"/>
-                        <file source="../share/displayName.apparmor"                     target="%ClickHookName%.apparmor" openeditor="false"/>
-                        <file source="../share/.excludes"                     target=".excludes" openeditor="false"/>
+            <file source="../share/manifest.json"                           target="manifest.json" openeditor="true"/>
+            <file source="../share/displayName.qmlproject"              target="%ProjectName%.qmlproject" openproject="true"/>
+            <file source="Main.qml"                                         target="Main.qml" openeditor="true"/>
+            <file source="displayName.png"                              target="%ProjectName%.png" openeditor="false" binary="true"/>
+            <file source="displayName.desktop"                      target="%ClickHookName%.desktop" openeditor="false"/>
+            <file source="tests/autopilot/run"                            target="tests/autopilot/run"                              openeditor="false"/>
+            <file source="tests/autopilot/displayName/tests/test_main.py" target="tests/autopilot/%ProjectName%/tests/test_main.py" openeditor="false"/>
+            <file source="tests/autopilot/displayName/__init__.py"        target="tests/autopilot/%ProjectName%/__init__.py"        openeditor="false"/>
+            <file source="tests/autopilot/displayName/tests/__init__.py"  target="tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
+            <file source="tests/qml/tst_main.qml"                         target="tests/qml/tst_main.qml"                               openeditor="false"/>
+            <file source="Makefile"                                                                 target="Makefile" openeditor="false"/>
+            <file source="../share/displayName.apparmor"                     target="%ClickHookName%.apparmor" openeditor="false"/>
+            <file source="../share/.excludes"                     target=".excludes" openeditor="false"/>
    </files>
 
-	  <!-- Create a 2nd wizard page with click package parameters -->
-		<fieldpagetitle>Click package parameters</fieldpagetitle>
-		<fields>
-			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-			                defaulttext="" placeholdertext="Nickname"/>
-			  <fielddescription>Nickname:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickMaintainer">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="" placeholdertext="Maintainer"/>
-			  <fielddescription>Maintainer:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="app" placeholdertext="app hook name"/>
-			  <fielddescription>App name:</fielddescription>
-			</field>
-		  <field name="ClickFrameworkVersion">
-		      <fieldcontrol class="QComboBox" defaultindex="0">
-		          <comboentries>
-								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-								<comboentry value="ubuntu-sdk-dummy-framework">
-		                <comboentrytext>Dummy Framework</comboentrytext>
-		            </comboentry>
-		          </comboentries>
-		      </fieldcontrol>
-		      <fielddescription>Framework:</fielddescription>
-		  </field>
-		</fields>
+      <!-- Create a 2nd wizard page with click package parameters -->
+        <fieldpagetitle>Click package parameters</fieldpagetitle>
+        <fields>
+            <field mandatory="true" name="ClickDomain">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+                            defaulttext="" placeholdertext="Nickname"/>
+              <fielddescription>Nickname:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickMaintainer">
+              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+                            defaulttext="" placeholdertext="Maintainer"/>
+              <fielddescription>Maintainer:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickHookName">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+                            defaulttext="app" placeholdertext="app hook name"/>
+              <fielddescription>App name:</fielddescription>
+            </field>
+          <field name="ClickFrameworkVersion">
+              <fieldcontrol class="QComboBox" defaultindex="0">
+                  <comboentries>
+                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+                                <comboentry value="ubuntu-sdk-dummy-framework">
+                        <comboentrytext>Dummy Framework</comboentrytext>
+                    </comboentry>
+                  </comboentries>
+              </fieldcontrol>
+              <fielddescription>Framework:</fielddescription>
+          </field>
+        </fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/CMakeLists.txt'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/CMakeLists.txt	2015-01-16 11:11:30 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/CMakeLists.txt	2015-05-26 21:42:21 +0000
@@ -15,3 +15,7 @@
 # Make the autpilot files visible in qtcreator
 file(GLOB_RECURSE AUTOPILOT_TEST_FILES *.py)
 add_custom_target(%ProjectName:l%_AutopilotFiles ALL SOURCES ${AUTOPILOT_TEST_FILES})
+
+# Make the qml test files visible in qtcreator
+file(GLOB_RECURSE UNIT_TEST_FILES tests/unit/*.qml)
+add_custom_target(%ProjectName:l%_UnitTestFiles ALL SOURCES ${UNIT_TEST_FILES})
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/__init__.py	2014-10-14 08:33:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/__init__.py	2015-05-26 21:42:21 +0000
@@ -1,132 +1,41 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-"""Ubuntu Touch App autopilot tests."""
-
-from os import remove
-import os.path
-from tempfile import mktemp
-import subprocess
-
-from autopilot.input import Mouse, Touch, Pointer
-from autopilot.matchers import Eventually
-from autopilot.platform import model
-from testtools.matchers import Is, Not, Equals
-from autopilot.testcase import AutopilotTestCase
-
-def get_module_include_path():
-    return os.path.abspath(
-        os.path.join(
-            os.path.dirname(__file__),
-            '..',
-            '..',
-            '..',
-            '..',
-            'backend',
-            'modules')
-        )
-
-
-class UbuntuTouchAppTestCase(AutopilotTestCase):
-    """A common test case class that provides several useful methods for the tests."""
-
-    if model() == 'Desktop':
-        scenarios = [
-        ('with mouse', dict(input_device_class=Mouse))
-        ]
-    else:
-        scenarios = [
-        ('with touch', dict(input_device_class=Touch))
-        ]
+"""Application autopilot helpers."""
+
+import logging
+import ubuntuuitoolkit
+
+logger = logging.getLogger(__name__)
+
+
+class AppException(ubuntuuitoolkit.ToolkitException):
+
+    """Exception raised when there are problems with the Application."""
+
+
+class TouchApp(object):
+
+    """Autopilot helper object for the application."""
+
+    def __init__(self, app_proxy, test_type):
+        self.app = app_proxy
+        self.test_type = test_type
+        self.main_view = self.app.select_single(MainView)
 
     @property
-    def main_window(self):
-        return MainWindow(self.app)
-
-
-    def setUp(self):
-        self.pointing_device = Pointer(self.input_device_class.create())
-        super(UbuntuTouchAppTestCase, self).setUp()
-        self.launch_test_qml()
-
-
-    def launch_test_qml(self):
-        # If the test class has defined a 'test_qml' class attribute then we
-        # write it to disk and launch it inside the QML Scene. If not, then we
-        # silently do nothing (presumably the test has something else planned).
-        arch = subprocess.check_output(["dpkg-architecture",
-        "-qDEB_HOST_MULTIARCH"]).strip()
-        if hasattr(self, 'test_qml') and isinstance(self.test_qml, basestring):
-            qml_path = mktemp(suffix='.qml')
-            open(qml_path, 'w').write(self.test_qml)
-            self.addCleanup(remove, qml_path)
-
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        if hasattr(self, 'test_qml_file') and isinstance(self.test_qml_file, basestring):
-            qml_path = self.test_qml_file
-            self.app = self.launch_test_application(
-                "/usr/lib/" + arch + "/qt5/bin/qmlscene",
-                "-I", get_module_include_path(),
-                qml_path,
-                app_type='qt')
-
-        self.assertThat(self.get_qml_view().visible, Eventually(Equals(True)))
-
-
-    def get_qml_view(self):
-        """Get the main QML view"""
-
-        return self.app.select_single("QQuickView")
-
-    def get_mainview(self):
-        """Get the QML MainView"""
-
-        mainView = self.app.select_single("MainView")
-        self.assertThat(mainView, Not(Is(None)))
-        return mainView
-
-
-    def get_object(self,objectName):
-        """Get a object based on the objectName"""
-
-        obj = self.app.select_single(objectName=objectName)
-        self.assertThat(obj, Not(Is(None)))
-        return obj
-
-
-    def mouse_click(self,objectName):
-        """Move mouse on top of the object and click on it"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.click()
-
-
-    def mouse_press(self,objectName):
-        """Move mouse on top of the object and press mouse button (without releasing it)"""
-
-        obj = self.get_object(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-
-    def mouse_release(self):
-        """Release mouse button"""
-
-        self.pointing_device.release()     
-
-
-    def type_string(self, string):
-        """Type a string with keyboard"""
-
-        self.keyboard.type(string)
-
-
-    def type_key(self, key):
-        """Type a single key with keyboard"""
-
-        self.keyboard.key(key)
+    def pointing_device(self):
+        return self.app.pointing_device
+
+
+class MainView(ubuntuuitoolkit.MainView):
+
+    """A helper that makes it easy to interact with the mainview"""
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.visible.wait_for(True, 30)
+
+    def get_button(self):
+        return self.select_single('Button', objectName="button")
+
+    def get_label(self):
+        return self.select_single('Label', objectName="label")
 \ No newline at end of file
 
=== renamed directory 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main' => 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/tests'
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/tests/__init__.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main/__init__.py	2015-01-17 04:53:32 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/tests/__init__.py	2015-05-26 21:42:21 +0000
@@ -1,1 +1,54 @@
-""" A Main.qml test suite """
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+"""Ubuntu Touch App Autopilot tests."""
+
+import os
+import logging
+
+import %ProjectName%
+
+from autopilot.testcase import AutopilotTestCase
+from autopilot import logging as autopilot_logging
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import base
+
+logger = logging.getLogger(__name__)
+
+
+class BaseTestCase(AutopilotTestCase):
+
+    """A common test case class
+
+    """
+
+    local_location = os.path.dirname(os.path.dirname(os.getcwd()))
+    local_location_qml = os.path.join(local_location, 'Main.qml')
+    click_package = '{0}.{1}'.format('%ProjectName%', '%ClickDomain%')
+
+    def setUp(self):
+        super(BaseTestCase, self).setUp()
+        self.launcher, self.test_type = self.get_launcher_and_type()
+        self.app = %ProjectName%.TouchApp(self.launcher(), self.test_type)
+
+    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
+
+    @autopilot_logging.log_action(logger.info)
+    def launch_test_local(self):
+        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(
+            self.click_package,
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase)
 \ No newline at end of file
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/tests/test_main.py'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main/test_main.py	2015-05-06 08:49:21 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/tests/test_main.py	2015-05-26 21:42:21 +0000
@@ -1,23 +1,21 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 
-"""Tests for the Hello World"""
-
 from autopilot.matchers import Eventually
-from textwrap import dedent
-from testtools.matchers import Is, Not, Equals
-from testtools import skip
-import os
-from %ProjectName% import UbuntuTouchAppTestCase
-
-
-class MainTests(UbuntuTouchAppTestCase):
-    """Generic tests for the Hello World"""
-
-    test_qml_file = "%s/%s/Main.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../..")
-
-    def test_0_can_select_mainView(self):
-        """Must be able to select the mainview."""
-
-        mainView = self.get_mainview()
-        self.assertThat(mainView.visible,Eventually(Equals(True)))
-
+from testtools.matchers import Equals
+from %ProjectName% import tests
+
+
+class MainViewTestCase(tests.BaseTestCase):
+    """Tests for the mainview"""
+
+    def setUp(self):
+        super(MainViewTestCase, self).setUp()
+
+    def test_click_button(self):
+        # Find and click the button
+        button = self.app.main_view.get_button()
+        self.app.pointing_device.click_object(button)
+
+        # Make an assertion about what should happen
+        label = self.app.main_view.get_label()
+        self.assertThat(label.text, Eventually(Equals('..world!')))
 \ No newline at end of file
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/run'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/run	2014-10-14 08:33:49 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/run	2015-05-26 21:42:21 +0000
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-if [[ -z `which autopilot` ]]; then
-  echo "Autopilot is not installed. Skip"
+if [[ -z `which autopilot3` ]]; then
+  echo "python3-autopilot is not installed. Skip"
   exit
 fi
 
 SCRIPTPATH=`dirname $0`
 pushd ${SCRIPTPATH}
-autopilot run %ProjectName%
-popd
+autopilot3 run %ProjectName%
+popd
 \ No newline at end of file
 
=== added directory 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/unit'
=== added file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/unit/tst_main.qml'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/unit/tst_main.qml	1970-01-01 00:00:00 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/unit/tst_main.qml	2015-05-26 21:42:21 +0000
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import "../../"
+// See more details at https://developer.ubuntu.com/api/qml/sdk-14.10/Ubuntu.Test.UbuntuTestCase
+
+// Execute these tests with:
+//   qmltestrunner
+
+Item {
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    // The objects
+    Main {
+        id: main
+    }
+
+    UbuntuTestCase {
+        name: "MainTestCase"
+
+        when: windowShown
+
+
+        function init() {
+            var label = findChild(main, "label");
+            // See the compare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#compare-method
+            compare("Hello..", label.text);
+        }
+
+        function test_clickButtonMustChangeLabel() {
+            var button = findChild(main, "button");
+            var buttonCenter = centerOf(button)
+            mouseClick(button, buttonCenter.x, buttonCenter.y);
+            var label = findChild(main, "label");
+            // See the tryCompare method documentation at https://developer.ubuntu.com/api/qml/sdk-14.10/QtTest.TestCase/#tryCompare-method
+            tryCompare(label, "text", "..world!", 1);
+        }
+    }
+}
 
=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml'
--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml	2015-05-06 08:49:21 +0000
+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml	2015-05-26 21:42:21 +0000
@@ -1,63 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <wizard version="1" kind="project" firstpage="10" id="A2_UbuntuSimpleI18nQmlProject'" category="A.UbuntuProject"
-        platformIndependent="true" 
+        platformIndependent="true"
         class="ubuntu-project-cmake"
-				featuresRequired=""
+                featuresRequired=""
         >
     <icon>../share/ubuntu.png</icon>
-    <description>A simple QML app with localization support.
-
-Includes also
- - unit and functional tests for QML
+    <description>A simple QML app with localization support. Also includes unit and functional tests.
 </description>
     <displayname>QML App with Simple UI (cmake)</displayname>
     <displaycategory>Ubuntu</displaycategory>
     <files>
         <file source="CMakeLists.txt"                          target="CMakeLists.txt" openproject="true"/>
         <file source="app/graphics/[e-mail]"          target="app/graphics/[e-mail]" openeditor="false" binary="true"/>
-	<file source="app/displayName.desktop.in"              target="app/%ClickHookName%.desktop.in" openeditor="false"/>
+        <file source="app/displayName.desktop.in"              target="app/%ClickHookName%.desktop.in" openeditor="false"/>
         <file source="app/graphics/displayName.png"            target="app/graphics/%ProjectName%.png" openeditor="false" binary="true"/>
         <file source="app/CMakeLists.txt"                      target="app/CMakeLists.txt" openeditor="false"/>
-        <file source="app/tests/autopilot/run"                 target="app/tests/autopilot/run" openeditor="false"/>
-        <file source="app/tests/autopilot/displayName/main/test_main.py" target="app/tests/autopilot/%ProjectName%/main/test_main.py" openeditor="false"/>
-        <file source="app/tests/autopilot/displayName/__init__.py"       target="app/tests/autopilot/%ProjectName%/__init__.py" openeditor="false"/>
-        <file source="app/tests/autopilot/displayName/main/__init__.py"  target="app/tests/autopilot/%ProjectName%/main/__init__.py" openeditor="false"/>
-        <file source="manifest.json.in"   			               target="manifest.json.in" openeditor="true"/>
-        <file source="../share/displayName.apparmor"   			   target="%ClickHookName%.apparmor" openeditor="false"/>
+        <file source="app/tests/autopilot/run"                            target="app/tests/autopilot/run"                              openeditor="false"/>
+        <file source="app/tests/autopilot/displayName/tests/test_main.py" target="app/tests/autopilot/%ProjectName%/tests/test_main.py" openeditor="false"/>
+        <file source="app/tests/autopilot/displayName/__init__.py"        target="app/tests/autopilot/%ProjectName%/__init__.py"        openeditor="false"/>
+        <file source="app/tests/autopilot/displayName/tests/__init__.py"  target="app/tests/autopilot/%ProjectName%/tests/__init__.py"  openeditor="false"/>
+        <file source="app/tests/unit/tst_main.qml"                         target="app/tests/unit/tst_main.qml"                          openeditor="false"/>
+        <file source="manifest.json.in"                            target="manifest.json.in" openeditor="true"/>
+        <file source="../share/displayName.apparmor"               target="%ClickHookName%.apparmor" openeditor="false"/>
         <file source="app/Main.qml"                     target="app/Main.qml" openeditor="true"/>
         <file source="po/CMakeLists.txt"                       target="po/CMakeLists.txt"     openeditor="false"/>
    </files>
 
-	  <!-- Create a 2nd wizard page with click package parameters -->
-		<fieldpagetitle>Click package parameters</fieldpagetitle>
-		<fields>
-			<field mandatory="true" name="ClickDomain">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
-			                defaulttext="" placeholdertext="Nickname"/>
-			  <fielddescription>Nickname:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickMaintainer">
-			  <fieldcontrol class="QLineEdit" validator='^[^"]+$'
-			                defaulttext="" placeholdertext="Maintainer"/>
-			  <fielddescription>Maintainer:</fielddescription>
-			</field>
-			<field mandatory="true" name="ClickHookName">
-			  <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
-			                defaulttext="myapp" placeholdertext="app hook name"/>
-			  <fielddescription>App name:</fielddescription>
-			</field>
-		  <field name="ClickFrameworkVersion">
-		      <fieldcontrol class="QComboBox" defaultindex="0">
-		          <comboentries>
-								<!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
-								<comboentry value="ubuntu-sdk-dummy-framework">
-		                <comboentrytext>Dummy Framework</comboentrytext>
-		            </comboentry>
-		          </comboentries>
-		      </fieldcontrol>
-		      <fielddescription>Framework:</fielddescription>
-		  </field>
-		</fields>
+      <!-- Create a 2nd wizard page with click package parameters -->
+        <fieldpagetitle>Click package parameters</fieldpagetitle>
+        <fields>
+            <field mandatory="true" name="ClickDomain">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9-]+$'
+                            defaulttext="" placeholdertext="Nickname"/>
+              <fielddescription>Nickname:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickMaintainer">
+              <fieldcontrol class="QLineEdit" validator='^[^"]+$'
+                            defaulttext="" placeholdertext="Maintainer"/>
+              <fielddescription>Maintainer:</fielddescription>
+            </field>
+            <field mandatory="true" name="ClickHookName">
+              <fieldcontrol class="QLineEdit" validator='^[A-Za-z0-9.-]+$'
+                            defaulttext="myapp" placeholdertext="app hook name"/>
+              <fielddescription>App name:</fielddescription>
+            </field>
+          <field name="ClickFrameworkVersion">
+              <fieldcontrol class="QComboBox" defaultindex="0">
+                  <comboentries>
+                                <!-- Do not add any other frameworks here, they are populated at runtime, this is just a dummy framework to make sure we can find the combobox -->
+                                <comboentry value="ubuntu-sdk-dummy-framework">
+                        <comboentrytext>Dummy Framework</comboentrytext>
+                    </comboentry>
+                  </comboentries>
+              </fieldcontrol>
+              <fielddescription>Framework:</fielddescription>
+          </field>
+        </fields>
     <validationrules>
         <validationrule condition='/^(.*)\s+&lt;(.*@.*)&gt;$/.test("%ClickMaintainer%")'>
             <message>Invalid format for maintainer (should be like "Joe Bloggs &lt;[e-mail]&gt;")</message>