Merge lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers into lp:ubuntu-ui-toolkit

[Leo Arias]

Deprecated the ubuntuuitoolkit.emulators module from the autopilot helpers.

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1011. By Leo Arias on 2014-04-11

Renamed the custom proxy object tests.

1012. By Leo Arias on 2014-04-11

Renamed UbuntuUIToolkitException to ToolkitException as suggested by thomi.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1010
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2022/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4777/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/970/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/970/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4909/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2022/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1013. By Leo Arias on 2014-04-11

Added a test that checks that the deprecated symbols point to the new namespace.

1014. By Leo Arias on 2014-04-11

Added a test for the deprecation warning.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1013
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2024/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/202/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4779/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/972/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/972/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4360/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4911/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2024/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1015. By Leo Arias on 2014-04-11

Added a _custom_proxy_objects module.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1014
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2025/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4780/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/973/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/973/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4361/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4912/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2025/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1016. By Leo Arias on 2014-04-11

For now, make it a file.

1017. By Leo Arias on 2014-04-11

Added the missing init.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1017
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2026/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4781/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/974/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/974/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4362/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4913/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2026/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Makes sense. I presume we need to wait on having this altered in the Jenkins configuration since it'll always fail otherwise.

review: Approve

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1018. By Leo Arias on 2014-04-16

Split the big file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1018
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2032/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4910/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/980/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/980/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4491/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5058/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2032/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1019. By Leo Arias on 2014-04-16

Use __all__.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1019
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2033/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4911/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/981/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/981/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4493/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5060/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2033/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1020. By Leo Arias on 2014-04-17

Split the tests.

1021. By Leo Arias on 2014-04-17

Use __all__.

1022. By Leo Arias on 2014-04-17

Fixed flake8.

1023. By Leo Arias on 2014-04-17

Rename the rest of emulators.

1024. By Leo Arias on 2014-04-17

Merged with trunk.

1025. By Leo Arias on 2014-04-17

Merged with staging.

1026. By Leo Arias on 2014-04-17

Added the missing option selector files.

1027. By Leo Arias on 2014-04-17

Flake8 is now not prerequisite.

1028. By Leo Arias on 2014-04-17

Flake8 is now not prerequisite.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1024
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2034/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/301
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4916
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/982
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/982/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4497
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4497/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6147
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5066
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/5066/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2034/rebuild

review: Needs Fixing (continuous-integration)

[lp:~elopio/ubuntu-ui-toolkit/reorg_autopilot_helpers]

1029. By Leo Arias on 2014-04-17

Use a reload compatible with py3
.

1030. By Leo Arias on 2014-04-17

Expose the rest of the modules.

1031. By Leo Arias on 2014-04-17

Fixed the new circular dep.

1032. By Leo Arias on 2014-04-17

Fixed the new circular dep.

1033. By Leo Arias on 2014-04-17

Fixed the new circular dep.

1034. By Leo Arias on 2014-04-25

Merged with 30-optIn-tabsDrawer.

1035. By Leo Arias on 2014-04-25

Merged with 40-back-in-header.

1036. By Leo Arias on 2014-04-25

Reverted the change on the control.

1037. By Leo Arias on 2014-04-25

Reverted the change in debina/rules.

1038. By Leo Arias on 2014-04-25

Merged with staging.

1039. By Leo Arias on 2014-04-25

Merged with staging.

1040. By Leo Arias on 2014-04-25

Changed the namespace for listitems and popups.

1041. By Leo Arias on 2014-04-28

Merged with staging.

1042. By Leo Arias on 2014-04-28

Fixed the popups import.

Unmerged revisions

=== modified file 'components.api'
--- components.api	2014-04-01 12:57:27 +0000
+++ components.api	2014-04-17 01:29:24 +0000
@@ -593,6 +593,8 @@
     function findChild(obj,objectName)
     function findInvisibleChild(obj,objectName)
     function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
+    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay)
+    function mouseLongPress(item, x, y, button, modifiers, delay)
     function tryCompareFunction(func, expectedResult, timeout)
 plugins.qmltypes
     name: "InverseMouseAreaType"
@@ -687,27 +689,35 @@
     Signal {
     name: "pressed"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "released"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "clicked"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "pressAndHold"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "doubleClicked"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "positionChanged"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "entered"
     Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "exited"
     Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     name: "UCQQuickImageExtension"
     prototype: "QQuickImageBase"
     exports: ["QQuickImageBase 0.1"]

=== modified file 'debian/control'
--- debian/control	2014-04-17 01:29:24 +0000
+++ debian/control	2014-04-17 01:29:24 +0000
@@ -135,7 +135,11 @@
          python-autopilot (>= 1.4),
          python-fixtures,
          python-mock,
+         python-testscenarios,
+         python-testtools,
          python3-fixtures,
+         python3-testscenarios,
+         python3-testtools,
          python3-autopilot (>= 1.4),
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
 Description: Test package for Ubuntu UI Toolkit

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-02-21 20:02:29 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-04-17 01:29:24 +0000
@@ -21,6 +21,7 @@
 #include "alarmmanager_p.h"
 #include "alarmrequest_p.h"
 #include "alarmsadapter_p.h"
+#include <qorganizertodooccurrence.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QDir>
@@ -55,11 +56,15 @@
     , manager(0)
     , fetchRequest(0)
 {
-    QOrganizerManager local;
-    bool usingDefaultManager = local.availableManagers().contains(ALARM_MANAGER);
-    manager = (usingDefaultManager) ? new QOrganizerManager(ALARM_MANAGER) : new QOrganizerManager(ALARM_MANAGER_FALLBACK);
+    QString envManager(qgetenv("ALARM_BACKEND"));
+    if (!envManager.isEmpty() && QOrganizerManager::availableManagers().contains(envManager)) {
+        manager = new QOrganizerManager(envManager);
+    } else {
+        manager = QOrganizerManager::availableManagers().contains(ALARM_MANAGER) ?
+                    new QOrganizerManager(ALARM_MANAGER) : new QOrganizerManager(ALARM_MANAGER_FALLBACK);
+    }
     manager->setParent(q_ptr);
-    if (!usingDefaultManager) {
+    if (manager->managerName() != ALARM_MANAGER) {
         qWarning() << "WARNING: default alarm manager not installed, using" << manager->managerName() << "manager.";
         qWarning() << "This manager may not provide all the needed features.";
     }
@@ -114,6 +119,7 @@
 
         int type, days;
         in >> alarm.message >> alarm.date >> alarm.sound >> type >> days >> alarm.enabled;
+        alarm.originalDate = alarm.date = AlarmData::transcodeDate(alarm.date, Qt::LocalTime);
         alarm.type = static_cast<UCAlarm::AlarmType>(type);
         alarm.days = static_cast<UCAlarm::DaysOfWeek>(days);
 
@@ -142,7 +148,7 @@
 
     Q_FOREACH(const AlarmData &alarm, alarmList) {
         out << alarm.message
-            << alarm.date
+            << AlarmData::transcodeDate(alarm.originalDate, Qt::UTC)
             << alarm.sound
             << alarm.type
             << alarm.days
@@ -156,8 +162,7 @@
 {
     event.setCollectionId(collection.id());
     event.setAllDay(false);
-    event.setStartDateTime(alarm.date);
-    event.setDueDateTime(alarm.date);
+    event.setStartDateTime(AlarmData::transcodeDate(alarm.date, Qt::UTC));
     event.setDisplayLabel(alarm.message);
 
     if (alarm.enabled) {
@@ -224,8 +229,9 @@
 
     alarm.cookie = QVariant::fromValue<QOrganizerItemId>(event.id());
     alarm.message = event.displayLabel();
-    alarm.date = AlarmData::normalizeDate(event.dueDateTime());
+    alarm.date = AlarmData::transcodeDate(event.startDateTime().toUTC(), Qt::LocalTime);
     alarm.sound = QUrl(event.description());
+    alarm.originalDate = alarm.date;
 
     // check if the alarm is enabled or not
     QOrganizerItemVisualReminder visual = event.detail(QOrganizerItemDetail::TypeVisualReminder);
@@ -303,8 +309,8 @@
     Q_FOREACH(const QOrganizerItem &item, alarms) {
         // repeating alarms may be fetched as occurences, therefore check their parent event
         if (item.type() == QOrganizerItemType::TypeTodoOccurrence) {
-            QOrganizerTodoOccurrence occurence = static_cast<QOrganizerTodoOccurrence>(item);
-            QOrganizerItemId eventId = occurence.parentId();
+            QOrganizerTodoOccurrence occurrence = static_cast<QOrganizerTodoOccurrence>(item);
+            QOrganizerItemId eventId = occurrence.parentId();
             if (parentId.contains(eventId)) {
                 continue;
             }
@@ -317,6 +323,7 @@
         }
         AlarmData alarm;
         if (alarmDataFromOrganizerEvent(event, alarm) == UCAlarm::NoError) {
+            adjustAlarmOccurrence(event, alarm);
             alarmList << alarm;
         }
     }
@@ -324,9 +331,52 @@
     saveAlarms();
     Q_EMIT q_ptr->alarmsChanged();
     completed = true;
+    fetchRequest->deleteLater();
     fetchRequest = 0;
 }
 
+void AlarmsAdapter::adjustAlarmOccurrence(const QOrganizerTodo &event, AlarmData &alarm)
+{
+    if (alarm.type == UCAlarm::OneTime) {
+        return;
+    }
+    // with EDS we need to query the occurrences separately as the fetch reports only the main events
+    // with fallback manager this does not reduce the performance and does work the same way.
+    QDateTime currentDate = AlarmData::normalizeDate(QDateTime::currentDateTime());
+    if (alarm.date > currentDate) {
+        // no need to adjust date, the event occurs in the future
+        return;
+    }
+    QDateTime startDate;
+    QDateTime endDate;
+    if (alarm.type == UCAlarm::Repeating) {
+        // 8 days is enough from the starting date (or current date depending on the start date)
+        startDate = (alarm.date > currentDate) ? alarm.date : currentDate;
+        endDate = startDate.addDays(8);
+    }
+
+    // transcode both dates
+    startDate = AlarmData::transcodeDate(startDate, Qt::UTC);
+    endDate = AlarmData::transcodeDate(endDate, Qt::UTC);
+
+    QList<QOrganizerItem> occurrences = manager->itemOccurrences(event, startDate, endDate, 10);
+    // get the first occurrence and use the date from it
+    if ((occurrences.length() > 0) && (occurrences[0].type() == QOrganizerItemType::TypeTodoOccurrence)) {
+        // loop till we get a proper future due date
+        for (int i = 0; i < occurrences.count(); i++) {
+            QOrganizerTodoOccurrence occurrence = static_cast<QOrganizerTodoOccurrence>(occurrences[i]);
+            // check if the date is after the current datetime
+            // the first occurrence is the one closest to the currentDate, therefore we can safely
+            // set that startDate to the alarm
+            alarm.date = AlarmData::transcodeDate(occurrence.startDateTime().toUTC(), Qt::LocalTime);
+            if (alarm.date > currentDate) {
+                // we have the proper date set, leave
+                break;
+            }
+        }
+    }
+}
+
 /*-----------------------------------------------------------------------------
  * AlarmRequestAdapter implementation
  */
@@ -410,23 +460,10 @@
     QOrganizerItemFetchRequest *operation = new QOrganizerItemFetchRequest(q_ptr);
     operation->setManager(owner->manager);
 
-    // FIXME: Since returning all events without a limit of date is not a good solution we need to find
-    // a better solution for that.
-    // The current solution filters only the next 7 days (one week).
-    // This will be enough for now, since the current alarms occur weekly, but for the future
-    // we want to allow create alarms with monthly or yearly recurrence
-    QDate currentDate = QDate::currentDate();
-    QDateTime startDate(currentDate,
-                        QTime(0,0,0));
-    QDateTime endDate(currentDate.addDays(7),
-                      QTime(23,59,59));
-    operation->setStartDate(startDate);
-    operation->setEndDate(endDate);
-
     // set sort order
     QOrganizerItemSortOrder sortOrder;
     sortOrder.setDirection(Qt::AscendingOrder);
-    sortOrder.setDetail(QOrganizerItemDetail::TypeTodoTime, QOrganizerTodoTime::FieldDueDateTime);
+    sortOrder.setDetail(QOrganizerItemDetail::TypeTodoTime, QOrganizerTodoTime::FieldStartDateTime);
     operation->setSorting(QList<QOrganizerItemSortOrder>() << sortOrder);
 
     // set filter

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2013-09-18 10:13:04 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2014-04-17 01:29:24 +0000
@@ -24,6 +24,7 @@
 
 #include <qorganizer.h>
 #include <qorganizermanager.h>
+#include <qorganizertodo.h>
 
 QTORGANIZER_USE_NAMESPACE
 
@@ -78,6 +79,7 @@
     QOrganizerCollection collection;
 
     void completeFetchAlarms(const QList<QOrganizerItem> &alarmList);
+    void adjustAlarmOccurrence(const QOrganizerTodo &event, AlarmData &alarm);
 
     void loadAlarms();
     void saveAlarms();

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p.h'
--- modules/Ubuntu/Components/plugin/alarmmanager_p.h	2013-09-12 05:27:40 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p.h	2014-04-17 01:29:24 +0000
@@ -48,6 +48,7 @@
     AlarmData(const AlarmData &other)
         : changes(0)
         , cookie(other.cookie)
+        , originalDate(other.originalDate)
         , date(other.date)
         , message(other.message)
         , type(other.type)
@@ -100,10 +101,19 @@
         return QDateTime(dt.date(), time, dt.timeSpec());
     }
 
+    // the function normalizes and transcodes the date into UTC/LocalTime equivalent
+    static QDateTime transcodeDate(const QDateTime &dt, Qt::TimeSpec targetSpec) {
+        if (dt.timeSpec() == targetSpec) {
+            return normalizeDate(dt);
+        }
+        return QDateTime(dt.date(), normalizeDate(dt).time(), targetSpec);
+    }
+
     unsigned int changes;
     QVariant cookie;
 
     // data members
+    QDateTime originalDate;
     QDateTime date;
     QString message;
     QUrl sound;

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-03-05 12:29:58 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-04-17 01:29:24 +0000
@@ -53,9 +53,6 @@
 #include <unistd.h>
 #include <stdexcept>
 
-// Needed for unit tests
-Q_DECLARE_METATYPE(QList<QQmlError>)
-
 /*
  * Type registration functions.
  */
@@ -177,10 +174,11 @@
     qmlRegisterSingletonType<UCUriHandler>(uri, 0, 1, "UriHandler", registerUriHandler);
     qmlRegisterType<UCMouse>(uri, 0, 1, "Mouse");
     qmlRegisterType<UCInverseMouse>(uri, 0, 1, "InverseMouse");
-    // Needed for unit tests
-    qRegisterMetaType<QList <QQmlError> >();
     // register QML singletons
     qmlRegisterSingletonType<QObject>(uri, 0, 1, "PickerPanel", registerPickerPanel);
+
+    // register custom event
+    ForwardedEvent::registerForwardedEvent();
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2013-09-18 10:25:18 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-17 01:29:24 +0000
@@ -102,15 +102,21 @@
 
 int UCAlarmPrivate::nextDayOfWeek(UCAlarm::DaysOfWeek days, int fromDay)
 {
-    if (fromDay <= 0) {
+    if (fromDay <= 0 || fromDay >= Qt::Sunday) {
+        // start from the beginning of the week
         fromDay = Qt::Monday;
+    } else {
+        // start checking from the next day onwards
+        fromDay++;
     }
     for (int d = fromDay; d <= Qt::Sunday; d++) {
         if ((1 << (d - 1)) & days) {
             return d;
         }
     }
-    return 0;
+
+    // none found for the rest of the week, return the fist day set
+    return firstDayOfWeek(days);
 }
 
 // checks whether the given num has more than one bit set
@@ -147,23 +153,14 @@
     return UCAlarm::NoError;
 }
 
-UCAlarm::Error UCAlarmPrivate::checkDow()
+// adjust dayOfWeek
+UCAlarm::Error UCAlarmPrivate::adjustDow()
 {
     if (!rawData.days) {
         return UCAlarm::NoDaysOfWeek;
     } else if (rawData.days == UCAlarm::AutoDetect) {
         rawData.days = dayOfWeek(rawData.date);
         rawData.changes |= AlarmData::Days;
-    } else if (rawData.days != UCAlarm::Daily) {
-        int alarmDay = firstDayOfWeek(rawData.days);
-        int dayOfWeek = rawData.date.date().dayOfWeek();
-        if (alarmDay < dayOfWeek) {
-            rawData.date = rawData.date.addDays(7 - dayOfWeek + alarmDay);
-            rawData.changes |= AlarmData::Date;
-        } else if (alarmDay > dayOfWeek) {
-            rawData.date = rawData.date.addDays(alarmDay - dayOfWeek);
-            rawData.changes |= AlarmData::Date;
-        }
     }
     return UCAlarm::NoError;
 }
@@ -175,8 +172,7 @@
         return UCAlarm::OneTimeOnMoreDays;
     }
 
-    // adjust start date and/or dayOfWeek according to their values
-    UCAlarm::Error result = checkDow();
+    UCAlarm::Error result = adjustDow();
     if (result != UCAlarm::NoError) {
         return result;
     }
@@ -193,23 +189,25 @@
     // start date is adjusted depending on the days value;
     // start date can be set to be the current time, as scheduling will move
     // it to the first occurence.
-    UCAlarm::Error result = checkDow();
+    UCAlarm::Error result = adjustDow();
     if (result != UCAlarm::NoError) {
         return result;
     }
 
-    // move start time to the first occurence if needed
+    // move start time of the first occurence if needed
     int dayOfWeek = rawData.date.date().dayOfWeek();
     if (!isDaySet(dayOfWeek, rawData.days) || (rawData.date <= QDateTime::currentDateTime())) {
         // check the next occurence of the alarm
-        int nextOccurence = nextDayOfWeek(rawData.days, dayOfWeek);
-        if (nextOccurence <= 0) {
-             // the starting date should be moved to the next week
-            nextOccurence = firstDayOfWeek(rawData.days);
-            rawData.date.addDays(7 - dayOfWeek + nextOccurence);
+        int nextOccurrence = nextDayOfWeek(rawData.days, dayOfWeek);
+        if (nextOccurrence == dayOfWeek) {
+            // move the date to the same day next week
+            rawData.date = rawData.date.addDays(7);
+        } else if (nextOccurrence < dayOfWeek) {
+             // the starting date should be moved to the next week's occurrence
+            rawData.date = rawData.date.addDays(7 - dayOfWeek + nextOccurrence);
         } else {
             // the starting date is still this week
-            rawData.date.addDays(nextOccurence - dayOfWeek);
+            rawData.date = rawData.date.addDays(nextOccurrence - dayOfWeek);
         }
         rawData.changes |= AlarmData::Date;
     }
@@ -304,7 +302,7 @@
     : QObject(parent)
     , d_ptr(new UCAlarmPrivate(this))
 {
-    d_ptr->rawData.date = dt;
+    d_ptr->rawData.date = AlarmData::normalizeDate(dt);
     if (!message.isEmpty()) {
         d_ptr->rawData.message = message;
     }
@@ -315,7 +313,7 @@
     : QObject(parent)
     , d_ptr(new UCAlarmPrivate(this))
 {
-    d_ptr->rawData.date = dt;
+    d_ptr->rawData.date = AlarmData::normalizeDate(dt);
     d_ptr->rawData.type = Repeating;
     d_ptr->rawData.days = days;
     if (!message.isEmpty()) {
@@ -366,12 +364,16 @@
 void UCAlarm::setDate(const QDateTime &date)
 {
     Q_D(UCAlarm);
-    if (d->rawData.date == date) {
+    if (d->rawData.date == AlarmData::normalizeDate(date)) {
         return;
     }
-    d->rawData.date = date;
+    d->rawData.date = AlarmData::normalizeDate(date);
     d->rawData.changes |= AlarmData::Date;
     Q_EMIT dateChanged();
+    if (d->rawData.type == UCAlarm::OneTime) {
+        // adjust dayOfWeek as well
+        setDaysOfWeek(UCAlarm::AutoDetect);
+    }
 }
 
 /*!
@@ -520,6 +522,8 @@
     Q_EMIT soundChanged();
 }
 
+
+
 /*!
  * \qmlproperty Error Alarm::error
  * The property holds the error code occurred during the last performed operation.
@@ -670,6 +674,8 @@
     if (result != UCAlarm::NoError) {
         d->_q_syncStatus(Saving, Fail, result);
     } else {
+        // the alarm has been modified, therefore update the original date as well
+        d->rawData.originalDate = d->rawData.date;
         if (d->createRequest()) {
             d->request->save(d->rawData);
         }

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm_p.h'
--- modules/Ubuntu/Components/plugin/ucalarm_p.h	2013-09-18 10:25:18 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm_p.h	2014-04-17 01:29:24 +0000
@@ -50,7 +50,7 @@
     static int nextDayOfWeek(UCAlarm::DaysOfWeek days, int fromDay);
     static bool multipleDaysSet(UCAlarm::DaysOfWeek days);
     UCAlarm::Error checkAlarm();
-    UCAlarm::Error checkDow();
+    UCAlarm::Error adjustDow();
     UCAlarm::Error checkOneTime();
     UCAlarm::Error checkRepeatingWeekly();
 

=== modified file 'modules/Ubuntu/Components/plugin/ucmouse.h'
--- modules/Ubuntu/Components/plugin/ucmouse.h	2014-02-13 17:16:06 +0000
+++ modules/Ubuntu/Components/plugin/ucmouse.h	2014-04-17 01:29:24 +0000
@@ -20,10 +20,47 @@
 
 #include <QtCore/QObject>
 #include <QtQml>
+#include <QtQuick/QQuickItem>
 #include <private/qquickevents_p_p.h>
 #include <QtCore/qbasictimer.h>
 
-class QQuickItem;
+class ForwardedEvent : public QEvent {
+public:
+    enum EventType {
+        MousePress,
+        MouseRelease,
+        MouseMove,
+        MouseDblClick,
+        HoverEnter,
+        HoverExit,
+        MouseClick,
+        MouseLongPress,
+    };
+    ForwardedEvent(EventType type, QQuickItem *sender, QEvent *originalEvent, QQuickMouseEvent *quickEvent)
+        : QEvent((QEvent::Type)m_eventBase)
+        , m_subType(type)
+        , m_sender(sender)
+        , m_originalEvent(originalEvent)
+        , m_quickEvent(quickEvent)
+    {
+        setAccepted(false);
+    }
+
+    static void registerForwardedEvent();
+
+    EventType subType() const { return m_subType; }
+    QQuickItem *sender() const { return m_sender; }
+    QQuickMouseEvent *quickEvent() const { return m_quickEvent; }
+    QEvent *originalEvent() const { return m_originalEvent; }
+    static QEvent::Type baseType() { return m_eventBase; }
+private:
+    EventType m_subType;
+    QPointer<QQuickItem> m_sender;
+    QEvent *m_originalEvent;
+    QPointer<QQuickMouseEvent> m_quickEvent;
+    static QEvent::Type m_eventBase;
+};
+
 class UCMouse : public QObject
 {
     Q_OBJECT
@@ -62,23 +99,24 @@
     void clickAndHoldThresholdChanged();
     void priorityChanged();
 
-    void pressed(QQuickMouseEvent *mouse);
-    void released(QQuickMouseEvent *mouse);
-    void clicked(QQuickMouseEvent *mouse);
-    void pressAndHold(QQuickMouseEvent *mouse);
-    void doubleClicked(QQuickMouseEvent *mouse);
-    void positionChanged(QQuickMouseEvent *mouse);
-    void entered(QQuickMouseEvent *event);
-    void exited(QQuickMouseEvent *event);
+    void pressed(QQuickMouseEvent *mouse, QQuickItem *host);
+    void released(QQuickMouseEvent *mouse, QQuickItem *host);
+    void clicked(QQuickMouseEvent *mouse, QQuickItem *host);
+    void pressAndHold(QQuickMouseEvent *mouse, QQuickItem *host);
+    void doubleClicked(QQuickMouseEvent *mouse, QQuickItem *host);
+    void positionChanged(QQuickMouseEvent *mouse, QQuickItem *host);
+    void entered(QQuickMouseEvent *event, QQuickItem *host);
+    void exited(QQuickMouseEvent *event, QQuickItem *host);
 
 protected:
     virtual bool eventFilter(QObject *, QEvent *);
     virtual void timerEvent(QTimerEvent *event);
     virtual bool mouseEvents(QObject *target, QMouseEvent *event);
     virtual bool hoverEvents(QObject *target, QHoverEvent *event);
+    virtual bool forwardedEvents(ForwardedEvent *event);
     virtual bool hasAttachedFilter(QQuickItem *item);
 
-    void setHovered(bool hovered);
+    void setHovered(bool hovered, QEvent *hoverEvent);
     bool mousePressed(QMouseEvent *event);
     bool mouseReleased(QMouseEvent *event);
     bool mouseDblClick(QMouseEvent *event);
@@ -91,7 +129,7 @@
     bool isDoubleClickConnected();
     bool isMouseEvent(QEvent::Type type);
     bool isHoverEvent(QEvent::Type type);
-    void forwardEvent(QEvent *event);
+    bool forwardEvent(ForwardedEvent::EventType type, QEvent *event, QQuickMouseEvent *quickEvent);
 
 protected:
     QQuickItem *m_owner;
@@ -107,6 +145,7 @@
     Priority m_priority;
     int m_moveThreshold;
 
+    bool m_signalWhenContains:1;
     bool m_enabled: 1;
     bool m_moved:1;
     bool m_longPress:1;
@@ -115,4 +154,6 @@
 };
 QML_DECLARE_TYPEINFO(UCMouse, QML_HAS_ATTACHED_PROPERTIES)
 
+extern const int DefaultPressAndHoldDelay;
+
 #endif // UCMOUSE_H

=== modified file 'modules/Ubuntu/Components/plugin/ucmousefilters.cpp'
--- modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-02-13 17:16:06 +0000
+++ modules/Ubuntu/Components/plugin/ucmousefilters.cpp	2014-04-17 01:29:24 +0000
@@ -18,7 +18,6 @@
 #include "ucmouse.h"
 #include "ucinversemouse.h"
 #include <QtQml/QQmlInfo>
-#include <QtQuick/QQuickItem>
 #include <QtGui/QGuiApplication>
 #include <private/qqmlglobal_p.h>
 #include <QtQuick/private/qquickmousearea_p.h>
@@ -31,6 +30,15 @@
 // keep in sync with QQuickMouseArea PressAndHoldDelay
 const int DefaultPressAndHoldDelay = 800;
 
+QEvent::Type ForwardedEvent::m_eventBase = QEvent::None;
+void ForwardedEvent::registerForwardedEvent()
+{
+    if (m_eventBase > 0) {
+        return;
+    }
+    m_eventBase = (QEvent::Type)QEvent::registerEventType();
+}
+
 /*
  * Attached filter instantiator template
  */
@@ -158,7 +166,8 @@
    their parent. In this way mouse events will land in these items too, and mouse
    filter attached to those can also handle the event. This is useful when creating
    custom types where the mouse handling item is nested into a non-mouse handling
-   one, and we want to provide additional filtering possibility to the user.
+   one, and we want to provide additional filtering possibility to the user. These
+   type of items are called proxy handlers.
 
    \qml
    Item {
@@ -180,7 +189,54 @@
    In this example the mouse press is first handled by the mouse filter attached
    to TextInput, then it is forwarded to the top item and finally to the TextInput.
    Accepting the mouse event will stop propagation to the top item as well as to
-   the TextInput.
+   the TextInput. The topmost item itself does not handle mouse events, therefore
+   it will be a sinple proxy handler item. However, proxies can themself handle
+   mouse events. Therefore each mouse event signal has the \a host parameter specifying
+   the sender of the mouse event reported.
+
+   \note The forwarded events are handled in the proxy handlers only if the mouse
+   position points inside their area. If the forwarded mouse position falls outside
+   the target area, the event will not be reported, however will be forwarded further
+   to the items in the list. In the following example the mouse press in red rectangle
+   will be printed as well as the proxied mouse press from the main item.
+   \qml
+   import QtQuick 2.0
+   import Ubuntu.Components 0.1
+
+   Item {
+       id: main
+       width: units.gu(40)
+       height: units.gu(71)
+
+       Mouse.onPressed: console.log("got the mouse press forwarded by " + host.objectName)
+
+       Column {
+           anchors.fill: parent
+           spacing: units.gu(1)
+
+           Rectangle {
+               id: blueRect
+               objectName: "BlueRect"
+               width: parent.width
+               height: units.gu(20)
+               color: "blue"
+               Mouse.forwardTo: [main]
+               Mouse.onPressed: console.log("This should not be printed")
+           }
+           Rectangle {
+               objectName: "RedRect"
+               width: parent.width
+               height: units.gu(20)
+               color: "red"
+               MouseArea {
+                   anchors.fill: parent
+                   Mouse.forwardTo: [blueRect]
+                   Mouse.onPressed: console.log("Pressed in " + host.objectName)
+               }
+           }
+       }
+   }
+   \endqml
 
    An interesting feature that can be achieved using Mouse filter is the event
    "transparency" towards the MouseArea lying behind the items which handle mouse
@@ -226,6 +282,7 @@
    }
    \endqml
 
+
    Mouse filter provides ability to control the order of the event dispatching.
    The filter can receive the events prior the owner or after the owner. This
    can be controlled through the \l priority property. In the following example
@@ -281,6 +338,9 @@
 UCMouse::UCMouse(QObject *parent)
     : QObject(parent)
     , m_owner(qobject_cast<QQuickItem*>(parent))
+    , m_lastButton(Qt::NoButton)
+    , m_lastButtons(Qt::NoButton)
+    , m_lastModifiers(Qt::NoModifier)
     , m_pressedButtons(Qt::NoButton)
     , m_priority(BeforeItem)
     , m_moveThreshold(0.0)
@@ -328,6 +388,9 @@
         } else {
             return hoverEvents(target, static_cast<QHoverEvent*>(event));
         }
+    } else if (type == ForwardedEvent::baseType()) {
+        // this is a forwarded event, handle it as such
+        return forwardedEvents(static_cast<ForwardedEvent*>(event));
     }
 
     return QObject::eventFilter(target, event);
@@ -341,7 +404,8 @@
             QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
                                      false, m_longPress);
             mev.setAccepted(false);
-            Q_EMIT pressAndHold(&mev);
+            Q_EMIT pressAndHold(&mev, m_owner);
+            mev.setAccepted(forwardEvent(ForwardedEvent::MouseLongPress, 0, &mev));
             // if the event wasn't handled, allow click
             if (!mev.isAccepted()) {
                 m_longPress = false;
@@ -376,7 +440,6 @@
     default:
         break;
     }
-    forwardEvent(event);
     return result || event->isAccepted();
 }
 
@@ -400,27 +463,67 @@
     default:
         break;
     }
-    forwardEvent(event);
     return result || event->isAccepted();
 }
 
+// emit signals and forward the events further
+bool UCMouse::forwardedEvents(ForwardedEvent *event)
+{
+    // the quick event is always specified!
+    switch (event->subType()) {
+    case ForwardedEvent::MousePress: {
+        Q_EMIT pressed(event->quickEvent(), event->sender());
+    } break;
+    case ForwardedEvent::MouseRelease: {
+        Q_EMIT released(event->quickEvent(), event->sender());
+    } break;
+    case ForwardedEvent::MouseMove: {
+        Q_EMIT positionChanged(event->quickEvent(), event->sender());
+    } break;
+    case ForwardedEvent::MouseDblClick: {
+        Q_EMIT doubleClicked(event->quickEvent(), event->sender());
+    } break;
+    case ForwardedEvent::HoverEnter: {
+        Q_EMIT entered(event->quickEvent(), event->sender());
+    } break;
+    case ForwardedEvent::HoverExit: {
+        Q_EMIT exited(event->quickEvent(), event->sender());
+    } break;
+        // composed events
+    case ForwardedEvent::MouseClick: {
+        Q_EMIT clicked(event->quickEvent(), event->sender());
+    } break;
+    case ForwardedEvent::MouseLongPress: {
+        Q_EMIT pressAndHold(event->quickEvent(), event->sender());
+    } break;
+    default: break;
+    }
+
+    // forward event, but use the current owner as sender
+    event->setAccepted(forwardEvent(event->subType(), event->originalEvent(), event->quickEvent()));
+    return event->isAccepted();
+}
+
 bool UCMouse::hasAttachedFilter(QQuickItem *item)
 {
     return (qmlAttachedPropertiesObject<UCMouse>(item, false) != 0);
 }
 
-void UCMouse::setHovered(bool hovered)
+void UCMouse::setHovered(bool hovered, QEvent *hoverEvent)
 {
     if (m_hovered != hovered) {
         m_hovered = hovered;
         QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
                                  false, false);
         mev.setAccepted(false);
+        ForwardedEvent::EventType type = (m_hovered) ? ForwardedEvent::HoverEnter : ForwardedEvent::HoverExit;
         if (m_hovered) {
-            Q_EMIT entered(&mev);
+            Q_EMIT entered(&mev, m_owner);
         } else {
-            Q_EMIT exited(&mev);
+            m_pressAndHoldTimer.stop();
+            Q_EMIT exited(&mev, m_owner);
         }
+        forwardEvent(type, hoverEvent, &mev);
     }
 }
 
@@ -432,13 +535,13 @@
         m_pressedButtons |= m_lastButton;
         m_longPress = m_doubleClicked = false;
 
-        setHovered(true);
+        setHovered(true, 0);
 
         QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
                                  false, m_longPress);
         mev.setAccepted(false);
-        Q_EMIT pressed(&mev);
-        event->setAccepted(mev.isAccepted());
+        Q_EMIT pressed(&mev, m_owner);
+        event->setAccepted(forwardEvent(ForwardedEvent::MousePress, event, &mev));
 
         // start long press timer
         m_pressAndHoldTimer.start(DefaultPressAndHoldDelay, this);
@@ -460,14 +563,14 @@
             m_pressAndHoldTimer.stop();
         }
 
-        setHovered(true);
+        setHovered(true, 0);
         m_moved = true;
         m_doubleClicked = false;
         QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
                                  false, m_longPress);
         mev.setAccepted(false);
-        Q_EMIT positionChanged(&mev);
-        event->setAccepted(mev.isAccepted());
+        Q_EMIT positionChanged(&mev, m_owner);
+        event->setAccepted(forwardEvent(ForwardedEvent::MouseMove, event, &mev));
         return mev.isAccepted();
     }
 
@@ -487,18 +590,20 @@
         QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
                                  isClicked, m_longPress);
         mev.setAccepted(false);
-        Q_EMIT released(&mev);
-        event->setAccepted(mev.isAccepted());
+        Q_EMIT released(&mev, m_owner);
+        event->setAccepted(forwardEvent(ForwardedEvent::MouseRelease, event, &mev));
 
         // remove button from press
         m_pressedButtons &= ~m_lastButton;
         if (isClicked) {
             // emit clicked
-            Q_EMIT clicked(&mev);
+            mev.setAccepted(false);
+            Q_EMIT clicked(&mev, m_owner);
+            forwardEvent(ForwardedEvent::MouseClick, 0, &mev);
         }
 
         if (!m_pressedButtons && !m_owner->acceptHoverEvents()) {
-            setHovered(false);
+            setHovered(false, 0);
         }
         return mev.isAccepted();
     }
@@ -511,18 +616,17 @@
 {
     if (m_pressedButtons) {
         saveEvent(event);
+
+        QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
+                                 true, m_longPress);
+        mev.setAccepted(false);
         // if double click connected, suppress release() and click() signals
         if (isDoubleClickConnected()) {
-            QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
-                                     true, m_longPress);
-            mev.setAccepted(false);
-            Q_EMIT doubleClicked(&mev);
-            event->setAccepted(mev.isAccepted());
+            Q_EMIT doubleClicked(&mev, m_owner);
             m_doubleClicked = true;
-        } else {
-            // set accepted to false still
-            event->setAccepted(false);
         }
+        // forward event even if it wasn't handled for the owner
+        event->setAccepted(forwardEvent(ForwardedEvent::MouseDblClick, event, &mev));
         return event->isAccepted();
     }
 
@@ -534,7 +638,9 @@
 {
     m_lastPos = event->posF();
     m_lastModifiers = event->modifiers();
-    setHovered(true);
+    m_lastButton = Qt::NoButton;
+    m_lastButtons = Qt::NoButton;
+    setHovered(true, event);
     return false;
 }
 
@@ -542,11 +648,11 @@
 {
     m_lastPos = event->posF();
     m_lastModifiers = event->modifiers();
-    QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), m_lastButton, m_lastButtons, m_lastModifiers,
+    QQuickMouseEvent mev(m_lastPos.x(), m_lastPos.y(), Qt::NoButton, Qt::NoButton, m_lastModifiers,
                              false, m_longPress);
     mev.setAccepted(false);
-    Q_EMIT positionChanged(&mev);
-    forwardEvent(event);
+    Q_EMIT positionChanged(&mev, m_owner);
+    event->setAccepted(forwardEvent(ForwardedEvent::MouseMove, event, &mev));
     return false;
 }
 
@@ -554,7 +660,9 @@
 {
     m_lastPos = event->posF();
     m_lastModifiers = event->modifiers();
-    setHovered(false);
+    m_lastButton = Qt::NoButton;
+    m_lastButtons = Qt::NoButton;
+    setHovered(false, event);
     return false;
 }
 
@@ -562,8 +670,10 @@
 {
     m_lastPos = event->localPos();
     m_lastScenePos = event->windowPos();
-    m_lastButton = event->button();
-    m_lastButtons = event->buttons();
+    if (event->type() != QEvent::MouseMove) {
+        m_lastButton = event->button();
+        m_lastButtons = event->buttons();
+    }
     m_lastModifiers = event->modifiers();
     if ((event->type() == QEvent::MouseButtonPress) && (m_moveThreshold > 0.0)) {
         m_toleranceArea.setX(m_lastPos.x() - m_moveThreshold);
@@ -574,7 +684,7 @@
 }
 bool UCMouse::isDoubleClickConnected()
 {
-    IS_SIGNAL_CONNECTED(this, UCMouse, doubleClicked, (QQuickMouseEvent*));
+    IS_SIGNAL_CONNECTED(this, UCMouse, doubleClicked, (QQuickMouseEvent*,QQuickItem*));
 }
 
 bool UCMouse::isMouseEvent(QEvent::Type type)
@@ -588,57 +698,73 @@
     return (type == QEvent::HoverEnter) || (type == QEvent::HoverMove) || (type == QEvent::HoverLeave);
 }
 
-// forwards the events to the listed items; only mouse and hover events qualify
-void UCMouse::forwardEvent(QEvent *event)
+
+/*
+ * Forwards the events to the listed items. The event coordinates are mapped to the destination's coordinates
+ * and sent to the destination in case the destination has no filter attached. Otherwise the quick event
+ * coordinates will be mapped and sent as ForwardedEvents.
+ */
+bool UCMouse::forwardEvent(ForwardedEvent::EventType type, QEvent *event, QQuickMouseEvent *quickEvent)
 {
-    /*
-     * alter acceptedButtons and hoverEnabled for the time the event is delivered
-     * exclude MouseArea and InverseMouseArea!!
-     */
+    // first set the accepted flag to the original event
+    if (event && quickEvent) {
+        event->setAccepted(quickEvent->isAccepted());
+    }
+    bool accepted = event ? event->isAccepted() : (quickEvent ? quickEvent->isAccepted() : false);
+
     Q_FOREACH(QQuickItem *item, m_forwardList) {
 
-        if (event->isAccepted()) {
+        if (accepted) {
             // the event got accepted, therefore should not be forwarded
-            return;
+            return accepted;
         }
         // skip InverseMouseArea otherwise those will get the event twice
         if (qobject_cast<InverseMouseAreaType*>(item)) {
             continue;
         }
-        /*
-         * temporarily enable mouse buttons and hover for items which have Mouse or InverseMouse
-         * filter attached, but exclude targets which is MouseArea or InverseMouseArea
-         */
-        Qt::MouseButtons acceptedButtons = item->acceptedMouseButtons();
-        bool hoverEnabled = item->acceptHoverEvents();
-        if (!qobject_cast<QQuickMouseArea*>(item) && hasAttachedFilter(item)) {
-            // set accepted buttons and hover temporarily
-            item->setAcceptedMouseButtons(m_owner->acceptedMouseButtons());
-            item->setAcceptHoverEvents(m_owner->acceptHoverEvents());
-        }
-
-        // forward events
-        bool accepted = false;
-        if (isMouseEvent(event->type())) {
-            QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
-            QPointF itemPos = item->mapFromScene(m_owner->mapToScene(mouse->pos()));
-            QMouseEvent me = QMouseEvent(event->type(), itemPos, mouse->button(), mouse->buttons(), mouse->modifiers());
-            QGuiApplication::sendEvent(item, &me);
-            accepted = me.isAccepted();
-        } else {
-            QHoverEvent *hover = static_cast<QHoverEvent*>(event);
-            QPointF itemPos = item->mapFromScene(m_owner->mapToScene(hover->pos()));
-            QPointF itemOldPos = item->mapFromScene(m_owner->mapToScene(hover->oldPos()));
-            QHoverEvent he = QHoverEvent(event->type(), itemPos, itemOldPos, hover->modifiers());
-            QGuiApplication::sendEvent(item, &he);
-            accepted = he.isAccepted();
-        }
-        event->setAccepted(accepted);
-
-        // restore acceptedButtons and hover
-        item->setAcceptedMouseButtons(acceptedButtons);
-        item->setAcceptHoverEvents(hoverEnabled);
+
+        // map the normal event coordinates to item
+        QEvent *mappedEvent = 0;
+        if (event) {
+            if (isMouseEvent(event->type())) {
+                QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+                QPointF itemPos = item->mapFromScene(m_owner->mapToScene(mouse->pos()));
+                mappedEvent = new QMouseEvent(event->type(), itemPos, mouse->button(), mouse->buttons(), mouse->modifiers());
+            } else if (isHoverEvent(event->type())){
+                QHoverEvent *hover = static_cast<QHoverEvent*>(event);
+                QPointF itemPos = item->mapFromScene(m_owner->mapToScene(hover->pos()));
+                QPointF itemOldPos = item->mapFromScene(m_owner->mapToScene(hover->oldPos()));
+                mappedEvent = new QHoverEvent(event->type(), itemPos, itemOldPos, hover->modifiers());
+            }
+        }
+
+        // if the item has no filter attached, deliver the mapped event to it as it is
+        UCMouse *filter = qobject_cast<UCMouse*>(qmlAttachedPropertiesObject<UCMouse>(item, false));
+        if (!filter && mappedEvent) {
+            QGuiApplication::sendEvent(item, mappedEvent);
+            accepted = mappedEvent->isAccepted();
+        } else if (quickEvent) {
+            // map the quick event coordinates as well
+            QPoint itemPos(item->mapFromScene(m_owner->mapToScene(QPointF(quickEvent->x(), quickEvent->y()))).toPoint());
+            QQuickMouseEvent mev(itemPos.x(), itemPos.y(), (Qt::MouseButton)quickEvent->button(), (Qt::MouseButtons)quickEvent->buttons(),
+                                 (Qt::KeyboardModifiers)quickEvent->modifiers(), quickEvent->isClick(), quickEvent->wasHeld());
+            mev.setAccepted(false);
+            ForwardedEvent forwardedEvent(type, m_owner, mappedEvent, &mev);
+            QGuiApplication::sendEvent(item, &forwardedEvent);
+            accepted = mev.isAccepted();
+        }
+
+        // cleanup and transfer accepted flag
+        delete mappedEvent;
+        if (event) {
+            event->setAccepted(accepted);
+        }
+        if (quickEvent) {
+            quickEvent->setAccepted(accepted);
+        }
     }
+
+    return accepted;
 }
 
 
@@ -697,6 +823,9 @@
    composed events will come until the mouse is moved inside the owner's area.
 
    The default value is 0.
+
+   \note The value has no effect for the forwarded events. The threshold is only
+   valid when the host handles mouse events.
  */
 int UCMouse::clickAndHoldThreshold() const
 {
@@ -767,29 +896,34 @@
 }
 
 /*!
-   \qmlsignal Mouse::onPressed(MouseEvent event)
-   The signal reports the mouse press.
+   \qmlsignal Mouse::onPressed(MouseEvent event, Item host)
+   The signal reports the mouse press. The \a host specifies the item that triggered
+   the event.
  */
 
 /*!
    \qmlsignal Mouse::onReleased(MouseEvent event)
-   The signal reports the mouse release.
+   The signal reports the mouse release. The \a host specifies the item that triggered
+   the event.
  */
 
 /*!
    \qmlsignal Mouse::onClicked(MouseEvent event)
    The signal reports the mouse click. The signal is not emitted if the onPressAndHold
-   got triggered or if onDoubleClicked is handled (a slot is connected to it).
+   got triggered or if onDoubleClicked is handled (a slot is connected to it). The \a
+   host specifies the item that triggered the event.
  */
 
 /*!
    \qmlsignal Mouse::onPressAndHold(MouseEvent event)
-   The signal reports the mouse press and hold.
+   The signal reports the mouse press and hold. The \a host specifies the item that triggered
+   the event.
  */
 
 /*!
    \qmlsignal Mouse::onDoubleClicked(MouseEvent event)
-   The signal reports mouse double click.
+   The signal reports mouse double click. The \a host specifies the item that triggered
+   the event.
  */
 
 /*!
@@ -797,20 +931,22 @@
    The signal reports the mouse pointer position change. If the hover events are
    enabled for the owner, the signal will come continuously. Otherwise the position
    chanes are reported when one of the accepted mouse buttons are being kept pressed.
+   The \a host specifies the item that triggered the event.
  */
 
 /*!
    \qmlsignal Mouse::onEntered(MouseEvent event)
    The signal reports that the mouse has entered into the area. The signal is
    emitted when the hover events are enabled and the mouse enters the area or
-   when one of the accepted mouse button is pressed.
+   when one of the accepted mouse button is pressed. The \a host specifies the
+   item that triggered the event.
  */
 
 /*!
    \qmlsignal Mouse::onExited(MouseEvent event)
    The signal reports that the mouse has left the area. The signal is emitted when
    the hover events are enabled for the owner or if not, when one of the accepted
-   button is released.
+   button is released. The \a host specifies the item that triggered the event.
  */
 
 /******************************************************************************

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-02-25 12:36:27 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-17 01:29:24 +0000
@@ -87,7 +87,75 @@
 		}
 	}
 
-	/*!
+    /*!
+      \qmlmethod UbuntuTestCase::flick(item, x, y, dx, dy, pressTimeout = -1, steps = -1, button = Qt.LeftButton, modifiers = Qt.NoModifiers, delay = -1)
+
+      The function produces a flick event when executed on Flickables. When used
+      on other components it provides the same functionality as \l mouseDrag()
+      function. The optional \a pressTimeout parameter can be used to introduce
+      a small delay between the mouse press and the first mouse move. Setting a
+      negative or zero value will disable the timeout.
+
+      The default flick velocity is built up using 5 move points. This can be altered
+      by setting a positive value to \a steps parameter. The bigger the number the
+      longer the flick will be. When a negative or zero value is given, the default
+      of 5 move points will be used.
+
+      \note The function can be used to select a text in a TextField or TextArea by
+      specifying at least 400 millisecods to \a pressTimeout.
+      */
+    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay) {
+        if (item === undefined || item.x === undefined || item.y === undefined)
+            return
+        if (button === undefined)
+            button = Qt.LeftButton
+        if (modifiers === undefined)
+            modifiers = Qt.NoModifier
+        if (steps === undefined || steps <= 0)
+            steps = 4;
+        // make sure we have at least two move steps so the flick will be sensed
+        steps += 1;
+        if (delay === undefined)
+            delay = -1;
+
+        var ddx = dx / steps;
+        var ddy = dy / steps;
+
+        mousePress(item, x, y, button, modifiers, delay);
+        if (pressTimeout !== undefined && pressTimeout > 0) {
+            wait(pressTimeout);
+        }
+        for (var i = 1; i <= steps; i++) {
+            // mouse moves are all processed immediately, without delay in between events
+            mouseMove(item, x + i * ddx, y + i * ddy, -1, button);
+        }
+        mouseRelease(item, x + dx, y + dy, button, modifiers, delay);
+        // empty event buffer
+        wait(200);
+    }
+
+    /*!
+        \qmlmethod UbuntuTestCase::mouseLongPress(item, x, y, button = Qt.LeftButton, modifiers = Qt.NoModifiers, delay = -1)
+
+        Simulates a long press on a mouse \a button with an optional \a modifier
+        on an \a item. The position is defined by \a x and \a y. If \a delay is
+        specified, the test will wait the specified amount of milliseconds before
+        the press.
+
+        The position given by \a x and \a y is transformed from the co-ordinate
+        system of \a item into window co-ordinates and then delivered.
+        If \a item is obscured by another item, or a child of \a item occupies
+        that position, then the event will be delivered to the other item instead.
+
+        \sa mouseRelease(), mouseClick(), mouseDoubleClick(), mouseMove(), mouseDrag(), mouseWheel()
+      */
+    function mouseLongPress(item, x, y, button, modifiers, delay) {
+        mousePress(item, x, y, button, modifiers, delay);
+        // the delay is taken from QQuickMouseArea
+        wait(800);
+    }
+
+    /*!
 		Keeps executing a given parameter-less function until it returns the given
 		expected result or the timemout is reached (in which case a test failure
 		is generated)

=== modified file 'modules/Ubuntu/Test/deployment.pri'
--- modules/Ubuntu/Test/deployment.pri	2014-01-17 12:30:05 +0000
+++ modules/Ubuntu/Test/deployment.pri	2014-04-17 01:29:24 +0000
@@ -7,9 +7,14 @@
 # make found deployables visible in Qt Creator
 OTHER_FILES += $$QMLDIR_FILE
 
+QML_FILES = $$system(ls *.qml)
+JS_FILES = $$system(ls *.js)
+
 # define deployment for found deployables
 qmldir_file.path = $$installPath
 qmldir_file.files = $$QMLDIR_FILE
+qml_files.path = $$installPath
+qml_files.files = $$QML_FILES
 js_files.path = $$installPath
 js_files.files = $$JS_FILES
 
@@ -20,4 +25,4 @@
 # https://bugreports.qt-project.org/browse/QTBUG-36243
 plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
 
-INSTALLS += qmldir_file plugins_qmltypes
+INSTALLS += qmldir_file plugins_qmltypes qml_files js_files

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.cpp'
--- modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-03-19 12:48:33 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-04-17 01:29:24 +0000
@@ -26,6 +26,8 @@
 #include <QtTest/QtTest>
 #include <QtQuick/QQuickItem>
 
+Q_DECLARE_METATYPE(QList<QQmlError>)
+
 /*!
  * \ingroup ubuntu
  * \brief UbuntuTestCase is the C++ pendant to the QML UbuntuTestCase.
@@ -37,6 +39,7 @@
     QString modulePath(QDir(modules).absolutePath());
     engine()->addImportPath(modulePath);
 
+    qRegisterMetaType<QList <QQmlError> >();
     m_spy = new QSignalSpy(engine(), SIGNAL(warnings(QList<QQmlError>)));
     m_spy->setParent(this);
 
@@ -48,3 +51,12 @@
     QTest::qWaitForWindowExposed(this);
 }
 
+/*!
+ * The number of all warnings from the point of loading the first line of QML code.
+ */
+int
+UbuntuTestCase::warnings() const
+{
+	return m_spy->count();
+}
+

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.h'
--- modules/Ubuntu/Test/plugin/uctestcase.h	2014-03-19 12:48:33 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.h	2014-04-17 01:29:24 +0000
@@ -29,6 +29,7 @@
 
 public:
     UbuntuTestCase(const QString& file, QWindow* parent = 0);
+    int warnings() const;
     // getter
     template<class T>
     inline T findItem(const QString& objectName) const {
@@ -39,7 +40,6 @@
             qFatal("Item '%s' found with unexpected type", qPrintable(objectName));
         qFatal("No item '%s' found", qPrintable(objectName));
     }
-
 private:
     QSignalSpy* m_spy;
 };

=== removed file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2013-07-10 16:07:33 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2012, 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-"""Ubuntu UI Toolkit autopilot tests and emulators - top level package."""

=== added directory 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects'
=== renamed file 'tests/autopilot/ubuntuuitoolkit/emulators.py' => 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-08 14:46:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-04-17 01:29:24 +0000
@@ -14,784 +14,69 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import logging
-from distutils import version
-
-import autopilot
-from autopilot import (
-    input,
-    logging as autopilot_logging,
-    platform
-)
-from autopilot.introspection import dbus
-
-
-_NO_TABS_ERROR = 'The MainView has no Tabs.'
-
-logger = logging.getLogger(__name__)
-
-
-class ToolkitEmulatorException(Exception):
-    """Exception raised when there is an error with the emulator."""
-
-
-def get_pointing_device():
-    """Return the pointing device depending on the platform.
-
-    If the platform is `Desktop`, the pointing device will be a `Mouse`.
-    If not, the pointing device will be `Touch`.
-
-    """
-    if platform.model() == 'Desktop':
-        input_device_class = input.Mouse
-    else:
-        input_device_class = input.Touch
-    return input.Pointer(device=input_device_class.create())
-
-
-def get_keyboard():
-    """Return the keyboard device."""
-    # TODO return the OSK if we are on the phone. --elopio - 2014-01-13
-    return input.Keyboard.create()
-
-
-def check_autopilot_version():
-    """Check that the Autopilot installed version matches the one required.
-
-    :raise ToolkitEmulatorException: If the installed Autopilot version does't
-        match the required by the emulators.
-
-    """
-    installed_version = version.LooseVersion(autopilot.version)
-    if installed_version < version.LooseVersion('1.4'):
-        raise ToolkitEmulatorException(
-            'The emulators need Autopilot 1.4 or higher.')
-
-
-# Containers helpers.
-
-def _get_visible_container_top(containers):
-    containers_top = [container.globalRect.y for container in containers]
-    return max(containers_top)
-
-
-def _get_visible_container_bottom(containers):
-    containers_bottom = [
-        container.globalRect.y + container.globalRect.height
-        for container in containers if container.globalRect.height > 0]
-    return min(containers_bottom)
-
-
-class UbuntuUIToolkitEmulatorBase(dbus.CustomEmulatorBase):
-    """A base class for all the Ubuntu UI Toolkit emulators."""
-
-    def __init__(self, *args):
-        check_autopilot_version()
-        super(UbuntuUIToolkitEmulatorBase, self).__init__(*args)
-        self.pointing_device = get_pointing_device()
-
-
-class MainView(UbuntuUIToolkitEmulatorBase):
-    """MainView Autopilot emulator."""
-
-    def get_header(self):
-        """Return the Header emulator of the MainView."""
-        try:
-            return self.select_single('Header', objectName='MainView_Header')
-        except dbus.StateNotFoundError:
-            raise ToolkitEmulatorException('The main view has no header.')
-
-    def get_toolbar(self):
-        """Return the Toolbar emulator of the MainView."""
-        return self.select_single(Toolbar)
-
-    @autopilot_logging.log_action(logger.info)
-    def open_toolbar(self):
-        """Open the toolbar if it's not already opened.
-
-        :return: The toolbar.
-
-        """
-        return self.get_toolbar().open()
-
-    @autopilot_logging.log_action(logger.info)
-    def close_toolbar(self):
-        """Close the toolbar if it's opened."""
-        self.get_toolbar().close()
-
-    def get_tabs(self):
-        """Return the Tabs emulator of the MainView.
-
-        :raise ToolkitEmulatorException: If the main view has no tabs.
-
-        """
-        try:
-            return self.select_single(Tabs)
-        except dbus.StateNotFoundError:
-            raise ToolkitEmulatorException(_NO_TABS_ERROR)
-
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_next_tab(self):
-        """Open the next tab.
-
-        :return: The newly opened tab.
-
-        """
-        logger.debug('Switch to next tab.')
-        self.get_header().switch_to_next_tab()
-        current_tab = self.get_tabs().get_current_tab()
-        current_tab.visible.wait_for(True)
-        return current_tab
-
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_tab_by_index(self, index):
-        """Open a tab.
-
-        :parameter index: The index of the tab to open.
-        :return: The newly opened tab.
-        :raise ToolkitEmulatorException: If the tab index is out of range.
-
-        """
-        logger.debug('Switch to tab with index {0}.'.format(index))
-        tabs = self.get_tabs()
-        number_of_tabs = tabs.get_number_of_tabs()
-        if index >= number_of_tabs:
-            raise ToolkitEmulatorException('Tab index out of range.')
-        current_tab = tabs.get_current_tab()
-        number_of_switches = 0
-        while not tabs.selectedTabIndex == index:
-            logger.debug(
-                'Current tab index: {0}.'.format(tabs.selectedTabIndex))
-            if number_of_switches >= number_of_tabs - 1:
-                # This prevents a loop. But if this error is ever raised, it's
-                # likely there's a bug on the emulator or on the QML Tab.
-                raise ToolkitEmulatorException(
-                    'The tab with index {0} was not selected.'.format(index))
-            current_tab = self.switch_to_next_tab()
-            number_of_switches += 1
-        return current_tab
-
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_previous_tab(self):
-        """Open the previous tab.
-
-        :return: The newly opened tab.
-
-        """
-        tabs = self.get_tabs()
-        if tabs.selectedTabIndex == 0:
-            previous_tab_index = tabs.get_number_of_tabs() - 1
-        else:
-            previous_tab_index = tabs.selectedTabIndex - 1
-        return self.switch_to_tab_by_index(previous_tab_index)
-
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_tab(self, object_name):
-        """Open a tab.
-
-        :parameter object_name: The QML objectName property of the tab.
-        :return: The newly opened tab.
-        :raise ToolkitEmulatorException: If there is no tab with that object
-            name.
-
-        """
-        tabs = self.get_tabs()
-        for index, tab in enumerate(tabs.select_many('Tab')):
-            if tab.objectName == object_name:
-                return self.switch_to_tab_by_index(tab.index)
-        raise ToolkitEmulatorException(
-            'Tab with objectName "{0}" not found.'.format(object_name))
-
-    def get_action_selection_popover(self, object_name):
-        """Return an ActionSelectionPopover emulator.
-
-        :parameter object_name: The QML objectName property of the popover.
-
-        """
-        return self.select_single(
-            ActionSelectionPopover, objectName=object_name)
-
-    @autopilot_logging.log_action(logger.info)
-    def go_back(self):
-        """Go to the previous page."""
-        toolbar = self.open_toolbar()
-        toolbar.click_back_button()
-
-
-class Header(UbuntuUIToolkitEmulatorBase):
-    """Header Autopilot emulator."""
-
-    def __init__(self, *args):
-        super(Header, self).__init__(*args)
-        self.pointing_device = get_pointing_device()
-
-    def _get_animating(self):
-        tab_bar_style = self.select_single('TabBarStyle')
-        return tab_bar_style.animating
-
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_next_tab(self):
-        """Open the next tab.
-
-        :raise ToolkitEmulatorException: If the main view has no tabs.
-
-        """
-        try:
-            tab_bar = self.select_single(TabBar)
-        except dbus.StateNotFoundError:
-            raise ToolkitEmulatorException(_NO_TABS_ERROR)
-        tab_bar.switch_to_next_tab()
-        self._get_animating().wait_for(False)
-
-
-class Toolbar(UbuntuUIToolkitEmulatorBase):
-    """Toolbar Autopilot emulator."""
-
-    @autopilot_logging.log_action(logger.info)
-    def open(self):
-        """Open the toolbar if it's not already opened.
-
-        :return: The toolbar.
-
-        """
-        self.animating.wait_for(False)
-        if not self.opened:
-            self._drag_to_open()
-            self.opened.wait_for(True)
-            self.animating.wait_for(False)
-
-        return self
-
-    def _drag_to_open(self):
-        x, y, _, _ = self.globalRect
-        line_x = x + self.width * 0.50
-        start_y = y + self.height - 1
-        stop_y = y
-
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
-
-    @autopilot_logging.log_action(logger.info)
-    def close(self):
-        """Close the toolbar if it's opened."""
-        self.animating.wait_for(False)
-        if self.opened:
-            self._drag_to_close()
-            self.opened.wait_for(False)
-            self.animating.wait_for(False)
-
-    def _drag_to_close(self):
-        x, y, _, _ = self.globalRect
-        line_x = x + self.width * 0.50
-        start_y = y
-        stop_y = y + self.height - 1
-
-        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
-
-    @autopilot_logging.log_action(logger.info)
-    def click_button(self, object_name):
-        """Click a button of the toolbar.
-
-        The toolbar should be opened before clicking the button, or an
-        exception will be raised. If the toolbar is closed for some reason
-        (e.g., timer finishes) after moving the mouse cursor and before
-        clicking the button, it is re-opened automatically by this function.
-
-        :parameter object_name: The QML objectName property of the button.
-        :raise ToolkitEmulatorException: If there is no button with that object
-            name.
-
-        """
-        # ensure the toolbar is open
-        if not self.opened:
-            raise ToolkitEmulatorException(
-                'Toolbar must be opened before calling click_button().')
-        try:
-            button = self._get_button(object_name)
-        except dbus.StateNotFoundError:
-            raise ToolkitEmulatorException(
-                'Button with objectName "{0}" not found.'.format(object_name))
-        self.pointing_device.move_to_object(button)
-        # ensure the toolbar is still open (may have closed due to timeout)
-        self.open()
-        # click the button
-        self.pointing_device.click_object(button)
-
-    def _get_button(self, object_name):
-        return self.select_single('ActionItem', objectName=object_name)
-
-    @autopilot_logging.log_action(logger.info)
-    def click_back_button(self):
-        """Click the back button of the toolbar."""
-        self.click_button('back_toolbar_button')
-
-
-class Tabs(UbuntuUIToolkitEmulatorBase):
-    """Tabs Autopilot emulator."""
-
-    def get_current_tab(self):
-        """Return the currently selected tab."""
-        return self._get_tab(self.selectedTabIndex)
-
-    def _get_tab(self, index):
-        tabs = self._get_tabs()
-        for tab in tabs:
-            if tab.index == index:
-                return tab
-        else:
-            raise ToolkitEmulatorException(
-                'There is no tab with index {0}.'.format(index))
-
-    def _get_tabs(self):
-        return self.select_many('Tab')
-
-    def get_number_of_tabs(self):
-        """Return the number of tabs."""
-        return len(self._get_tabs())
-
-
-class TabBar(UbuntuUIToolkitEmulatorBase):
-    """TabBar Autopilot emulator."""
-
-    @autopilot_logging.log_action(logger.info)
-    def switch_to_next_tab(self):
-        """Open the next tab."""
-        self._activate_tab_bar()
-        logger.debug('Click the next tab bar button.')
-        self.pointing_device.click_object(self._get_next_tab_button())
-
-    def _activate_tab_bar(self):
-        # First move to the tab bar to avoid timing issues when we find it in
-        # selection mode but it's deselected while we move to it.
-        self.pointing_device.move_to_object(self)
-        if self.selectionMode:
-            logger.debug('Already in selection mode.')
-        else:
-            # Click the tab bar to switch to selection mode.
-            logger.debug('Click the tab bar to enable selection mode.')
-            self.pointing_device.click_object(self)
-
-    def _get_next_tab_button(self):
-        current_index = self._get_selected_button_index()
-        next_index = (current_index + 1) % self._get_number_of_tab_buttons()
-        return self._get_tab_button(next_index)
-
-    def _get_selected_button_index(self):
-        return self.select_single('QQuickPathView').selectedButtonIndex
-
-    def _get_number_of_tab_buttons(self):
-        return len(self._get_tab_buttons())
-
-    def _get_tab_buttons(self):
-        return self.select_many('AbstractButton')
-
-    def _get_tab_button(self, index):
-        buttons = self._get_tab_buttons()
-        for button in buttons:
-            if button.buttonIndex == index:
-                return button
-        raise ToolkitEmulatorException(
-            'There is no tab button with index {0}.'.format(index))
-
-
-class ActionSelectionPopover(UbuntuUIToolkitEmulatorBase):
-    """ActionSelectionPopover Autopilot emulator."""
-
-    def click_button_by_text(self, text):
-        """Click a button on the popover.
-
-        XXX We are receiving the text because there's no way to set the
-        objectName on the action. This is reported at
-        https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
-        --elopio - 2013-07-25
-
-        :parameter text: The text of the button.
-        :raise ToolkitEmulatorException: If the popover is not open.
-
-        """
-        if not self.visible:
-            raise ToolkitEmulatorException('The popover is not open.')
-        button = self._get_button(text)
-        if button is None:
-            raise ToolkitEmulatorException(
-                'Button with text "{0}" not found.'.format(text))
-        self.pointing_device.click_object(button)
-        if self.autoClose:
-            try:
-                self.visible.wait_for(False)
-            except dbus.StateNotFoundError:
-                # The popover was removed from the tree.
-                pass
-
-    def _get_button(self, text):
-        buttons = self.select_many('Empty')
-        for button in buttons:
-            if button.text == text:
-                return button
-
-
-class CheckBox(UbuntuUIToolkitEmulatorBase):
-    """CheckBox Autopilot emulator."""
-
-    @autopilot_logging.log_action(logger.info)
-    def check(self, timeout=10):
-        """Check a CheckBox, if its not already checked.
-
-        :parameter timeout: number of seconds to wait for the CheckBox to be
-            checked. Default is 10.
-
-        """
-        if not self.checked:
-            self.change_state(timeout)
-
-    @autopilot_logging.log_action(logger.info)
-    def uncheck(self, timeout=10):
-        """Uncheck a CheckBox, if its not already unchecked.
-
-        :parameter timeout: number of seconds to wait for the CheckBox to be
-            unchecked. Default is 10.
-
-        """
-        if self.checked:
-            self.change_state(timeout)
-
-    @autopilot_logging.log_action(logger.info)
-    def change_state(self, timeout=10):
-        """Change the state of a CheckBox.
-
-        If it is checked, it will be unchecked. If it is unchecked, it will be
-        checked.
-
-        :parameter time_out: number of seconds to wait for the CheckBox state
-            to change. Default is 10.
-
-        """
-        original_state = self.checked
-        self.pointing_device.click_object(self)
-        self.checked.wait_for(not original_state, timeout)
-
-
-class TextField(UbuntuUIToolkitEmulatorBase):
-    """TextField Autopilot emulator."""
-
-    def __init__(self, *args):
-        super(TextField, self).__init__(*args)
-        self.keyboard = get_keyboard()
-
-    def write(self, text, clear=True):
-        """Write into the text field.
-
-        :parameter text: The text to write.
-        :parameter clear: If True, the text field will be cleared before
-            writing the text. If False, the text will be appended at the end
-            of the text field. Default is True.
-
-        """
-        with self.keyboard.focused_type(self):
-            self.focus.wait_for(True)
-            if clear:
-                self.clear()
-            else:
-                if not self.is_empty():
-                    self.keyboard.press_and_release('End')
-            self.keyboard.type(text)
-
-    def clear(self):
-        """Clear the text field."""
-        if not self.is_empty():
-            if self.hasClearButton:
-                self._click_clear_button()
-            else:
-                self._clear_with_keys()
-            self.text.wait_for('')
-
-    def is_empty(self):
-        """Return True if the text field is empty. False otherwise."""
-        return self.text == ''
-
-    def _click_clear_button(self):
-        clear_button = self.select_single(
-            'AbstractButton', objectName='clear_button')
-        if not clear_button.visible:
-            self.pointing_device.click_object(self)
-        self.pointing_device.click_object(clear_button)
-
-    def _clear_with_keys(self):
-        if platform.model() == 'Desktop':
-            self._select_all()
-        else:
-            # Touch tap currently doesn't have a press_duration parameter, so
-            # we can't show the popover. Reported as bug http://pad.lv/1268782
-            # --elopio - 2014-01-13
-            self.keyboard.press_and_release('End')
-        while not self.is_empty():
-            # We delete with backspace because the on-screen keyboard has that
-            # key.
-            self.keyboard.press_and_release('BackSpace')
-
-    def _select_all(self):
-        self.pointing_device.click_object(self, press_duration=1)
-        root = self.get_root_instance()
-        main_view = root.select_single(MainView)
-        popover = main_view.get_action_selection_popover('text_input_popover')
-        popover.click_button_by_text('Select All')
-
-
-class Flickable(UbuntuUIToolkitEmulatorBase):
-
-    @autopilot_logging.log_action(logger.info)
-    def swipe_child_into_view(self, child):
-        """Make the child visible.
-
-        Currently it works only when the object needs to be swiped vertically.
-        TODO implement horizontal swiping. --elopio - 2014-03-21
-
-        """
-        containers = self._get_containers()
-        if not self._is_child_visible(child, containers):
-            self._swipe_non_visible_child_into_view(child, containers)
-        else:
-            logger.debug('The element is already visible.')
-
-    def _get_containers(self):
-        """Return a list with the containers to take into account when swiping.
-
-        The list includes this flickable and the top-most container.
-        TODO add additional flickables that are between this and the top
-        container. --elopio - 2014-03-22
-
-        """
-        containers = [self._get_top_container(), self]
-        return containers
-
-    def _get_top_container(self):
-        """Return the top-most container with a globalRect."""
-        root = self.get_root_instance()
-        containers = [root]
-        while len(containers) == 1:
-            try:
-                containers[0].globalRect
-                return containers[0]
-            except AttributeError:
-                containers = containers[0].get_children()
-
-        raise ToolkitEmulatorException("Couldn't find the top-most container.")
-
-    def _is_child_visible(self, child, containers):
-        """Check if the center of the child is visible.
-
-        :return: True if the center of the child is visible, False otherwise.
-
-        """
-        object_center = child.globalRect.y + child.globalRect.height // 2
-        visible_top = _get_visible_container_top(containers)
-        visible_bottom = _get_visible_container_bottom(containers)
-        return (object_center >= visible_top and
-                object_center <= visible_bottom)
-
-    @autopilot_logging.log_action(logger.info)
-    def _swipe_non_visible_child_into_view(self, child, containers):
-        while not self._is_child_visible(child, containers):
-            # Check the direction of the swipe based on the position of the
-            # child relative to the immediate flickable container.
-            if child.globalRect.y < self.globalRect.y:
-                self._swipe_to_show_more_above(containers)
-            else:
-                self._swipe_to_show_more_below(containers)
-
-    @autopilot_logging.log_action(logger.info)
-    def _swipe_to_show_more_above(self, containers):
-        if self.atYBeginning:
-            raise ToolkitEmulatorException(
-                "Can't swipe more, we are already at the top of the "
-                "container.")
-        else:
-            self._swipe_to_show_more('above', containers)
-
-    @autopilot_logging.log_action(logger.info)
-    def _swipe_to_show_more_below(self, containers):
-        if self.atYEnd:
-            raise ToolkitEmulatorException(
-                "Can't swipe more, we are already at the bottom of the "
-                "container.")
-        else:
-            self._swipe_to_show_more('below', containers)
-
-    def _swipe_to_show_more(self, direction, containers):
-        start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
-        # Start and stop just a little under the top and a little over the
-        # bottom.
-        top = _get_visible_container_top(containers) + 5
-        bottom = _get_visible_container_bottom(containers) - 5
-        if direction == 'below':
-            start_y = bottom
-            stop_y = top
-        elif direction == 'above':
-            start_y = top
-            stop_y = bottom
-        else:
-            raise ToolkitEmulatorException(
-                'Invalid direction {}.'.format(direction))
-        self._slow_drag(start_x, stop_x, start_y, stop_y)
-        self.dragging.wait_for(False)
-        self.moving.wait_for(False)
-
-    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
-        # If we drag too fast, we end up scrolling more than what we
-        # should, sometimes missing the  element we are looking for.
-        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=5)
-
-    @autopilot_logging.log_action(logger.info)
-    def _scroll_to_top(self):
-        if not self.atYBeginning:
-            containers = self._get_containers()
-            while not self.atYBeginning:
-                self._swipe_to_show_more_above(containers)
-
-
-class QQuickListView(Flickable):
-
-    @autopilot_logging.log_action(logger.info)
-    def click_element(self, object_name):
-        """Click an element from the list.
-
-        It swipes the element into view if it's center is not visible.
-
-        :parameter objectName: The objectName property of the element to click.
-
-        """
-        try:
-            element = self.select_single(objectName=object_name)
-        except dbus.StateNotFoundError:
-            # The element might be on a part of the list that hasn't been
-            # created yet. We have to search for it scrolling the entire list.
-            element = self._find_element(object_name)
-        self.swipe_child_into_view(element)
-        self.pointing_device.click_object(element)
-
-    @autopilot_logging.log_action(logger.info)
-    def _find_element(self, object_name):
-        self._scroll_to_top()
-        while not self.atYEnd:
-            containers = self._get_containers()
-            self._swipe_to_show_more_below(containers)
-            try:
-                return self.select_single(objectName=object_name)
-            except dbus.StateNotFoundError:
-                pass
-        raise ToolkitEmulatorException(
-            'List element with objectName "{}" not found.'.format(object_name))
-
-    def _is_element_clickable(self, object_name):
-        child = self.select_single(objectName=object_name)
-        containers = self._get_containers()
-        return self._is_child_visible(child, containers)
-
-
-class Empty(UbuntuUIToolkitEmulatorBase):
-    """Base class to emulate swipe to delete."""
-
-    def exists(self):
-        try:
-            return self.implicitHeight > 0
-        except dbus.StateNotFoundError:
-            return False
-
-    def _get_confirm_button(self):
-        return self.select_single(
-            'QQuickItem', objectName='confirmRemovalDialog')
-
-    @autopilot_logging.log_action(logger.info)
-    def swipe_to_delete(self, direction='right'):
-        """Swipe the item in a specific direction."""
-        if self.removable:
-            self._drag_pointing_device_to_delete(direction)
-            if self.confirmRemoval:
-                self.waitingConfirmationForRemoval.wait_for(True)
-            else:
-                self._wait_until_deleted()
-        else:
-            raise ToolkitEmulatorException(
-                'The item "{0}" is not removable'.format(self.objectName))
-
-    def _drag_pointing_device_to_delete(self, direction):
-        x, y, w, h = self.globalRect
-        tx = x + (w // 8)
-        ty = y + (h // 2)
-
-        if direction == 'right':
-            self.pointing_device.drag(tx, ty, w, ty)
-        elif direction == 'left':
-            self.pointing_device.drag(w - (w*0.1), ty, x, ty)
-        else:
-            raise ToolkitEmulatorException(
-                'Invalid direction "{0}" used on swipe to delete function'
-                .format(direction))
-
-    def _wait_until_deleted(self):
-        try:
-            # The item was hidden.
-            self.implicitHeight.wait_for(0)
-        except dbus.StateNotFoundError:
-            # The item was destroyed.
-            pass
-
-    @autopilot_logging.log_action(logger.info)
-    def confirm_removal(self):
-        """Comfirm item removal if this was already swiped."""
-        if self.waitingConfirmationForRemoval:
-            deleteButton = self._get_confirm_button()
-            self.pointing_device.click_object(deleteButton)
-            self._wait_until_deleted()
-        else:
-            raise ToolkitEmulatorException(
-                'The item "{0}" is not waiting for removal confirmation'.
-                format(self.objectName))
-
-
-class Base(Empty):
-    pass
-
-
-class Standard(Empty):
-    pass
-
-
-class ItemSelector(Empty):
-    pass
-
-
-class SingleControl(Empty):
-    pass
-
-
-class MultiValue(Base):
-    pass
-
-
-class SingleValue(Base):
-    pass
-
-
-class Subtitled(Base):
-    pass
-
-
-class ComposerSheet(UbuntuUIToolkitEmulatorBase):
-    """ComposerSheet Autopilot emulator."""
-
-    def __init__(self, *args):
-        super(ComposerSheet, self).__init__(*args)
-
-    @autopilot_logging.log_action(logger.info)
-    def confirm(self):
-        """Confirm the composer sheet."""
-        button = self.select_single('Button', objectName='confirmButton')
-        self.pointing_device.click_object(button)
-        self.wait_until_destroyed()
-
-    @autopilot_logging.log_action(logger.info)
-    def cancel(self):
-        """Cancel the composer sheet."""
-        button = self.select_single('Button', objectName='cancelButton')
-        self.pointing_device.click_object(button)
-        self.wait_until_destroyed()
+"""Ubuntu UI Toolkit Autopilot custom proxy objects."""
+
+
+__all__ = [
+    'ActionSelectionPopover',
+    'Base',
+    'check_autopilot_version',
+    'CheckBox',
+    'ComposerSheet',
+    'Empty',
+    'Flickable',
+    'get_keyboard',
+    'get_pointing_device',
+    'Header',
+    'ItemSelector',
+    'MainView',
+    'MultiValue',
+    'OptionSelector',
+    'QQuickListView',
+    'SingleControl',
+    'SingleValue',
+    'Standard',
+    'Subtitled',
+    'TabBar',
+    'Tabs',
+    'TextField',
+    'Toolbar',
+    'ToolkitException',
+    'UbuntuUIToolkitCustomProxyObjectBase',
+]
+
+from ubuntuuitoolkit._custom_proxy_objects._checkbox import CheckBox
+from ubuntuuitoolkit._custom_proxy_objects._common import (
+    check_autopilot_version,
+    get_keyboard,
+    get_pointing_device,
+    ToolkitException,
+    UbuntuUIToolkitCustomProxyObjectBase,
+)
+from ubuntuuitoolkit._custom_proxy_objects._flickable import Flickable
+from ubuntuuitoolkit._custom_proxy_objects._header import Header
+from ubuntuuitoolkit._custom_proxy_objects._listitems import (
+    Base,
+    Empty,
+    ItemSelector,
+    MultiValue,
+    SingleControl,
+    SingleValue,
+    Standard,
+    Subtitled,
+)
+from ubuntuuitoolkit._custom_proxy_objects._mainview import MainView
+from ubuntuuitoolkit._custom_proxy_objects._optionselector import (
+    OptionSelector
+)
+from ubuntuuitoolkit._custom_proxy_objects._popups import (
+    ActionSelectionPopover,
+    ComposerSheet,
+)
+from ubuntuuitoolkit._custom_proxy_objects._qquicklistview import (
+    QQuickListView
+)
+from ubuntuuitoolkit._custom_proxy_objects._tabbar import TabBar
+from ubuntuuitoolkit._custom_proxy_objects._tabs import Tabs
+from ubuntuuitoolkit._custom_proxy_objects._textfield import TextField
+from ubuntuuitoolkit._custom_proxy_objects._toolbar import Toolbar

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_checkbox.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,65 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+class CheckBox(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """CheckBox Autopilot emulator."""
+
+    @autopilot_logging.log_action(logger.info)
+    def check(self, timeout=10):
+        """Check a CheckBox, if its not already checked.
+
+        :parameter timeout: number of seconds to wait for the CheckBox to be
+            checked. Default is 10.
+
+        """
+        if not self.checked:
+            self.change_state(timeout)
+
+    @autopilot_logging.log_action(logger.info)
+    def uncheck(self, timeout=10):
+        """Uncheck a CheckBox, if its not already unchecked.
+
+        :parameter timeout: number of seconds to wait for the CheckBox to be
+            unchecked. Default is 10.
+
+        """
+        if self.checked:
+            self.change_state(timeout)
+
+    @autopilot_logging.log_action(logger.info)
+    def change_state(self, timeout=10):
+        """Change the state of a CheckBox.
+
+        If it is checked, it will be unchecked. If it is unchecked, it will be
+        checked.
+
+        :parameter time_out: number of seconds to wait for the CheckBox state
+            to change. Default is 10.
+
+        """
+        original_state = self.checked
+        self.pointing_device.click_object(self)
+        self.checked.wait_for(not original_state, timeout)

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,69 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Common helpers for Ubuntu UI Toolkit Autopilot custom proxy objects."""
+
+from distutils import version
+
+import autopilot
+from autopilot import platform, input
+from autopilot.introspection import dbus
+
+
+class ToolkitException(Exception):
+    """Exception raised when there is an error with the emulator."""
+
+
+def get_pointing_device():
+    """Return the pointing device depending on the platform.
+
+    If the platform is `Desktop`, the pointing device will be a `Mouse`.
+    If not, the pointing device will be `Touch`.
+
+    """
+    if platform.model() == 'Desktop':
+        input_device_class = input.Mouse
+    else:
+        input_device_class = input.Touch
+    return input.Pointer(device=input_device_class.create())
+
+
+def get_keyboard():
+    """Return the keyboard device."""
+    # TODO return the OSK if we are on the phone. --elopio - 2014-01-13
+    return input.Keyboard.create()
+
+
+def check_autopilot_version():
+    """Check that the Autopilot installed version matches the one required.
+
+    :raise ToolkitException: If the installed Autopilot version does't
+        match the required by the emulators.
+
+    """
+    installed_version = version.LooseVersion(autopilot.version)
+    if installed_version < version.LooseVersion('1.4'):
+        raise ToolkitException(
+            'The emulators need Autopilot 1.4 or higher.')
+
+
+class UbuntuUIToolkitCustomProxyObjectBase(dbus.CustomEmulatorBase):
+    """A base class for all the Ubuntu UI Toolkit emulators."""
+
+    def __init__(self, *args):
+        check_autopilot_version()
+        super(UbuntuUIToolkitCustomProxyObjectBase, self).__init__(*args)
+        self.pointing_device = get_pointing_device()

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,150 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+# Containers helpers.
+
+def _get_visible_container_top(containers):
+    containers_top = [container.globalRect.y for container in containers]
+    return max(containers_top)
+
+
+def _get_visible_container_bottom(containers):
+    containers_bottom = [
+        container.globalRect.y + container.globalRect.height
+        for container in containers if container.globalRect.height > 0]
+    return min(containers_bottom)
+
+
+class Flickable(_common.UbuntuUIToolkitCustomProxyObjectBase):
+
+    @autopilot_logging.log_action(logger.info)
+    def swipe_child_into_view(self, child):
+        """Make the child visible.
+
+        Currently it works only when the object needs to be swiped vertically.
+        TODO implement horizontal swiping. --elopio - 2014-03-21
+
+        """
+        containers = self._get_containers()
+        if not self._is_child_visible(child, containers):
+            self._swipe_non_visible_child_into_view(child, containers)
+        else:
+            logger.debug('The element is already visible.')
+
+    def _get_containers(self):
+        """Return a list with the containers to take into account when swiping.
+
+        The list includes this flickable and the top-most container.
+        TODO add additional flickables that are between this and the top
+        container. --elopio - 2014-03-22
+
+        """
+        containers = [self._get_top_container(), self]
+        return containers
+
+    def _get_top_container(self):
+        """Return the top-most container with a globalRect."""
+        root = self.get_root_instance()
+        containers = [root]
+        while len(containers) == 1:
+            try:
+                containers[0].globalRect
+                return containers[0]
+            except AttributeError:
+                containers = containers[0].get_children()
+
+        raise _common.ToolkitException("Couldn't find the top-most container.")
+
+    def _is_child_visible(self, child, containers):
+        """Check if the center of the child is visible.
+
+        :return: True if the center of the child is visible, False otherwise.
+
+        """
+        object_center = child.globalRect.y + child.globalRect.height // 2
+        visible_top = _get_visible_container_top(containers)
+        visible_bottom = _get_visible_container_bottom(containers)
+        return (object_center >= visible_top and
+                object_center <= visible_bottom)
+
+    @autopilot_logging.log_action(logger.info)
+    def _swipe_non_visible_child_into_view(self, child, containers):
+        while not self._is_child_visible(child, containers):
+            # Check the direction of the swipe based on the position of the
+            # child relative to the immediate flickable container.
+            if child.globalRect.y < self.globalRect.y:
+                self._swipe_to_show_more_above(containers)
+            else:
+                self._swipe_to_show_more_below(containers)
+
+    @autopilot_logging.log_action(logger.info)
+    def _swipe_to_show_more_above(self, containers):
+        if self.atYBeginning:
+            raise _common.ToolkitException(
+                "Can't swipe more, we are already at the top of the "
+                "container.")
+        else:
+            self._swipe_to_show_more('above', containers)
+
+    @autopilot_logging.log_action(logger.info)
+    def _swipe_to_show_more_below(self, containers):
+        if self.atYEnd:
+            raise _common.ToolkitException(
+                "Can't swipe more, we are already at the bottom of the "
+                "container.")
+        else:
+            self._swipe_to_show_more('below', containers)
+
+    def _swipe_to_show_more(self, direction, containers):
+        start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
+        # Start and stop just a little under the top and a little over the
+        # bottom.
+        top = _get_visible_container_top(containers) + 5
+        bottom = _get_visible_container_bottom(containers) - 5
+        if direction == 'below':
+            start_y = bottom
+            stop_y = top
+        elif direction == 'above':
+            start_y = top
+            stop_y = bottom
+        else:
+            raise _common.ToolkitException(
+                'Invalid direction {}.'.format(direction))
+        self._slow_drag(start_x, stop_x, start_y, stop_y)
+        self.dragging.wait_for(False)
+        self.moving.wait_for(False)
+
+    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
+        # If we drag too fast, we end up scrolling more than what we
+        # should, sometimes missing the  element we are looking for.
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=5)
+
+    @autopilot_logging.log_action(logger.info)
+    def _scroll_to_top(self):
+        if not self.atYBeginning:
+            containers = self._get_containers()
+            while not self.atYBeginning:
+                self._swipe_to_show_more_above(containers)

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,57 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+
+from ubuntuuitoolkit._custom_proxy_objects import (
+    _common,
+    _tabbar
+)
+
+
+_NO_TABS_ERROR = 'The MainView has no Tabs.'
+
+
+logger = logging.getLogger(__name__)
+
+
+class Header(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """Header Autopilot emulator."""
+
+    def __init__(self, *args):
+        super(Header, self).__init__(*args)
+        self.pointing_device = _common.get_pointing_device()
+
+    def _get_animating(self):
+        tab_bar_style = self.select_single('TabBarStyle')
+        return tab_bar_style.animating
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_next_tab(self):
+        """Open the next tab.
+
+        :raise ToolkitException: If the main view has no tabs.
+
+        """
+        try:
+            tab_bar = self.select_single(_tabbar.TabBar)
+        except dbus.StateNotFoundError:
+            raise _common.ToolkitException(_NO_TABS_ERROR)
+        tab_bar.switch_to_next_tab()
+        self._get_animating().wait_for(False)

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_listitems.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_listitems.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_listitems.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,114 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+class Empty(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """Base class to emulate swipe to delete."""
+
+    def exists(self):
+        try:
+            return self.implicitHeight > 0
+        except dbus.StateNotFoundError:
+            return False
+
+    def _get_confirm_button(self):
+        return self.select_single(
+            'QQuickItem', objectName='confirmRemovalDialog')
+
+    @autopilot_logging.log_action(logger.info)
+    def swipe_to_delete(self, direction='right'):
+        """Swipe the item in a specific direction."""
+        if self.removable:
+            self._drag_pointing_device_to_delete(direction)
+            if self.confirmRemoval:
+                self.waitingConfirmationForRemoval.wait_for(True)
+            else:
+                self._wait_until_deleted()
+        else:
+            raise _common.ToolkitException(
+                'The item "{0}" is not removable'.format(self.objectName))
+
+    def _drag_pointing_device_to_delete(self, direction):
+        x, y, w, h = self.globalRect
+        tx = x + (w // 8)
+        ty = y + (h // 2)
+
+        if direction == 'right':
+            self.pointing_device.drag(tx, ty, w, ty)
+        elif direction == 'left':
+            self.pointing_device.drag(w - (w*0.1), ty, x, ty)
+        else:
+            raise _common.ToolkitException(
+                'Invalid direction "{0}" used on swipe to delete function'
+                .format(direction))
+
+    def _wait_until_deleted(self):
+        try:
+            # The item was hidden.
+            self.implicitHeight.wait_for(0)
+        except dbus.StateNotFoundError:
+            # The item was destroyed.
+            pass
+
+    @autopilot_logging.log_action(logger.info)
+    def confirm_removal(self):
+        """Comfirm item removal if this was already swiped."""
+        if self.waitingConfirmationForRemoval:
+            deleteButton = self._get_confirm_button()
+            self.pointing_device.click_object(deleteButton)
+            self._wait_until_deleted()
+        else:
+            raise _common.ToolkitException(
+                'The item "{0}" is not waiting for removal confirmation'.
+                format(self.objectName))
+
+
+class Base(Empty):
+    pass
+
+
+class Standard(Empty):
+    pass
+
+
+class ItemSelector(Empty):
+    pass
+
+
+class SingleControl(Empty):
+    pass
+
+
+class MultiValue(Base):
+    pass
+
+
+class SingleValue(Base):
+    pass
+
+
+class Subtitled(Base):
+    pass

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,162 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Ubuntu UI Toolkit Autopilot custom proxy objects."""
+
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+
+from ubuntuuitoolkit._custom_proxy_objects import (
+    _common,
+    _popups,
+    _tabs,
+    _toolbar,
+)
+
+
+_NO_TABS_ERROR = 'The MainView has no Tabs.'
+
+
+logger = logging.getLogger(__name__)
+
+
+class MainView(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """MainView Autopilot emulator."""
+
+    def get_header(self):
+        """Return the Header emulator of the MainView."""
+        try:
+            return self.select_single('Header', objectName='MainView_Header')
+        except dbus.StateNotFoundError:
+            raise _common.ToolkitException('The main view has no header.')
+
+    def get_toolbar(self):
+        """Return the Toolbar emulator of the MainView."""
+        return self.select_single(_toolbar.Toolbar)
+
+    @autopilot_logging.log_action(logger.info)
+    def open_toolbar(self):
+        """Open the toolbar if it's not already opened.
+
+        :return: The toolbar.
+
+        """
+        return self.get_toolbar().open()
+
+    @autopilot_logging.log_action(logger.info)
+    def close_toolbar(self):
+        """Close the toolbar if it's opened."""
+        self.get_toolbar().close()
+
+    def get_tabs(self):
+        """Return the Tabs emulator of the MainView.
+
+        :raise ToolkitException: If the main view has no tabs.
+
+        """
+        try:
+            return self.select_single(_tabs.Tabs)
+        except dbus.StateNotFoundError:
+            raise _common.ToolkitException(_NO_TABS_ERROR)
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_next_tab(self):
+        """Open the next tab.
+
+        :return: The newly opened tab.
+
+        """
+        logger.debug('Switch to next tab.')
+        self.get_header().switch_to_next_tab()
+        current_tab = self.get_tabs().get_current_tab()
+        current_tab.visible.wait_for(True)
+        return current_tab
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_tab_by_index(self, index):
+        """Open a tab.
+
+        :parameter index: The index of the tab to open.
+        :return: The newly opened tab.
+        :raise ToolkitException: If the tab index is out of range.
+
+        """
+        logger.debug('Switch to tab with index {0}.'.format(index))
+        tabs = self.get_tabs()
+        number_of_tabs = tabs.get_number_of_tabs()
+        if index >= number_of_tabs:
+            raise _common.ToolkitException('Tab index out of range.')
+        current_tab = tabs.get_current_tab()
+        number_of_switches = 0
+        while not tabs.selectedTabIndex == index:
+            logger.debug(
+                'Current tab index: {0}.'.format(tabs.selectedTabIndex))
+            if number_of_switches >= number_of_tabs - 1:
+                # This prevents a loop. But if this error is ever raised, it's
+                # likely there's a bug on the emulator or on the QML Tab.
+                raise _common.ToolkitException(
+                    'The tab with index {0} was not selected.'.format(index))
+            current_tab = self.switch_to_next_tab()
+            number_of_switches += 1
+        return current_tab
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_previous_tab(self):
+        """Open the previous tab.
+
+        :return: The newly opened tab.
+
+        """
+        tabs = self.get_tabs()
+        if tabs.selectedTabIndex == 0:
+            previous_tab_index = tabs.get_number_of_tabs() - 1
+        else:
+            previous_tab_index = tabs.selectedTabIndex - 1
+        return self.switch_to_tab_by_index(previous_tab_index)
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_tab(self, object_name):
+        """Open a tab.
+
+        :parameter object_name: The QML objectName property of the tab.
+        :return: The newly opened tab.
+        :raise ToolkitException: If there is no tab with that object
+            name.
+
+        """
+        tabs = self.get_tabs()
+        for index, tab in enumerate(tabs.select_many('Tab')):
+            if tab.objectName == object_name:
+                return self.switch_to_tab_by_index(tab.index)
+        raise _common.ToolkitException(
+            'Tab with objectName "{0}" not found.'.format(object_name))
+
+    def get_action_selection_popover(self, object_name):
+        """Return an ActionSelectionPopover emulator.
+
+        :parameter object_name: The QML objectName property of the popover.
+
+        """
+        return self.select_single(
+            _popups.ActionSelectionPopover, objectName=object_name)
+
+    @autopilot_logging.log_action(logger.info)
+    def go_back(self):
+        """Go to the previous page."""
+        toolbar = self.open_toolbar()
+        toolbar.click_back_button()

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_popups.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_popups.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_popups.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,82 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+class ActionSelectionPopover(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """ActionSelectionPopover Autopilot emulator."""
+
+    def click_button_by_text(self, text):
+        """Click a button on the popover.
+
+        XXX We are receiving the text because there's no way to set the
+        objectName on the action. This is reported at
+        https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1205144
+        --elopio - 2013-07-25
+
+        :parameter text: The text of the button.
+        :raise ToolkitException: If the popover is not open.
+
+        """
+        if not self.visible:
+            raise _common.ToolkitException('The popover is not open.')
+        button = self._get_button(text)
+        if button is None:
+            raise _common.ToolkitException(
+                'Button with text "{0}" not found.'.format(text))
+        self.pointing_device.click_object(button)
+        if self.autoClose:
+            try:
+                self.visible.wait_for(False)
+            except dbus.StateNotFoundError:
+                # The popover was removed from the tree.
+                pass
+
+    def _get_button(self, text):
+        buttons = self.select_many('Empty')
+        for button in buttons:
+            if button.text == text:
+                return button
+
+
+class ComposerSheet(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """ComposerSheet Autopilot emulator."""
+
+    def __init__(self, *args):
+        super(ComposerSheet, self).__init__(*args)
+
+    @autopilot_logging.log_action(logger.info)
+    def confirm(self):
+        """Confirm the composer sheet."""
+        button = self.select_single('Button', objectName='confirmButton')
+        self.pointing_device.click_object(button)
+        self.wait_until_destroyed()
+
+    @autopilot_logging.log_action(logger.info)
+    def cancel(self):
+        """Cancel the composer sheet."""
+        button = self.select_single('Button', objectName='cancelButton')
+        self.pointing_device.click_object(button)
+        self.wait_until_destroyed()

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,65 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+
+from ubuntuuitoolkit._custom_proxy_objects import _flickable
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+class QQuickListView(_flickable.Flickable):
+
+    @autopilot_logging.log_action(logger.info)
+    def click_element(self, object_name):
+        """Click an element from the list.
+
+        It swipes the element into view if it's center is not visible.
+
+        :parameter objectName: The objectName property of the element to click.
+
+        """
+        try:
+            element = self.select_single(objectName=object_name)
+        except dbus.StateNotFoundError:
+            # The element might be on a part of the list that hasn't been
+            # created yet. We have to search for it scrolling the entire list.
+            element = self._find_element(object_name)
+        self.swipe_child_into_view(element)
+        self.pointing_device.click_object(element)
+
+    @autopilot_logging.log_action(logger.info)
+    def _find_element(self, object_name):
+        self._scroll_to_top()
+        while not self.atYEnd:
+            containers = self._get_containers()
+            self._swipe_to_show_more_below(containers)
+            try:
+                return self.select_single(objectName=object_name)
+            except dbus.StateNotFoundError:
+                pass
+        raise _common.ToolkitException(
+            'List element with objectName "{}" not found.'.format(object_name))
+
+    def _is_element_clickable(self, object_name):
+        child = self.select_single(objectName=object_name)
+        containers = self._get_containers()
+        return self._is_child_visible(child, containers)

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabbar.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,68 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+class TabBar(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """TabBar Autopilot emulator."""
+
+    @autopilot_logging.log_action(logger.info)
+    def switch_to_next_tab(self):
+        """Open the next tab."""
+        self._activate_tab_bar()
+        logger.debug('Click the next tab bar button.')
+        self.pointing_device.click_object(self._get_next_tab_button())
+
+    def _activate_tab_bar(self):
+        # First move to the tab bar to avoid timing issues when we find it in
+        # selection mode but it's deselected while we move to it.
+        self.pointing_device.move_to_object(self)
+        if self.selectionMode:
+            logger.debug('Already in selection mode.')
+        else:
+            # Click the tab bar to switch to selection mode.
+            logger.debug('Click the tab bar to enable selection mode.')
+            self.pointing_device.click_object(self)
+
+    def _get_next_tab_button(self):
+        current_index = self._get_selected_button_index()
+        next_index = (current_index + 1) % self._get_number_of_tab_buttons()
+        return self._get_tab_button(next_index)
+
+    def _get_selected_button_index(self):
+        return self.select_single('QQuickPathView').selectedButtonIndex
+
+    def _get_number_of_tab_buttons(self):
+        return len(self._get_tab_buttons())
+
+    def _get_tab_buttons(self):
+        return self.select_many('AbstractButton')
+
+    def _get_tab_button(self, index):
+        buttons = self._get_tab_buttons()
+        for button in buttons:
+            if button.buttonIndex == index:
+                return button
+        raise _common.ToolkitException(
+            'There is no tab button with index {0}.'.format(index))

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_tabs.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,41 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+class Tabs(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """Tabs Autopilot emulator."""
+
+    def get_current_tab(self):
+        """Return the currently selected tab."""
+        return self._get_tab(self.selectedTabIndex)
+
+    def _get_tab(self, index):
+        tabs = self._get_tabs()
+        for tab in tabs:
+            if tab.index == index:
+                return tab
+        else:
+            raise _common.ToolkitException(
+                'There is no tab with index {0}.'.format(index))
+
+    def _get_tabs(self):
+        return self.select_many('Tab')
+
+    def get_number_of_tabs(self):
+        """Return the number of tabs."""
+        return len(self._get_tabs())

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,88 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from autopilot import platform
+
+from ubuntuuitoolkit._custom_proxy_objects import (
+    _common,
+    _mainview
+)
+
+
+class TextField(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """TextField Autopilot emulator."""
+
+    def __init__(self, *args):
+        super(TextField, self).__init__(*args)
+        self.keyboard = _common.get_keyboard()
+
+    def write(self, text, clear=True):
+        """Write into the text field.
+
+        :parameter text: The text to write.
+        :parameter clear: If True, the text field will be cleared before
+            writing the text. If False, the text will be appended at the end
+            of the text field. Default is True.
+
+        """
+        with self.keyboard.focused_type(self):
+            self.focus.wait_for(True)
+            if clear:
+                self.clear()
+            else:
+                if not self.is_empty():
+                    self.keyboard.press_and_release('End')
+            self.keyboard.type(text)
+
+    def clear(self):
+        """Clear the text field."""
+        if not self.is_empty():
+            if self.hasClearButton:
+                self._click_clear_button()
+            else:
+                self._clear_with_keys()
+            self.text.wait_for('')
+
+    def is_empty(self):
+        """Return True if the text field is empty. False otherwise."""
+        return self.text == ''
+
+    def _click_clear_button(self):
+        clear_button = self.select_single(
+            'AbstractButton', objectName='clear_button')
+        if not clear_button.visible:
+            self.pointing_device.click_object(self)
+        self.pointing_device.click_object(clear_button)
+
+    def _clear_with_keys(self):
+        if platform.model() == 'Desktop':
+            self._select_all()
+        else:
+            # Touch tap currently doesn't have a press_duration parameter, so
+            # we can't show the popover. Reported as bug http://pad.lv/1268782
+            # --elopio - 2014-01-13
+            self.keyboard.press_and_release('End')
+        while not self.is_empty():
+            # We delete with backspace because the on-screen keyboard has that
+            # key.
+            self.keyboard.press_and_release('BackSpace')
+
+    def _select_all(self):
+        self.pointing_device.click_object(self, press_duration=1)
+        root = self.get_root_instance()
+        main_view = root.select_single(_mainview.MainView)
+        popover = main_view.get_action_selection_popover('text_input_popover')
+        popover.click_button_by_text('Select All')

=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,106 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+class Toolbar(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """Toolbar Autopilot emulator."""
+
+    @autopilot_logging.log_action(logger.info)
+    def open(self):
+        """Open the toolbar if it's not already opened.
+
+        :return: The toolbar.
+
+        """
+        self.animating.wait_for(False)
+        if not self.opened:
+            self._drag_to_open()
+            self.opened.wait_for(True)
+            self.animating.wait_for(False)
+
+        return self
+
+    def _drag_to_open(self):
+        x, y, _, _ = self.globalRect
+        line_x = x + self.width * 0.50
+        start_y = y + self.height - 1
+        stop_y = y
+
+        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
+
+    @autopilot_logging.log_action(logger.info)
+    def close(self):
+        """Close the toolbar if it's opened."""
+        self.animating.wait_for(False)
+        if self.opened:
+            self._drag_to_close()
+            self.opened.wait_for(False)
+            self.animating.wait_for(False)
+
+    def _drag_to_close(self):
+        x, y, _, _ = self.globalRect
+        line_x = x + self.width * 0.50
+        start_y = y
+        stop_y = y + self.height - 1
+
+        self.pointing_device.drag(line_x, start_y, line_x, stop_y)
+
+    @autopilot_logging.log_action(logger.info)
+    def click_button(self, object_name):
+        """Click a button of the toolbar.
+
+        The toolbar should be opened before clicking the button, or an
+        exception will be raised. If the toolbar is closed for some reason
+        (e.g., timer finishes) after moving the mouse cursor and before
+        clicking the button, it is re-opened automatically by this function.
+
+        :parameter object_name: The QML objectName property of the button.
+        :raise ToolkitException: If there is no button with that object
+            name.
+
+        """
+        # ensure the toolbar is open
+        if not self.opened:
+            raise _common.ToolkitException(
+                'Toolbar must be opened before calling click_button().')
+        try:
+            button = self._get_button(object_name)
+        except dbus.StateNotFoundError:
+            raise _common.ToolkitException(
+                'Button with objectName "{0}" not found.'.format(object_name))
+        self.pointing_device.move_to_object(button)
+        # ensure the toolbar is still open (may have closed due to timeout)
+        self.open()
+        # click the button
+        self.pointing_device.click_object(button)
+
+    def _get_button(self, object_name):
+        return self.select_single('ActionItem', objectName=object_name)
+
+    @autopilot_logging.log_action(logger.info)
+    def click_back_button(self):
+        """Click the back button of the toolbar."""
+        self.click_button('back_toolbar_button')

=== added file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,85 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Emulators was the old name for the custom proxy objects."""
+
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+logger.warning(
+    'The ubuntuuitoolkit.emulators module is deprecated. Import the autopilot '
+    'helpers from the top-level ubuntuuitoolkit module.')
+
+
+__all__ = [
+    'check_autopilot_version',
+    'get_keyboard',
+    'get_pointing_device',
+    'ActionSelectionPopover',
+    'Base',
+    'CheckBox',
+    'ComposerSheet',
+    'Empty',
+    'Flickable',
+    'Header',
+    'ItemSelector',
+    'MainView',
+    'MultiValue',
+    'OptionSelector',
+    'QQuickListView',
+    'SingleControl',
+    'SingleValue',
+    'Standard',
+    'Subtitled',
+    'TabBar',
+    'Tabs',
+    'TextField',
+    'Toolbar',
+    'ToolkitEmulatorException',
+    'UbuntuUIToolkitEmulatorBase',
+]
+
+
+from ubuntuuitoolkit import (
+    check_autopilot_version,
+    get_keyboard,
+    get_pointing_device,
+    ActionSelectionPopover,
+    Base,
+    CheckBox,
+    ComposerSheet,
+    Empty,
+    Flickable,
+    Header,
+    ItemSelector,
+    MainView,
+    MultiValue,
+    OptionSelector,
+    QQuickListView,
+    SingleControl,
+    SingleValue,
+    Standard,
+    Subtitled,
+    TabBar,
+    Tabs,
+    TextField,
+    Toolbar,
+    ToolkitException as ToolkitEmulatorException,
+    UbuntuUIToolkitCustomProxyObjectBase as UbuntuUIToolkitEmulatorBase,
+)

=== added directory 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects'
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/__init__.py'
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,136 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import time
+
+from autopilot import input
+from testtools.matchers import GreaterThan, LessThan
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+TEST_QML_WITH_CHECKBOX = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Item {
+        CheckBox {
+            checked: false
+            objectName: "test_checkbox"
+        }
+    }
+}
+""")
+
+
+TEST_QML_WITH_SWITCH = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Item {
+        Switch {
+            checked: false
+            objectName: "test_switch"
+        }
+    }
+}
+""")
+
+
+class ToggleTestCase(tests.QMLStringAppTestCase):
+
+    scenarios = [
+        ('checkbox', dict(
+            test_qml=TEST_QML_WITH_CHECKBOX, objectName='test_checkbox')),
+        ('switch', dict(
+            test_qml=TEST_QML_WITH_SWITCH, objectName='test_switch'))
+    ]
+
+    def setUp(self):
+        super(ToggleTestCase, self).setUp()
+        self.toggle = self.main_view.select_single(
+            ubuntuuitoolkit.CheckBox, objectName=self.objectName)
+        self.assertFalse(self.toggle.checked)
+
+    def test_toggle_custom_proxy_object(self):
+        self.assertIsInstance(self.toggle, ubuntuuitoolkit.CheckBox)
+
+    def test_check_toggle(self):
+        self.toggle.check()
+        self.assertTrue(self.toggle.checked)
+
+    def test_check_toggle_already_checked(self):
+        self.toggle.check()
+        with mock.patch.object(input.Pointer, 'click_object') as mock_click:
+            self.toggle.check()
+        self.assertFalse(mock_click.called)
+
+    def test_uncheck_toggle(self):
+        self.toggle.check()
+        self.toggle.uncheck()
+        self.assertFalse(self.toggle.checked)
+
+    def test_uncheck_toggle_already_unchecked(self):
+        with mock.patch.object(input.Pointer, 'click_object') as mock_click:
+            self.toggle.uncheck()
+        self.assertFalse(mock_click.called)
+
+    def test_change_state_from_checked(self):
+        self.toggle.check()
+        self.toggle.change_state()
+        self.assertFalse(self.toggle.checked)
+
+    def test_change_state_from_unchecked(self):
+        self.toggle.change_state()
+        self.assertTrue(self.toggle.checked)
+
+    def test_check_with_timeout(self):
+        with mock.patch.object(
+                ubuntuuitoolkit.CheckBox, 'change_state') as mock_change:
+            self.toggle.check(timeout=1)
+
+        mock_change.assert_called_once_with(1)
+
+    def test_uncheck_with_timeout(self):
+        self.toggle.check()
+        with mock.patch.object(
+                ubuntuuitoolkit.CheckBox, 'change_state') as mock_change:
+            self.toggle.uncheck(timeout=1)
+
+        mock_change.assert_called_once_with(1)
+
+    def test_change_state_with_timeout(self):
+        with mock.patch.object(self.toggle, 'pointing_device'):
+            # mock the pointing device so the checkbox is not clicked.
+            timestamp_before_call = time.time()
+            self.assertRaises(AssertionError, self.toggle.change_state, 1)
+
+        waiting_time = time.time() - timestamp_before_call
+        self.assertThat(waiting_time, GreaterThan(1))
+        self.assertThat(waiting_time, LessThan(2))

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,68 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import unittest
+
+import autopilot
+from autopilot import platform, input
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class CheckAutopilotVersionTestCase(unittest.TestCase):
+
+    def test_lower_version_should_raise_exception(self):
+        with mock.patch.object(autopilot, 'version', '1.3'):
+            self.assertRaises(
+                ubuntuuitoolkit.ToolkitException,
+                ubuntuuitoolkit.check_autopilot_version)
+
+    def test_required_version_should_succeed(self):
+        with mock.patch.object(autopilot, 'version', '1.4'):
+            ubuntuuitoolkit.check_autopilot_version()
+
+    def test_higher_version_should_succeed(self):
+        with mock.patch.object(autopilot, 'version', '1.5'):
+            ubuntuuitoolkit.check_autopilot_version()
+
+
+class UbuntuUIToolkitCustomProxyObjectBaseTestCase(tests.QMLStringAppTestCase):
+
+    def test_pointing_device(self):
+        self.assertIsInstance(self.app.pointing_device, input.Pointer)
+
+    @unittest.skipIf(platform.model() != 'Desktop', 'Desktop only')
+    def test_pointing_device_in_desktop(self):
+        self.assertIsInstance(self.app.pointing_device._device, input.Mouse)
+
+    @unittest.skipIf(platform.model() == 'Desktop', 'Phablet only')
+    def test_pointing_device_in_phablet(self):
+        self.assertIsInstance(self.app.pointing_device._device, input.Touch)
+
+    def test_custom_proxy_objects_should_check_version_on_init(self):
+        check_name = (
+            'ubuntuuitoolkit._custom_proxy_objects._common.'
+            'check_autopilot_version')
+        with mock.patch(check_name, autospec=True) as mock_check:
+            # Instantiate any custom proxy object.
+            self.main_view
+
+        mock_check.assert_called_once_with()

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,41 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class PageTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Page {
+        title: "Test title"
+    }
+}
+""")
+
+    def test_header_custom_proxy_object(self):
+        header = self.main_view.get_header()
+        self.assertIsInstance(header, ubuntuuitoolkit.Header)
+        self.assertTrue(header.visible)
+        self.assertEqual(header.title, "Test title")

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,170 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class SwipeToDeleteTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Page {
+
+        ListModel {
+            id: testModel
+
+            ListElement {
+                name: "listitem_destroyed_on_remove_with_confirm"
+                label: "Item destroyed on remove with confirmation"
+                confirm: true
+            }
+            ListElement {
+                name: "listitem_destroyed_on_remove_without_confirm"
+                label: "Item destroyed on remove without confirmation"
+                confirm: false
+            }
+        }
+
+        Column {
+            anchors { fill: parent }
+
+            Standard {
+                objectName: "listitem_standard"
+                confirmRemoval: true
+                removable: true
+                text: 'Slide to remove'
+            }
+
+            Empty {
+                objectName: "listitem_empty"
+            }
+
+            Standard {
+                objectName: "listitem_without_confirm"
+                confirmRemoval: false
+                removable: true
+                text: "Item without delete confirmation"
+            }
+
+            ListView {
+                anchors { left: parent.left; right: parent.right }
+                height: childrenRect.height
+                model: testModel
+
+                delegate: Standard {
+                    removable: true
+                    confirmRemoval: confirm
+                    onItemRemoved: testModel.remove(index)
+                    text: label
+                    objectName: name
+                }
+            }
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(SwipeToDeleteTestCase, self).setUp()
+        self._item = self.main_view.select_single(
+            ubuntuuitoolkit.Standard, objectName='listitem_standard')
+        self.assertTrue(self._item.exists())
+
+    def test_supported_class(self):
+        self.assertTrue(issubclass(
+            ubuntuuitoolkit.Base, ubuntuuitoolkit.Empty))
+        self.assertTrue(issubclass(
+            ubuntuuitoolkit.ItemSelector, ubuntuuitoolkit.Empty))
+        self.assertTrue(issubclass(
+            ubuntuuitoolkit.Standard, ubuntuuitoolkit.Empty))
+        self.assertTrue(issubclass(
+            ubuntuuitoolkit.SingleControl, ubuntuuitoolkit.Empty))
+        self.assertTrue(issubclass(
+            ubuntuuitoolkit.MultiValue, ubuntuuitoolkit.Base))
+        self.assertTrue(issubclass(
+            ubuntuuitoolkit.SingleValue, ubuntuuitoolkit.Base))
+        self.assertTrue(issubclass(
+            ubuntuuitoolkit.Subtitled, ubuntuuitoolkit.Base))
+
+    def test_standard_custom_proxy_object(self):
+        self.assertIsInstance(self._item, ubuntuuitoolkit.Standard)
+
+    def test_swipe_item(self):
+        self._item.swipe_to_delete()
+        self.assertTrue(self._item.waitingConfirmationForRemoval)
+
+    def test_swipe_item_to_right(self):
+        self._item.swipe_to_delete('right')
+        self.assertTrue(self._item.waitingConfirmationForRemoval)
+
+    def test_swipe_item_to_left(self):
+        self._item.swipe_to_delete('left')
+        self.assertTrue(self._item.waitingConfirmationForRemoval)
+
+    def test_swipe_item_to_wrong_direction(self):
+        self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            self._item.swipe_to_delete, 'up')
+
+    def test_delete_item_moving_right(self):
+        self._item.swipe_to_delete('right')
+        self._item.confirm_removal()
+        self.assertFalse(self._item.exists())
+
+    def test_delete_item_moving_left(self):
+        self._item.swipe_to_delete('left')
+        self._item.confirm_removal()
+        self.assertFalse(self._item.exists())
+
+    def test_delete_non_removable_item(self):
+        self._item = self.main_view.select_single(
+            ubuntuuitoolkit.Empty, objectName='listitem_empty')
+        self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self._item.swipe_to_delete)
+
+    def test_confirm_removal_when_item_was_not_swiped(self):
+        self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self._item.confirm_removal)
+
+    def test_delete_item_without_confirm(self):
+        item = self.main_view.select_single(
+            ubuntuuitoolkit.Standard, objectName='listitem_without_confirm')
+        item.swipe_to_delete()
+        self.assertFalse(item.exists())
+
+    def test_delete_item_with_confirmation_that_will_be_destroyed(self):
+        item = self.main_view.select_single(
+            ubuntuuitoolkit.Standard,
+            objectName='listitem_destroyed_on_remove_with_confirm')
+        item.swipe_to_delete()
+        item.confirm_removal()
+        self.assertFalse(item.exists())
+
+    def test_delete_item_without_confirmation_that_will_be_destroyed(self):
+        item = self.main_view.select_single(
+            ubuntuuitoolkit.Standard,
+            objectName='listitem_destroyed_on_remove_without_confirm')
+        item.swipe_to_delete()
+        self.assertFalse(item.exists())

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,132 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class MainViewTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+}
+""")
+
+    def test_main_view_custom_proxy_object(self):
+        self.assertIsInstance(self.main_view, ubuntuuitoolkit.MainView)
+
+    def test_get_header_without_header(self):
+        header = self.main_view.get_header()
+        self.assertFalse(header.visible)
+
+    def test_toolbar_custom_proxy_object(self):
+        toolbar = self.main_view.get_toolbar()
+        self.assertIsInstance(toolbar, ubuntuuitoolkit.Toolbar)
+
+    def test_open_toolbar(self):
+        with mock.patch.object(ubuntuuitoolkit.Toolbar, 'open') as mock_open:
+            self.main_view.open_toolbar()
+
+        mock_open.assert_called_once_with()
+
+    def test_close_toolbar(self):
+        with mock.patch.object(ubuntuuitoolkit.Toolbar, 'close') as mock_close:
+            self.main_view.close_toolbar()
+
+        mock_close.assert_called_once_with()
+
+    def test_open_toolbar_returns_the_toolbar(self):
+        toolbar = self.main_view.open_toolbar()
+        self.assertIsInstance(toolbar, ubuntuuitoolkit.Toolbar)
+
+    def test_get_tabs_without_tabs(self):
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self.main_view.get_tabs)
+        self.assertEqual(
+            str(error), 'The MainView has no Tabs.')
+
+    def test_switch_to_next_tab_without_tabs(self):
+        header = self.main_view.get_header()
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            header.switch_to_next_tab)
+        self.assertEqual(
+            str(error), 'The MainView has no Tabs.')
+
+
+class GoBackTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    PageStack {
+        id: pageStack
+        Component.onCompleted: push(page0)
+
+        Page {
+            id: page0
+            title: "Page 0"
+            visible: false
+
+            Button {
+                objectName: "go_to_page1"
+                text: "Go to page 1"
+                onClicked: pageStack.push(page1)
+            }
+        }
+
+        Page {
+            id: page1
+            title: "Page 1"
+            visible: false
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(GoBackTestCase, self).setUp()
+        self.header = self.main_view.get_header()
+        self.assertEqual(self.header.title, 'Page 0')
+
+    def test_open_page(self):
+        self._go_to_page1()
+        self.assertEqual(self.header.title, 'Page 1')
+
+    def _go_to_page1(self):
+        button = self.main_view.select_single(
+            'Button', objectName='go_to_page1')
+        self.pointing_device.click_object(button)
+
+    def test_go_back(self):
+        self._go_to_page1()
+        self.main_view.go_back()
+        self.assertEqual(self.header.title, 'Page 0')

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,172 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from autopilot.introspection import dbus
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class ActionSelectionPopoverTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Button {
+        objectName: "open_popover"
+        text: "Open Popover"
+        onClicked: testActionsPopover.show();
+    }
+
+    Label {
+        id: "label"
+        objectName: "clicked_label"
+        anchors.centerIn: parent
+        text: "Button not clicked."
+    }
+
+    ActionSelectionPopover {
+        objectName: "test_actions_popover"
+        id: testActionsPopover
+        actions: ActionList {
+            Action {
+                text: "Action one"
+                onTriggered: label.text = "Button clicked."
+            }
+        }
+    }
+}
+""")
+
+    def test_action_selection_popover_custom_proxy_object(self):
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        self.assertIsInstance(popover, ubuntuuitoolkit.ActionSelectionPopover)
+
+    def test_click_action_select_popover_button(self):
+        label = self.app.select_single('Label', objectName='clicked_label')
+        self.assertNotEqual(label.text, 'Button clicked.')
+        self._open_popover()
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        popover.click_button_by_text('Action one')
+        self.assertEqual(label.text, 'Button clicked.')
+
+    def _open_popover(self):
+        open_button = self.main_view.select_single(
+            'Button', objectName='open_popover')
+        self.pointing_device.click_object(open_button)
+
+    def test_click_unexisting_button(self):
+        self._open_popover()
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, popover.click_button_by_text,
+            'unexisting')
+        self.assertEqual(
+            str(error), 'Button with text "unexisting" not found.')
+
+    def test_click_button_with_closed_popover(self):
+        popover = self.main_view.get_action_selection_popover(
+            'test_actions_popover')
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, popover.click_button_by_text,
+            'Action one')
+        self.assertEqual(
+            str(error), 'The popover is not open.')
+
+
+class ComposerSheetTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Button {
+        objectName: "openComposerSheetButton"
+        text: "Open Composer Sheet"
+        onClicked: PopupUtils.open(testComposerSheet);
+    }
+
+    Label {
+        id: "label"
+        objectName: "actionLabel"
+        anchors.centerIn: parent
+        text: "No action taken."
+    }
+
+    Component {
+        id: testComposerSheet
+        ComposerSheet {
+            id: sheet
+            objectName: "testComposerSheet"
+            onCancelClicked: {
+                label.text = "Cancel selected."
+            }
+            onConfirmClicked: {
+                label.text = "Confirm selected."
+            }
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(ComposerSheetTestCase, self).setUp()
+        self.label = self.main_view.select_single(
+            'Label', objectName='actionLabel')
+        self.assertEqual(self.label.text, 'No action taken.')
+        self._open_composer_sheet()
+        self.composer_sheet = self._select_composer_sheet()
+
+    def _open_composer_sheet(self):
+        button = self.main_view.select_single(
+            'Button', objectName='openComposerSheetButton')
+        self.pointing_device.click_object(button)
+
+    def _select_composer_sheet(self):
+        return self.main_view.select_single(
+            ubuntuuitoolkit.ComposerSheet, objectName='testComposerSheet')
+
+    def test_select_composer_sheet_custom_proxy_object(self):
+        self.assertIsInstance(
+            self.composer_sheet, ubuntuuitoolkit.ComposerSheet)
+
+    def test_confirm_composer_sheet(self):
+        self.composer_sheet.confirm()
+        self.assertEqual(self.label.text, 'Confirm selected.')
+        self._assert_composer_sheet_is_closed()
+
+    def _assert_composer_sheet_is_closed(self):
+        self.assertRaises(
+            dbus.StateNotFoundError, self._select_composer_sheet)
+
+    def test_cancel_composer_sheet(self):
+        self.composer_sheet.cancel()
+        self.assertEqual(self.label.text, 'Cancel selected.')
+        self._assert_composer_sheet_is_closed()

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,193 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from autopilot.introspection import dbus
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class QQuickListViewTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(20)
+
+    Page {
+
+        Column {
+            id: column
+            width: units.gu(48)
+            height: units.gu(20)
+
+            Label {
+                id: clickedLabel
+                objectName: "clickedLabel"
+                text: "No element clicked."
+            }
+
+            ListView {
+                id: testListView
+                objectName: "testListView"
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: column.height - clickedLabel.paintedHeight
+                clip: true
+                model: 20
+
+                delegate: ListItem.Standard {
+                    objectName: "testListElement%1".arg(index)
+                    text: "test list element %1".arg(index)
+                    onClicked: clickedLabel.text = objectName
+                    height: units.gu(5)
+                }
+            }
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(QQuickListViewTestCase, self).setUp()
+        self.list_view = self.main_view.select_single(
+            ubuntuuitoolkit.QQuickListView, objectName='testListView')
+        self.label = self.main_view.select_single(
+            'Label', objectName='clickedLabel')
+        self.assertEqual(self.label.text, 'No element clicked.')
+
+    def test_qquicklistview_custom_proxy_object(self):
+        self.assertIsInstance(self.list_view, ubuntuuitoolkit.QQuickListView)
+
+    def test_click_element(self):
+        self.list_view.click_element('testListElement0')
+        self.assertEqual(self.label.text, 'testListElement0')
+
+    def test_click_element_outside_view_below(self):
+        # Click the first element out of view to make sure we are not scrolling
+        # to the bottom at once.
+        self.assertFalse(
+            self.list_view._is_element_clickable('testListElement5'))
+
+        self.list_view.click_element('testListElement5')
+        self.assertEqual(self.label.text, 'testListElement5')
+
+    def test_click_element_outside_view_above(self):
+        self.list_view.click_element('testListElement9')
+
+        # Click the first element out of view to make sure we are not scrolling
+        # to the top at once.
+        self.assertFalse(
+            self.list_view._is_element_clickable('testListElement4'))
+
+        self.list_view.click_element('testListElement4')
+        self.assertEqual(self.label.text, 'testListElement4')
+
+    def test_click_element_not_created_at_start(self):
+        objectName = 'testListElement19'
+        self.assertRaises(
+            dbus.StateNotFoundError,
+            self.list_view.select_single,
+            objectName=objectName)
+        self.list_view.click_element(objectName)
+
+    def test_click_unexisting_element(self):
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            self.list_view.click_element,
+            'unexisting')
+        self.assertEqual(
+            str(error), 'List element with objectName "unexisting" not found.')
+
+
+class QQuickListViewOutOfViewTestCase(tests.QMLStringAppTestCase):
+    """Test that we can make elements visible when the list is out of view."""
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(20)
+
+    Page {
+
+        Flickable {
+
+            Column {
+                id: column
+                width: units.gu(48)
+                // The column height is greater than the main view height, so
+                // the bottom of the list is out of view.
+                height: units.gu(40)
+
+                Label {
+                    id: clickedLabel
+                    objectName: "clickedLabel"
+                    text: "No element clicked."
+                }
+
+                ListView {
+                    id: testListView
+                    objectName: "testListView"
+                    anchors.left: parent.left
+                    anchors.right: parent.right
+                    height: column.height - clickedLabel.paintedHeight
+                    clip: true
+                    model: 20
+
+                    delegate: ListItem.Standard {
+                        objectName: "testListElement%1".arg(index)
+                        text: "test list element %1".arg(index)
+                        onClicked: clickedLabel.text = objectName
+                        height: units.gu(5)
+                    }
+                }
+            }
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(QQuickListViewOutOfViewTestCase, self).setUp()
+        self.list_view = self.main_view.select_single(
+            ubuntuuitoolkit.QQuickListView, objectName='testListView')
+        self.label = self.main_view.select_single(
+            'Label', objectName='clickedLabel')
+        self.assertEqual(self.label.text, 'No element clicked.')
+
+    def test_click_element_outside_view_below(self):
+        """Test that we can click an element that's out of view below.
+
+        The list is also out of view, so we must scroll from the bottom of the
+        main view.
+
+        """
+        # Test for http://pad.lv/1275060.
+        # Click the first element out of view to make sure we are not scrolling
+        # to the bottom at once.
+        self.assertFalse(
+            self.list_view._is_element_clickable('testListElement9'))
+
+        self.list_view.click_element('testListElement9')
+        self.assertEqual(self.label.text, 'testListElement9')

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,149 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class TabsTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+MainView {
+    width: units.gu(70)
+    height: units.gu(60)
+
+    Tabs {
+        id: tabs
+        Tab {
+            objectName: "tab1"
+            title: "Tab1"
+            Page {
+                tools: ToolbarItems {
+                    ToolbarButton {
+                        text: "Test1"
+                    }
+                }
+            }
+        }
+        Tab {
+            objectName: "tab2"
+            title: "Tab2"
+            Page {
+                tools: ToolbarItems {
+                    ToolbarButton {
+                        text: "Test2"
+                    }
+                }
+            }
+        }
+        Tab {
+            objectName: "tab3"
+            title: "Tab3"
+            Page {
+                tools: ToolbarItems {
+                    ToolbarButton {
+                        text: "Test3"
+                    }
+                }
+            }
+        }
+    }
+}
+""")
+
+    def test_tabs_custom_proxy_object(self):
+        self.assertIsInstance(self.main_view.get_tabs(), ubuntuuitoolkit.Tabs)
+
+    def test_get_current_tab(self):
+        tabs = self.main_view.get_tabs()
+        self.assertEqual(tabs.get_current_tab().title, 'Tab1')
+
+    def test_switch_to_next_tab_from_header(self):
+        header = self.main_view.get_header()
+        header.switch_to_next_tab()
+        current_tab = self.main_view.get_tabs().get_current_tab()
+        self.assertEqual(current_tab.title, 'Tab2')
+
+    def test_switch_to_next_tab_from_main_view(self):
+        current_tab = self.main_view.switch_to_next_tab()
+        self.assertEqual(current_tab.title, 'Tab2')
+
+    def test_switch_to_next_tab_from_last(self):
+        last_tab_index = self.main_view.get_tabs().get_number_of_tabs() - 1
+        self.main_view.switch_to_tab_by_index(last_tab_index)
+        current_tab = self.main_view.switch_to_next_tab()
+        self.assertEqual(current_tab.title, 'Tab1')
+
+    def test_switch_to_tab_by_index(self):
+        current_tab = self.main_view.switch_to_tab_by_index(2)
+        self.assertEqual(current_tab.title, 'Tab3')
+        current_tab = self.main_view.switch_to_tab_by_index(1)
+        self.assertEqual(current_tab.title, 'Tab2')
+        current_tab = self.main_view.switch_to_tab_by_index(0)
+        self.assertEqual(current_tab.title, 'Tab1')
+
+    def test_switch_to_opened_tab_is_not_opened_again(self):
+        with mock.patch.object(
+                ubuntuuitoolkit.Header, 'switch_to_next_tab') as mock_switch:
+            current_tab = self.main_view.switch_to_tab_by_index(0)
+
+        self.assertFalse(mock_switch.called)
+        self.assertEqual(current_tab.title, 'Tab1')
+
+    def test_get_number_of_tabs(self):
+        tabs = self.main_view.get_tabs()
+        self.assertEqual(tabs.get_number_of_tabs(), 3)
+
+    def test_swith_to_tab_by_index_out_of_range(self):
+        last_tab_index = self.main_view.get_tabs().get_number_of_tabs() - 1
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException,
+            self.main_view.switch_to_tab_by_index,
+            last_tab_index + 1)
+        self.assertEqual(str(error), 'Tab index out of range.')
+
+    def test_switch_to_previous_tab_from_first(self):
+        current_tab = self.main_view.switch_to_previous_tab()
+        self.assertEqual(current_tab.title, 'Tab3')
+
+    def test_switch_to_previous_tab_not_from_first(self):
+        self.main_view.switch_to_tab_by_index(1)
+        current_tab = self.main_view.switch_to_previous_tab()
+        self.assertEqual(current_tab.title, 'Tab1')
+
+    def test_switch_to_tab_by_object_name(self):
+        current_tab = self.main_view.switch_to_tab('tab3')
+        self.assertEqual(current_tab.title, 'Tab3')
+        current_tab = self.main_view.switch_to_tab('tab2')
+        self.assertEqual(current_tab.title, 'Tab2')
+        current_tab = self.main_view.switch_to_tab('tab1')
+        self.assertEqual(current_tab.title, 'Tab1')
+
+    def test_switch_to_unexisting_tab(self):
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self.main_view.switch_to_tab,
+            'unexisting')
+        self.assertEqual(
+            str(error), 'Tab with objectName "unexisting" not found.')

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,93 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class TextFieldTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Item {
+        TextField {
+            id: simpleTextField
+            objectName: "simple_text_field"
+        }
+        TextField {
+            id: textFieldWithoutClearButton
+            objectName: "text_field_without_clear_button"
+            hasClearButton: false
+            anchors.top: simpleTextField.bottom
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(TextFieldTestCase, self).setUp()
+        self.simple_text_field = self.main_view.select_single(
+            ubuntuuitoolkit.TextField, objectName='simple_text_field')
+
+    def test_text_field_custom_proxy_object(self):
+        self.assertIsInstance(
+            self.simple_text_field, ubuntuuitoolkit.TextField)
+
+    def test_write(self):
+        self.simple_text_field.write('test')
+        self.assertEqual(self.simple_text_field.text, 'test')
+
+    def test_clear_with_clear_button(self):
+        self.simple_text_field.write('test')
+        self.simple_text_field.clear()
+        self.assertEqual(self.simple_text_field.text, '')
+
+    def test_clear_without_clear_button(self):
+        text_field = self.main_view.select_single(
+            ubuntuuitoolkit.TextField,
+            objectName='text_field_without_clear_button')
+        text_field.write('test')
+        text_field.clear()
+        self.assertEqual(text_field.text, '')
+
+    def test_clear_and_write(self):
+        self.simple_text_field.write('test1')
+        self.simple_text_field.write('test2')
+        self.assertEqual(self.simple_text_field.text, 'test2')
+
+    def test_write_without_clear(self):
+        self.simple_text_field.write('test1')
+        self.simple_text_field.write('test2', clear=False)
+        self.assertEqual(self.simple_text_field.text, 'test1test2')
+
+    def test_write_without_clear_writes_at_the_end(self):
+        self.simple_text_field.write(
+            'long text that will fill more than half of the text field.')
+        self.simple_text_field.write('append', clear=False)
+        self.assertEqual(
+            self.simple_text_field.text,
+            'long text that will fill more than half of the text field.append')
+
+    def test_is_empty(self):
+        self.assertTrue(self.simple_text_field.is_empty())
+        self.simple_text_field.write('test')
+        self.assertFalse(self.simple_text_field.is_empty())

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py	2014-04-17 01:29:24 +0000
@@ -0,0 +1,121 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2013, 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+
+
+class ToolbarTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(50)
+    height: units.gu(50)
+
+    // Make sure that for these tests the toolbar starts closed.
+    Component.onCompleted: {
+        __propagated.toolbar.close();
+    }
+
+    Page {
+
+        Label {
+            id: "label"
+            objectName: "clicked_label"
+            anchors.centerIn: parent
+            text: "Button not clicked."
+        }
+
+        tools: ToolbarItems {
+            ToolbarButton {
+                objectName: "buttonName"
+                action: Action {
+                    text: "buttonText"
+                    onTriggered: label.text = "Button clicked."
+                }
+            }
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(ToolbarTestCase, self).setUp()
+        self.toolbar = self.main_view.get_toolbar()
+        # toolbar may be opened or closed now, depending on whether
+        # the application has been deactivated and resumed already
+
+    def test_open_toolbar(self):
+        self.toolbar.open()
+        self.assertTrue(self.toolbar.opened)
+        self.assertFalse(self.toolbar.animating)
+
+    def test_opened_toolbar_is_not_opened_again(self):
+        self.toolbar.open()
+        with mock.patch.object(
+                self.main_view.pointing_device, 'drag') as mock_drag:
+            self.toolbar.open()
+
+        self.assertFalse(mock_drag.called)
+        self.assertTrue(self.toolbar.opened)
+
+    def test_close_toolbar(self):
+        self.toolbar.open()
+        self.toolbar.close()
+        self.assertFalse(self.toolbar.opened)
+        self.assertFalse(self.toolbar.animating)
+
+    def test_closed_toolbar_is_not_closed_again(self):
+        self.toolbar.close()
+        with mock.patch.object(
+                self.main_view.pointing_device, 'drag') as mock_drag:
+            self.toolbar.close()
+
+        self.assertFalse(mock_drag.called)
+        self.assertFalse(self.toolbar.opened)
+
+    def test_click_toolbar_button(self):
+        self.toolbar.close()
+        label = self.app.select_single('Label', objectName='clicked_label')
+        self.assertNotEqual(label.text, 'Button clicked.')
+        self.toolbar.open()
+        self.toolbar.click_button('buttonName')
+        self.assertEqual(label.text, 'Button clicked.')
+
+    def test_click_unexisting_button(self):
+        self.main_view.open_toolbar()
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self.toolbar.click_button,
+            'unexisting')
+        self.assertEqual(
+            str(error), 'Button with objectName "unexisting" not found.')
+
+    def test_click_button_on_closed_toolbar(self):
+        self.toolbar.close()
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self.toolbar.click_button,
+            'buttonName')
+        self.assertEqual(
+            str(error),
+            'Toolbar must be opened before calling click_button().')

=== removed file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-22 06:53:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	1970-01-01 00:00:00 +0000
@@ -1,1081 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-#
-# Copyright (C) 2013 Canonical Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-import time
-import unittest
-
-import autopilot
-from autopilot import input, platform
-from autopilot.introspection import dbus
-from testtools.matchers import GreaterThan, LessThan
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
-from ubuntuuitoolkit import emulators, tests
-
-
-class CheckAutopilotVersionTestCase(unittest.TestCase):
-
-    def test_lower_version_should_raise_exception(self):
-        with mock.patch.object(autopilot, 'version', '1.3'):
-            self.assertRaises(
-                emulators.ToolkitEmulatorException,
-                emulators.check_autopilot_version)
-
-    def test_required_version_should_succeed(self):
-        with mock.patch.object(autopilot, 'version', '1.4'):
-            emulators.check_autopilot_version()
-
-    def test_higher_version_should_succeed(self):
-        with mock.patch.object(autopilot, 'version', '1.5'):
-            emulators.check_autopilot_version()
-
-
-class UbuntuUIToolkitEmulatorBaseTestCase(tests.QMLStringAppTestCase):
-
-    def test_pointing_device(self):
-        self.assertIsInstance(self.app.pointing_device, input.Pointer)
-
-    @unittest.skipIf(platform.model() != 'Desktop', 'Desktop only')
-    def test_pointing_device_in_desktop(self):
-        self.assertIsInstance(self.app.pointing_device._device, input.Mouse)
-
-    @unittest.skipIf(platform.model() == 'Desktop', 'Phablet only')
-    def test_pointing_device_in_phablet(self):
-        self.assertIsInstance(self.app.pointing_device._device, input.Touch)
-
-    def test_emulators_should_check_version_on_init(self):
-        check_name = 'ubuntuuitoolkit.emulators.check_autopilot_version'
-        with mock.patch(check_name, autospec=True) as mock_check:
-            # Instantiate any emulator.
-            self.main_view
-
-        mock_check.assert_called_once_with()
-
-
-class MainViewTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-}
-""")
-
-    def test_main_view_custom_emulator(self):
-        self.assertIsInstance(self.main_view, emulators.MainView)
-
-    def test_get_header_without_header(self):
-        header = self.main_view.get_header()
-        self.assertFalse(header.visible)
-
-    def test_toolbar_custom_emulator(self):
-        toolbar = self.main_view.get_toolbar()
-        self.assertIsInstance(toolbar, emulators.Toolbar)
-
-    def test_open_toolbar(self):
-        with mock.patch.object(emulators.Toolbar, 'open') as mock_open:
-            self.main_view.open_toolbar()
-
-        mock_open.assert_called_once_with()
-
-    def test_close_toolbar(self):
-        with mock.patch.object(emulators.Toolbar, 'close') as mock_close:
-            self.main_view.close_toolbar()
-
-        mock_close.assert_called_once_with()
-
-    def test_open_toolbar_returns_the_toolbar(self):
-        toolbar = self.main_view.open_toolbar()
-        self.assertIsInstance(toolbar, emulators.Toolbar)
-
-    def test_get_tabs_without_tabs(self):
-        error = self.assertRaises(
-            emulators.ToolkitEmulatorException, self.main_view.get_tabs)
-        self.assertEqual(
-            str(error), 'The MainView has no Tabs.')
-
-    def test_switch_to_next_tab_without_tabs(self):
-        header = self.main_view.get_header()
-        error = self.assertRaises(
-            emulators.ToolkitEmulatorException, header.switch_to_next_tab)
-        self.assertEqual(
-            str(error), 'The MainView has no Tabs.')
-
-
-class PageTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-MainView {
-    width: units.gu(48)
-    height: units.gu(60)
-
-    Page {
-        title: "Test title"
-    }
-}
-""")
-
-    def test_header_custom_emulator(self):
-        header = self.main_view.get_header()
-        self.assertIsInstance(header, emulators.Header)
-        self.assertTrue(header.visible)
-        self.assertEqual(header.title, "Test title")
-
-
-class ToolbarTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-MainView {
-    width: units.gu(50)
-    height: units.gu(50)
-
-    // Make sure that for these tests the toolbar starts closed.
-    Component.onCompleted: {
-        __propagated.toolbar.close();
-    }
-
-    Page {
-
-        Label {
-            id: "label"
-            objectName: "clicked_label"
-            anchors.centerIn: parent
-            text: "Button not clicked."
-        }
-
-        tools: ToolbarItems {
-            ToolbarButton {
-                objectName: "buttonName"
-                action: Action {
-                    text: "buttonText"
-                    onTriggered: label.text = "Button clicked."
-                }
-            }
-        }
-    }
-}
-""")
-
-    def setUp(self):
-        super(ToolbarTestCase, self).setUp()
-        self.toolbar = self.main_view.get_toolbar()
-        # toolbar may be opened or closed now, depending on whether
-        # the application has been deactivated and resumed already
-
-    def test_open_toolbar(self):
-        self.toolbar.open()
-        self.assertTrue(self.toolbar.opened)
-        self.assertFalse(self.toolbar.animating)
-
-    def test_opened_toolbar_is_not_opened_again(self):
-        self.toolbar.open()
-        with mock.patch.object(
-                self.main_view.pointing_device, 'drag') as mock_drag:
-            self.toolbar.open()
-
-        self.assertFalse(mock_drag.called)
-        self.assertTrue(self.toolbar.opened)
-
-    def test_close_toolbar(self):
-        self.toolbar.open()
-        self.toolbar.close()
-        self.assertFalse(self.toolbar.opened)
-        self.assertFalse(self.toolbar.animating)
-
-    def test_closed_toolbar_is_not_closed_again(self):
-        self.toolbar.close()
-        with mock.patch.object(
-                self.main_view.pointing_device, 'drag') as mock_drag:
-            self.toolbar.close()
-
-        self.assertFalse(mock_drag.called)
-        self.assertFalse(self.toolbar.opened)
-
-    def test_click_toolbar_button(self):
-        self.toolbar.close()
-        label = self.app.select_single('Label', objectName='clicked_label')
-        self.assertNotEqual(label.text, 'Button clicked.')
-        self.toolbar.open()
-        self.toolbar.click_button('buttonName')
-        self.assertEqual(label.text, 'Button clicked.')
-
-    def test_click_unexisting_button(self):
-        self.main_view.open_toolbar()
-        error = self.assertRaises(
-            emulators.ToolkitEmulatorException, self.toolbar.click_button,
-            'unexisting')
-        self.assertEqual(
-            str(error), 'Button with objectName "unexisting" not found.')
-
-    def test_click_button_on_closed_toolbar(self):
-        self.toolbar.close()
-        error = self.assertRaises(
-            emulators.ToolkitEmulatorException, self.toolbar.click_button,
-            'buttonName')
-        self.assertEqual(
-            str(error),
-            'Toolbar must be opened before calling click_button().')
-
-
-class TabsTestCase(tests.QMLStringAppTestCase):
-
-    test_qml = ("""
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-MainView {
-    width: units.gu(70)
-    height: units.gu(60)
-
-    Tabs {
-        id: tabs
-        Tab {
-            objectName: "tab1"
-            title: "Tab1"
-            Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
-                        text: "Test1"
-                    }
-                }
-            }
-        }
-        Tab {
-            objectName: "tab2"
-            title: "Tab2"
-            Page {
-                tools: ToolbarItems {
-                    ToolbarButton {
-                        text: "Test2"
-                    }
-                }