Merge lp:~cellsoftware/telegram-app/autopilotTest-4 into lp:telegram-app

[Paz Chauhan]

Autopilot tests added
Code changes involve adding 'objectName' attribute to necessary components in order to make them visible to autopilot
Build script updates (setup.sh and click.sh) to include new flag (-u) to include autopilot tests in click package for mobile build
README document updated with autopilot use

[Roberto Mier Escandon (rmescandon)]

Please, fix conflicts "Text conflict in telegram/app/qml/components/MessagesListItem.qml"

review: Needs Fixing

[lp:~cellsoftware/telegram-app/autopilotTest-4]

246. By Paz Chauhan on 2016-11-09

Removal of parseText function

[Paz Chauhan (paz-chauhan)]

Conflicts hopefully resolved

[Roberto Mier Escandon (rmescandon)]

Still seen conflicts here. See just below the "Diff against target" section

review: Needs Fixing

[lp:~cellsoftware/telegram-app/autopilotTest-4]

247. By Paz Chauhan on 2016-11-10

conflicts resolved

248. By Paz Chauhan on 2016-11-10

.po and .pot files reverted

[Roberto Mier Escandon (rmescandon)]

Please revert also the telegram/po complete directory

review: Needs Fixing

[lp:~cellsoftware/telegram-app/autopilotTest-4]

249. By Paz Chauhan on 2016-11-11

.po and .pot files reverted

[Roberto Mier Escandon (rmescandon)]

Just a pair of commented out lines that I'm not sure if are there left on purpose. If not remove them, please

review: Needs Fixing

[lp:~cellsoftware/telegram-app/autopilotTest-4]

250. By Paz Chauhan on 2016-11-14

Commented out code explained

[Roberto Mier Escandon (rmescandon)]

My experience is that on device some of the tests pass, some others not. I have not been able to pass all them ever.
In desktop version, the textbox to write messages is disabled (I see also app in "waiting for network", so seem it is related) and thus the tests are not passing (send messages cannot be executed)

I guess all this can be fixed in a later MR. For now +1

review: Approve

[Jin (jindallo)]

I can't get them all passed as well,
no further actions on Contact selection page in running oftenly,
now the DUT from me is Nexus 4 with stable channel,
still need to verify it on BQ phone later,
will report my running result here.

[Jin (jindallo)]

After .lua configured now the test cases can run well,
I approve.

review: Approve

=== modified file 'README.md'
--- README.md	2016-09-30 05:22:00 +0000
+++ README.md	2016-11-14 11:39:33 +0000
@@ -1,4 +1,4 @@
-# Telegram for Ubuntu
+# **Telegram for Ubuntu**
 
 ### TLDR;
     "./setup.sh -t mobile -dbc"  for a full mobile build
@@ -7,60 +7,216 @@
 ### How to build
 
 This build setup has been tested on:
-- Ubuntu Xenial 16.04
+- Ubuntu Vivid 15.04 with Overlay PPA enabled
 
 The following instructions assume you downloaded Telegram for Ubuntu source and changed ("cd") to the project's root directory.
 
-1)  Install build dependencies
-    If you're building for mobile devices:
-        If you don't have a 15.04 click chroot yet:
-            sudo click chroot --arch armhf --framework ubuntu-sdk-15.04 create
-        To install the build dependencies in the chroot:
-            sudo click chroot --arch armhf --framework ubuntu-sdk-15.04 maint
-            apt-get install libthumbnailer-qt-dev:armhf thumbnailer-service:armhf
-    Else if you're building for desktop, install the build dependencies using the following command:
-        sudo apt-get install libthumbnailer-qt-dev qml-module-ubuntu-connectivity qtdeclarative5-ubuntu-contacts0.1
-
-2)  Environment setup
-    Change your directory into below:
-        ~/.config/QtProject/qtcreator/ubuntu-sdk/ubuntu-sdk-15.04-armhf
-    then make a symbolic link bewteen qtc_chroot_wrapper and the make:
-        ln -s /usr/share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py make
-
-3)  Download and build the source of libqtelegram-aseman-edition library and TelegramQML plugin:
-    - Run ./setup.sh -t <build_type> -d
-    
-    The help command will show the available values for <build_type>.
-    It'll git clone both projects to the deps directory and build them (inside the click chroot, if
-    the build type chosen was "mobile").
-    You can use same command to re-build, if you have changed them, too.
-    NOTE: it may be required to modify some environment variables that drive the build process, such
+##  **Install build dependencies**
+### Device
+ If you don't have a 15.04 click chroot yet:
+    
+    $ sudo click chroot --arch armhf --framework ubuntu-sdk-15.04 create
+
+To install the build dependencies in the chroot:
+
+    $ sudo click chroot --arch armhf --framework ubuntu-sdk-15.04 maint
+
+    $ apt-get install libthumbnailer-qt-dev:armhf libthumbnailer-qt1.0:armhf thumbnailer-service:armhf
+            
+### Desktop
+   
+   Install the build dependencies using the following command:
+
+    $ sudo apt-get install libthumbnailer-qt-dev libthumbnailer-qt1.0 thumbnailer-service libqt5xmlpatterns5-dev qtdeclarative5-dev qtmultimedia5-dev libssl-dev
+
+2)  Download and build the source of libqtelegram-aseman-edition library and TelegramQML plugin:
+
+    $ ./setup.sh -t <build_type> -d
+
+The help command will show the available values for <build_type>.
+    It'll git clone both projects to the deps directory and build them (inside the click chroot, if the build type chosen was "mobile").
+You can use same command to re-build, if you have changed them, too.
+    
+   NOTE: it may be required to modify some environment variables that drive the build process, such
     as the path to qmake or make, the path to system libraries, the name of the chroot, etc.
     The env variables are grouped at the beginning of setup.sh, to make the customization easier.
     
-4)  Build Telegram for Ubuntu
-    - Run ./setup.sh -t <build_type> -b
+3)  Build Telegram for Ubuntu
+
+    $ ./setup.sh -t <build_type> -b
     
-    This will build the app in the build path defined by setup.sh 
+   This will build the app in the build path defined by setup.sh 
     and prepare everything in a directory named click in the project's root directory.
     NOTE: it may be required to modify some environment variables that drive the build process, such
     as the path to qmake or make, the path to system libraries, the name of the chroot, etc.
     The env variables are grouped at the beginning of setup.sh, to make the customization easier.
     
-5)  (Optional) Build the click package and install it using adb (requires an Ubuntu Touch 
+4)  (Optional) Build the click package and install it using adb (requires an Ubuntu Touch 
     mobile device connected via USB with developer mode enabled):
-    - Run ./setup.sh -t mobile -c
     
+    $ ./setup.sh -t mobile -c
     
 ### How to run (DESKTOP VERSION only)
 
-- cd to the path holding the binary we have just build, e.g. "cd build_desktop/lib/x86_64-linux-gnu/bin/"
-- run "LD_LIBRARY_PATH=../../../:$LD_LIBRARY_PATH ./telegram"
+cd to the path holding the binary we have just build, e.g. `$ cd build_desktop/lib/x86_64-linux-gnu/bin/`
+
+    $ LD_LIBRARY_PATH=../../../:$LD_LIBRARY_PATH ./telegram
+
 
 ### How to delete the build files
 
-- Run ./setup -t <build_type> -e
+    $ ./setup -t <build_type> -e
 
 ### How to get help
 
-- Run ./setup -h
+    $ ./setup -h
+
+----------
+
+# **Autopilot**
+
+### Install On Desktop
+To install Autopilot on a Ubuntu Desktop follow [this tutorial](https://developer.ubuntu.com/api/autopilot/python/1.5.0/guides-installation/).
+
+### Install on Device
+To install on a Ubuntu device you will need to first connect to the device via SSH:
+
+    $ adb shell
+
+Then execute the following commands:
+
+    $ sudo mount -o remount,rw /
+
+    $ sudo apt-get update
+
+    $ sudo apt-get install python3-autopilot ubuntu-ui-toolkit-autopilot -yq
+
+## **Telegram-App code changes**
+Download the following telegram-app sample project which contains the autopilot test cases and and supporting documentation such as, **Telegram-App_Code_Changes.pdf**:
+
+    $ bzr branch lp:~cellsoftware/telegram-app/autopilotTest-3
+
+**Telegram-App_Code_Changes.pdf** lists the components which need to be updated, on your on version of the telegram-app code, with the *objectName* attribute in order for them to become visible to autopilot. This document also describes certain code changes which need to be made in order for desktop tests to pass. These are mainly to do with simulating an online device.  
+
+Once downloaded, you will have created and autopilotTest-3 directory on your computer. The autopilot test scripts for **telegram-app** can be found in the following relative directory path: 
+
+> autopilotTest-3/telegram/autopilot/telegram
+
+**This directory structure must be maintained when copying the autopilot test cases to your own version of the app.**
+
+##**Test Environment**
+
+###Telegram-CLI
+All tests involving the sending and receiving of messages will involve the Telegram CLI. This can be downloaded from [GitHub](https://github.com/vysheng/tg). Follow the instructions to install and build. The Telegram CLI scripts are written in Lua and can be found in the following relative directory path:
+
+> autopilotTest-3/telegram/autopilot/CLI
+
+**This directory structure must be maintained when copying the autopilot test cases to your own version of the app.**
+
+#### Telegram CLI Launch
+
+Once downloaded cd, to the '**tg**' folder. Then execute the following command:
+
+    $ bin/telegram-cli -k tg-server.pub -W -s <location of the test script>
+
+###Test Data
+The following are prerequisites to executing the autopilot test cases:
+
+> - A Telegram user must be logged into the app
+> - The Telegram user must be signed into their Ubuntu One account
+> - The app must not be launched
+> - The device must not be screen or SIM locked
+> - The device must be on the screen displaying the apps
+> - The user must have 2 Telegram contacts defined, one of which must be the phone number used to set up the Telegram CLI 
+> - The Telegram CLI must be online
+
+## **Execution**
+
+### Desktop
+
+Before running, the **telegram-app** and its dependencies have to be built. 
+From the autopilotTest-3 directory execute the following command:
+
+    $ ./setup.sh -t desktop -db
+
+To execute the entire test suite perform the following command from the `autopilotTest-3/telegram/autopilot/` directory:
+
+    $ autopilot3 run telegram/
+
+To get a list of all individual test cases execute the following command:
+
+    $ autopilot3 list telegram/
+
+You will see an output similar to this:
+
+> *2 telegram.tests.test_Messaging.SecretMessaging.test_SecretMessage
+>     telegram.tests.test_Profile.ProfileTests.test_check_group_to_verify_members
+>     telegram.tests.test_Profile.ProfileDetails.test_verify_profile_details
+>     telegram.tests.test_Profile.ProfileTests.test_check_blocked_user
+
+The *2 next to a test case refers to the number of scenarios within that test case. Therefore executing test_SecretMessage will run the same Secret Message test case but for 2 scenarios, e.g. sending a Secret Message containing text only and sending a Secret Message containing images only.
+
+To execute all Profile tests execute the following:
+
+    $ autopilot3 run telegram.tests.test_Profile
+
+To execute all Profile Detail tests, execute the following:
+
+    $ autopilot3 run  telegram.tests.test_Profile.ProfileDetails
+
+To execute individual tests choose a test from the list, for example *telegram.tests.test_Login.Login.test_sign_in* then execute the following command:
+
+    $ autopilot3 run telegram.tests.test_Login.Login.test_sign_in
+
+### Device
+
+To execute the autopilot test cases on a device, the **telegram-app**, its dependencies and the click package have to be built and installed on the device. Once you have connected your device via USB, build the mobile version of the app using the following command:
+
+    $ ./setup.sh -t mobile -dbcu
+
+Next, navigate to the installed test suite using:
+
+    $ adb shell
+
+    $ cd /opt/click.ubuntu.com/com.ubuntu.telegram/current/autopilot
+
+The listing and executing of tests are as described in the Desktop section. 
+
+## **Notes**
+After getting Autopilot working. Here are some notes you need to do to ensure tests can be run properly:
+
+### Device
+
+During device testing the orientation should remain as portrait. Changing the orientation to landscape will cause tests to fail.
+
+### Telegram CLI
+
+If any of the test cases executed require the sending and/or receiving of messages the Telegram CLI will have to be launched, as described above. If left running for some time without activity the Telegram CLI will go offline. This may cause some autopilot tests to fail. To bring the Telegram CLI back online you can issue a CLI command, or quit the CLI by entering 'safe_quit' and relaunching.
+
+### Flags
+
+Here are the types and meanings for each flag:
+
+**-d** - Dependency - Build the dependency to support the app
+**-b** - Build - Builds and compile the app.
+**-c** - Install on device
+**-u** - Adds the autopilot tests to the click package installed on the device
+
+    $ ./setup.sh -t mobile -<flag(s)>
+For a more in-depth 'how-to' see [here](https://developer.ubuntu.com/api/autopilot/python/1.5.0/guides-running_ap/). 
+
+###Messaging
+To get messaging working correctly you need to make some code changes in 
+AccountSendMessage.qml:
+
+> 1. Enable TextArea - #155 - Change to `enabled: true`.
+> 2. Enable Sticker button (if required) - #264 - Remove `connected || !NetworkingStatus` IF statement so you only have `if
+> (!privates.emojiItem) {...}` in `onClicked:`.
+> 3. Enable Send button - #326 - Remove `connected || !NetworkingStatus` IF statement so you only have `if (state == “attach”) {...}` in
+> `onClicked:`.
+
+## **References & Tutorials**
+- [Autopilot Tutorials and Guides](https://developer.ubuntu.com/api/autopilot/python/1.5.0/)
+- [Autopilot at a glance](http://www.theorangenotebook.com/2012/11/a-glance-at-autopilot.html)
+- [Getting started with Autopilot](http://www.theorangenotebook.com/2012/11/getting-started-with-autopilot.html)
+- [Your first autopilot test case](http://www.theorangenotebook.com/2012/11/our-first-autopilot-testcase.html)

=== added file 'Telegram-App_Code_Changes.pdf'
Binary files Telegram-App_Code_Changes.pdf	1970-01-01 00:00:00 +0000 and Telegram-App_Code_Changes.pdf	2016-11-14 11:39:33 +0000 differ
=== modified file 'buildScripts/click.sh'
--- buildScripts/click.sh	2015-11-02 15:30:52 +0000
+++ buildScripts/click.sh	2016-11-14 11:39:33 +0000
@@ -6,6 +6,16 @@
     exit 1
 fi
 
+if [ "$TEST_STEP" = "y" ]; then
+    # Copy autopilot tests into click directory
+    echo "Removing old autopilot tests..."
+    rm -rf $TG_DIR/$BUILD_DIR_BASENAME/click/$AUTOPILOT_DIR || exit 1
+    echo "Adding autopilot tests to the click package..."
+    mkdir $TG_DIR/$BUILD_DIR_BASENAME/click/$AUTOPILOT_DIR || exit 1
+    # mkdir $TG_DIR/$BUILD_DIR_BASENAME/click/$AUTOPILOT_DIR_BASENAME || exit 1
+    cp -avr $TG_DIR/$AUTOPILOT_PATH $TG_DIR/$BUILD_DIR_BASENAME/click/$AUTOPILOT_DIR_BASENAME || exit 1
+fi
+
 cd $TG_DIR/$BUILD_DIR_BASENAME/ || exit 1
 click build click || exit 1
 

=== modified file 'setup.sh'
--- setup.sh	2016-04-01 08:44:31 +0000
+++ setup.sh	2016-11-14 11:39:33 +0000
@@ -37,6 +37,10 @@
     export SYSTEM_LIB_PATH=/usr/lib/arm-linux-gnueabihf
     export SYSTEM_INCLUDE_PATH=/usr/include/
     export BUILD_DIR_BASENAME=build_mobile
+    export AUTOPILOT_DIR=autopilot
+    export AUTOPILOT_APP_DIR=/telegram
+    export AUTOPILOT_DIR_BASENAME=$AUTOPILOT_DIR/$AUTOPILOT_APP_DIR
+    export AUTOPILOT_PATH=telegram/$AUTOPILOT_DIR_BASENAME
 }
 #Generic env vars
 function setTelegramEnvVars() {
@@ -65,6 +69,7 @@
 APP_STEP=n
 CLICK_STEP=n
 ERASE_STEP=n
+export TEST_STEP=n
 RESET_ENV_VARS=n
 
 function usage() {
@@ -75,9 +80,10 @@
     echo "-b        To build the telegram app."
     echo "-c        To create and install the click package (only valid if mobile build type has been selected)"
     echo "-e        To erase all build files relative to the specified build type."
+    echo "-u        To include all autopilot unit test cases in the click package (only valid if -c has been selected)."
 }
 
-while getopts "t:dbceh" opt; do
+while getopts "t:dbceuh" opt; do
     case $opt in
     t)
         case $OPTARG in
@@ -106,6 +112,9 @@
     e)
         ERASE_STEP=y
         ;;
+    u)
+        TEST_STEP=y
+        ;;
     v)
         RESET_ENV_VARS=y
         ;;
@@ -125,6 +134,12 @@
     exit 1
 fi
 
+if [ "$CLICK_STEP" = "n" ] && [ "$TEST_STEP" = "y" ]; then
+    echo "The inclusion of autopilot test cases requires the -c flag."
+    usage
+    exit 1
+fi
+
 if [ "$BUILD_TYPE" = "desktop" ]; then
     setDesktopBuildEnvVars
 else 
@@ -167,3 +182,4 @@
 if [ "$ERASE_STEP" = "y" ]; then
     source ./buildScripts/clean.sh || exit 1
 fi
+

=== modified file 'telegram/app/qml/AccountContactsPage.qml'
--- telegram/app/qml/AccountContactsPage.qml	2016-06-17 15:19:54 +0000
+++ telegram/app/qml/AccountContactsPage.qml	2016-11-14 11:39:33 +0000
@@ -17,7 +17,7 @@
 Page {
     id: page
     flickable: null
-
+    objectName: "accountContactsPage"
     header: default_header
 
     PageHeader {
@@ -113,6 +113,7 @@
         property var none: []
         property list<Action> confirm: [
             Action {
+                objectName: "createGroupChatOK"
                 iconName: "ok"
                 text: i18n.tr("OK")
                 enabled: hasGroupTitle
@@ -225,6 +226,7 @@
 
     TextField {
         id: group_chat_title_text_field
+        objectName: "groupChatTextField"
         anchors {
             top: page.header.bottom
             topMargin: isVisible ? units.gu(1) : 0
@@ -253,6 +255,7 @@
     }
 
     MultipleSelectionListView {
+        objectName: "contactList"
         id: contact_list
         anchors {
             top: group_chat_title_text_field.visible ? group_chat_title_text_field.bottom : parent.top
@@ -278,6 +281,7 @@
 
         listModel: searchTerm == "" ? contacts_model : contacts_filter_model
         listDelegate: TelegramContactsListItem {
+            objectName: "contact%1".arg(index)
             id: delegate
             telegram: page.telegram
             user: model.user

=== modified file 'telegram/app/qml/AccountDialogList.qml'
--- telegram/app/qml/AccountDialogList.qml	2016-07-19 15:15:28 +0000
+++ telegram/app/qml/AccountDialogList.qml	2016-11-14 11:39:33 +0000
@@ -57,6 +57,7 @@
 
     ListView {
         id: dialog_list
+        objectName: "dialogListView"
         anchors {
             top: parent.top
             left: parent.left
@@ -81,6 +82,7 @@
 
         delegate: DialogsListItem {
             id: list_item
+            objectName: "dialog%1".arg(index)
             anchors {
                 topMargin: units.dp(3)
                 leftMargin: units.dp(5)

=== modified file 'telegram/app/qml/AccountDialogPage.qml'
--- telegram/app/qml/AccountDialogPage.qml	2016-07-22 06:27:59 +0000
+++ telegram/app/qml/AccountDialogPage.qml	2016-11-14 11:39:33 +0000
@@ -28,6 +28,7 @@
 
     property list<Action> defaultActions: [
         Action {
+            objectName: "groupInfo"
             iconName: "stock_contact"
             text: isChat ? i18n.tr("Group Info") : i18n.tr("Profile Info")
             onTriggered: {
@@ -85,6 +86,7 @@
                 trailingActionBar.actions: message_list.inSelectionMode ? selectionActions : defaultActions
                 leadingActionBar.actions: Action {
                     id: back_action
+                    objectName: "dialogBack"
                     iconName: message_list.inSelectionMode ? "close" : "back"
                     onTriggered: {
                         if (message_list.inSelectionMode) {
@@ -213,6 +215,7 @@
 
         AccountSendMessage {
             id: send_msg
+            objectName: "accountSendMessageArea"
             anchors {
                 right: parent.right
                 bottom: parent.bottom
@@ -236,6 +239,7 @@
 
         AccountMessageList {
             id: message_list
+            objectName: "accountMessageList"
             anchors {
                 top: add_contact_header.visible ? add_contact_header.bottom : parent.top
                 right: parent.right

=== modified file 'telegram/app/qml/AccountMessageList.qml'
--- telegram/app/qml/AccountMessageList.qml	2016-11-14 02:59:38 +0000
+++ telegram/app/qml/AccountMessageList.qml	2016-11-14 11:39:33 +0000
@@ -176,6 +176,7 @@
 
     MultipleSelectionListView {
         id: mlist
+        objectName: "messagesListView"
         anchors.fill: parent
         cacheBuffer: units.gu(10) * 20
         clip: true
@@ -228,6 +229,7 @@
         listModel: messages_model
         listDelegate: MessagesListItem {
             id: message_item
+            objectName: "message%1".arg(index)
             maximumMediaHeight: acc_msg_list.maximumMediaHeight
             maximumMediaWidth: acc_msg_list.maximumMediaWidth
             message: item

=== modified file 'telegram/app/qml/AccountMessageMedia.qml'
--- telegram/app/qml/AccountMessageMedia.qml	2016-09-28 18:34:44 +0000
+++ telegram/app/qml/AccountMessageMedia.qml	2016-11-14 11:39:33 +0000
@@ -315,6 +315,7 @@
 
     MessageStatus {
         id: message_status
+        objectName: "mediaMessageStatus"
         anchors {
             bottom: parent.bottom
             bottomMargin: units.dp(4)

=== modified file 'telegram/app/qml/AccountPage.qml'
--- telegram/app/qml/AccountPage.qml	2016-07-11 16:11:59 +0000
+++ telegram/app/qml/AccountPage.qml	2016-11-14 11:39:33 +0000
@@ -75,6 +75,7 @@
 
     AccountPanel {
         id: account_panel
+        objectName:"accountPanel"
         anchors {
             left: parent.left
             top: parent.top
@@ -168,6 +169,7 @@
 
     AccountDialogList {
         id: dialogs
+        objectName: "accountDialogList"
         anchors{
             fill: parent
             topMargin: account_page.header.height
@@ -289,6 +291,7 @@
     header: default_header
     PageHeader {
         id: default_header
+        objectName: "defaultHeader"
         visible: account_page.header === default_header
         title: {
             if (NetworkingStatus.online) {
@@ -305,6 +308,7 @@
             }
         }
         leadingActionBar.actions: Action {
+            objectName: "navigationMenu"
             iconName: "navigation-menu"
             onTriggered: {
                 account_panel.opened ? account_panel.close() : account_panel.open()

=== modified file 'telegram/app/qml/AccountSendMessage.qml'
--- telegram/app/qml/AccountSendMessage.qml	2016-04-22 10:35:16 +0000
+++ telegram/app/qml/AccountSendMessage.qml	2016-11-14 11:39:33 +0000
@@ -139,6 +139,7 @@
 
     TextArea {
         id: txt
+        objectName: "sendMessageTextArea"
 
         property int oldLength: 0
 
@@ -152,6 +153,9 @@
 
         // This value is to avoid letter and underline being cut off.
         height: units.gu(4.3)
+
+        // To work on desktop change the following line to:
+        // enabled: True
         enabled: NetworkingStatus.online && telegramObject.connected
         visible: !messagePlaceholder.visible
         // TRANSLATORS: Placeholder for the message input text area.
@@ -297,6 +301,7 @@
 
         MouseArea {
             id: send_mouse_area
+            objectName: "sendMouseArea"
             height: parent.height
             width: units.gu(6)
             enabled: telegramObject.connected
@@ -323,6 +328,8 @@
             onClicked: {
                 Qt.inputMethod.commit();
 
+                // To work on desktop change the following line to:
+                // if (!telegramObject.connected) return
                 if (!telegramObject.connected || !NetworkingStatus.online) return
 
                 if (state == "attach") {

=== modified file 'telegram/app/qml/AccountSettings.qml'
--- telegram/app/qml/AccountSettings.qml	2016-07-13 09:13:36 +0000
+++ telegram/app/qml/AccountSettings.qml	2016-11-14 11:39:33 +0000
@@ -194,6 +194,7 @@
         }
 
         ListItem.Standard {
+            objectName: "listItem_logout"
             showDivider: true
             text: i18n.tr("Log out") + " | " + telegram.phoneNumber
             onClicked: PopupUtils.open(logout_dialog_component)
@@ -282,6 +283,7 @@
     }
 
     ListView {
+        objectName: "settingsList"
         anchors {
             topMargin: units.gu(2)
             top: profile_image.bottom
@@ -297,9 +299,11 @@
         id: logout_dialog_component
         Popup.Dialog {
             id: logout_dialog
+            objectName: "logoutDialog"
             title: i18n.tr("Telegram")
             text: i18n.tr("Are you sure you want to log out?\nAny secret chats will be lost.")
             Button {
+                objectName: "logoutConfirm"
                 text: i18n.tr("OK")
                 color: UbuntuColors.orange
                 onClicked: {

=== modified file 'telegram/app/qml/AuthCountriesPage.qml'
--- telegram/app/qml/AuthCountriesPage.qml	2016-06-22 09:29:10 +0000
+++ telegram/app/qml/AuthCountriesPage.qml	2016-11-14 11:39:33 +0000
@@ -22,6 +22,7 @@
         property bool searchMode: false
         Action {
             id: searchAction
+            objectName: "searchIcon"
             iconName: "search";
             text: i18n.tr("Search");
             onTriggered:{
@@ -48,6 +49,7 @@
 
         TextField {
             id: search_text_field
+            objectName: "countryField"
             visible: choose_header.searchMode
             anchors {
                 right: parent ? parent.right : undefined

=== modified file 'telegram/app/qml/AuthNumberPage.qml'
--- telegram/app/qml/AuthNumberPage.qml	2016-06-23 07:07:53 +0000
+++ telegram/app/qml/AuthNumberPage.qml	2016-11-14 11:39:33 +0000
@@ -84,6 +84,9 @@
             height: phone_number.height
             anchors.horizontalCenter: parent.horizontalCenter
             text: i18n.tr("Done")
+
+            // To work on desktop change the following line to:
+            // enabled: phoneNumber.length > 0
             enabled: isOnline && phoneNumber.length > 0
             focus: true
             onClicked: phone_number.accepted()

=== modified file 'telegram/app/qml/ProfilePage.qml'
--- telegram/app/qml/ProfilePage.qml	2016-06-27 09:22:33 +0000
+++ telegram/app/qml/ProfilePage.qml	2016-11-14 11:39:33 +0000
@@ -17,6 +17,7 @@
 Page {
     id: profile_page
     title: isChat ? i18n.tr("Group Info") : i18n.tr("Contact Info")
+    objectName: "profilePage"
 
     property Telegram telegram
     property Dialog dialog
@@ -59,6 +60,12 @@
     header: PageHeader {
         title: profile_page.title
         trailingActionBar.actions: isChat ? groupActions : noActions
+        leadingActionBar.actions: Action {
+            id: back_action
+            objectName: "profileBack"
+            iconName: "back"
+            onTriggered: pageStack.removePages(profile_page);
+        }
     }
 
     signal openDialog(var dialogId)
@@ -186,6 +193,7 @@
 
     MediaImport {
         id: photo_importer
+        objectName: "profileImageImport"
         contentType: ContentType.Pictures
 
         onMediaReceived: {
@@ -235,6 +243,7 @@
 
     ClickableContactImage {
         id: profile_image
+        objectName: "profileImage"
         anchors {
             top: parent.top
             topMargin: units.gu(2) + profile_page.header.height
@@ -388,6 +397,7 @@
                 spacing: units.dp(4)
 
                 Label {
+                    objectName: "profilePhoneNumber"
                     verticalAlignment: Text.AlignVCenter
                     horizontalAlignment: Text.AlignLeft
                     fontSize: "large"
@@ -449,6 +459,7 @@
                 spacing: units.dp(4)
 
                 Label {
+                    objectName: "profileUserName"
                     id: username_label
                     fontSize: "large"
                     font.family: "Helvetica"
@@ -621,6 +632,7 @@
 
         Switch {
             id: block_check
+            objectName: "switchBlock"
 
             property bool silentChecked
             property bool override: false
@@ -656,6 +668,7 @@
 
     ListView {
         id: participants_list
+        objectName: "memberListView"
         anchors {
             top: blocked_row.bottom
             topMargin: units.gu(2)
@@ -669,6 +682,7 @@
         model: chat_participants_model
         delegate: TelegramContactsListItem {
             id: contact_item
+            objectName: "dialog%1".arg(index)
             telegram: profile_page.telegram
             user: telegram.user(item.userId)
 

=== modified file 'telegram/app/qml/components/AccountPanel.qml'
--- telegram/app/qml/components/AccountPanel.qml	2016-04-08 06:26:31 +0000
+++ telegram/app/qml/components/AccountPanel.qml	2016-11-14 11:39:33 +0000
@@ -72,6 +72,7 @@
             }
 
             AccountPanelItem {
+                objectName:"groupChatItem"
                 icon: "../files/menu_newgroup.png"
                 text: i18n.tr("New Group")
                 showDivider: false
@@ -81,6 +82,7 @@
                 }
             }
             AccountPanelItem {
+                objectName:"secretChatItem"
                 icon: "../files/menu_secret.png"
                 text: i18n.tr("New Secret Chat")
                 onClicked: {
@@ -89,6 +91,7 @@
                 }
             }
             AccountPanelItem {
+                objectName:"panelContacts"
                 icon: "../files/menu_contacts.png"
                 text: i18n.tr("Contacts")
                 showDivider: false
@@ -98,6 +101,7 @@
                 }
             }
             AccountPanelItem {
+                objectName:"panelSettings"
                 icon: "../files/menu_settings.png"
                 text: i18n.tr("Settings")
                 showDivider: false

=== modified file 'telegram/app/qml/components/AttachPanel.qml'
--- telegram/app/qml/components/AttachPanel.qml	2015-10-01 14:19:18 +0000
+++ telegram/app/qml/components/AttachPanel.qml	2016-11-14 11:39:33 +0000
@@ -81,6 +81,7 @@
             spacing: units.gu(2.8)
 
             AttachPanelItem {
+                objectName: "panelPhoto"
                 id: attach_photo_item
                 // TRANSLATORS: Used in attach menu, when sending a photo to the conversation.
                 text: i18n.tr("Photo")
@@ -94,6 +95,7 @@
 
             AttachPanelItem {
                 // TRANSLATORS: Used in attach menu, when sending a video to the conversation.
+                objectName: "panelVideo"
                 text: i18n.tr("Video")
                 image: Qt.resolvedUrl("qrc:/qml/files/android/attach_video.png")
                 onClicked: {
@@ -105,6 +107,7 @@
 
             AttachPanelItem {
                 // TRANSLATORS: Used in attach menu, when sending a file to the conversation.
+                objectName: "panelFile"
                 text: i18n.tr("File")
                 image: Qt.resolvedUrl("qrc:/qml/files/android/attach_file.png")
                 onClicked: {
@@ -115,6 +118,7 @@
             }
 
             AttachPanelItem {
+                objectName: "panelClose"
                 height: attach_photo_item.height
                 // TRANSLATORS: Used in attach menu, when sending a file to the conversation.
                 image: Qt.resolvedUrl("qrc:/qml/files/android/attach_hide1.png")

=== modified file 'telegram/app/qml/components/MediaImport.qml'
--- telegram/app/qml/components/MediaImport.qml	2016-04-08 06:08:04 +0000
+++ telegram/app/qml/components/MediaImport.qml	2016-11-14 11:39:33 +0000
@@ -40,6 +40,7 @@
 
         Popups.PopupBase {
             id: dialogue
+            objectName: "mediaImportPopup"
 
             property alias activeTransfer: signalConnections.target
             focus: true
@@ -49,6 +50,7 @@
 
                 ContentHub.ContentPeerPicker {
                     id: peerPicker
+                    objectName: "contentPeerPicker"
 
                     anchors.fill: parent
                     contentType: root.contentType

=== modified file 'telegram/app/qml/components/MessageStatus.qml'
--- telegram/app/qml/components/MessageStatus.qml	2016-05-11 10:18:15 +0000
+++ telegram/app/qml/components/MessageStatus.qml	2016-11-14 11:39:33 +0000
@@ -52,6 +52,7 @@
 
         Image {
             id: status_image
+            objectName: "statusImage"
             anchors.verticalCenter: parent.verticalCenter
             width: units.gu(2)
             height: width

=== modified file 'telegram/app/qml/components/MessagesListItem.qml'
--- telegram/app/qml/components/MessagesListItem.qml	2016-11-01 21:03:10 +0000
+++ telegram/app/qml/components/MessagesListItem.qml	2016-11-14 11:39:33 +0000
@@ -245,6 +245,7 @@
                 
                 AccountMessageMedia {
                     id: message_media
+                    objectName: "accountMessageMedia"
                     message: message_item.message
                     visible: message_media.hasMedia && !uploading
                     showStatus: !hasLink
@@ -268,6 +269,7 @@
 
                     Label {
                         id: message_text
+                        objectName: "messageText"
 
                         anchors {
                             top: parent.top
@@ -296,6 +298,7 @@
 
                     MessageStatus {
                         id: message_status
+                        objectName: "messageStatus"
                         anchors {
                             top: message_text.bottom
                             right: parent.right

=== modified file 'telegram/app/qml/telegram.qml'
--- telegram/app/qml/telegram.qml	2016-07-19 15:15:28 +0000
+++ telegram/app/qml/telegram.qml	2016-11-14 11:39:33 +0000
@@ -235,6 +235,7 @@
     }
 
     AdaptivePageLayout {
+        objectName: "APL"
         id: pageStack
 
         property bool forceSinglePage: false

=== added directory 'telegram/autopilot'
=== added directory 'telegram/autopilot/CLI'
=== added file 'telegram/autopilot/CLI/canonical-logo.png'
Binary files telegram/autopilot/CLI/canonical-logo.png	1970-01-01 00:00:00 +0000 and telegram/autopilot/CLI/canonical-logo.png	2016-11-14 11:39:33 +0000 differ
=== added file 'telegram/autopilot/CLI/test_receive_response.lua'
--- telegram/autopilot/CLI/test_receive_response.lua	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/CLI/test_receive_response.lua	2016-11-14 11:39:33 +0000
@@ -0,0 +1,149 @@
+function on_msg_receive (msg)
+
+	status_online(ok_cb, false);
+
+	-- Uncomment, if debugging, to see all properties of objects
+	-- print ("Message From data...")
+	-- getAllData(msg.from,nil)
+	-- print ("Message To data...")
+	-- getAllData(msg.to,nil)
+	-- print ("Message data...")
+	-- getAllData(msg,nil)
+
+	-- if (msg.media ~= nil) then
+	-- 	print ("Message Media data...")
+	-- 	getAllData(msg.media,nil)
+	-- end
+
+	if msg.out then
+		return
+	end
+
+	if (msg.text == nil) and (msg.media == nil) then
+		return
+	end
+
+	if (msg.to.peer_type == "encr_chat") or (msg.to.peer_type == "chat") then
+		from_name = msg.to.print_name;
+		sleep_timer = 2;
+	else
+		from_name = msg.from.print_name;
+		sleep_timer = 3;
+	end
+
+	if (msg.text ~= nil) and string.find(msg.text, "INSTANT") then
+		sleep_timer = 0;
+	end
+
+	if (msg.media ~= nil) then
+		sleep_timer = 3;
+	end
+	
+	if (msg.text ~= nil) then
+
+		-- wait for sender to run 'sending' confirmation checks
+		sleep(sleep_timer);
+		
+		-- mark the message as read
+		mark_read(from_name, ok_cb, false);
+
+		if string.find(msg.text, "DO NOT REPLY") then
+			return
+		end
+
+		-- generate and send an image response, if asked for
+		if string.find(msg.text, "SEND IMAGE") then
+			image_location = (string.sub( debug.getinfo(1).source, 2, string.len(debug.getinfo(1).source) - 25 ));
+			image_file = "canonical-logo.png";
+			send_photo (from_name, (image_location .. image_file), ok_cb, false);
+		else
+			-- generate and send a text response
+			reply = ("ReplyTo:" .. msg.text);
+			send_msg (from_name, reply, ok_cb, false);
+
+		end
+	end
+
+	if (msg.media ~= nil) then
+
+		-- wait for sender to run 'sending' confirmation checks
+		sleep(sleep_timer);
+
+		mark_read(from_name, ok_cb, false);
+	end
+
+	
+end
+
+
+function ok_cb (extra, success, result)
+
+end
+
+
+function on_our_id (id)
+
+end
+ 
+function on_secret_chat_created (peer)
+
+end
+ 
+function on_user_update (user)
+
+	-- Change status to online
+	status_online(ok_cb, false);
+
+end
+ 
+function on_chat_update (user)
+
+	-- Change status to online
+	status_online(ok_cb, false);
+
+end
+ 
+function on_get_difference_end ()
+
+	-- Change status to online
+	status_online(ok_cb, false);
+
+end
+ 
+function on_binlog_replay_end ()
+
+	-- Change status to online
+	status_online(ok_cb, false);
+
+end
+
+-- Helper Methods
+
+-- Sleep function to insert a delay in execution
+function sleep(n)
+  os.execute("sleep " .. tonumber(n))
+end
+
+-- Recursive function to obtain properties of an object
+function getAllData(t, prevData)
+  -- if prevData == nil, start empty, otherwise start with prevData
+  local data = prevData or {}
+
+  -- copy all the attributes from t
+  for k,v in pairs(t) do
+    data[k] = data[k] or v
+    print(string.format("Key: %s, Value:%s", k, data[k]))
+  end
+
+
+  -- get t's metatable, or exit if not existing
+  local mt = getmetatable(t)
+  if type(mt)~='table' then return data end
+
+  -- get the __index from mt, or exit if not table
+  local index = mt.__index
+  if type(index)~='table' then return data end
+
+  -- include the data from index into data, recursively, and return
+  return getAllData(index, data)
+end

=== added directory 'telegram/autopilot/telegram'
=== added file 'telegram/autopilot/telegram/__init__.py'
=== added directory 'telegram/autopilot/telegram/common'
=== added file 'telegram/autopilot/telegram/common/__init__.py'
--- telegram/autopilot/telegram/common/__init__.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/common/__init__.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,36 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+from telegram.common.utils import (
+    clean_dir,
+    delete_file,
+    get_random_string,
+    get_tests_ids_to_run,
+    get_tests_to_run,
+)
+
+
+__all__ = [
+    'clean_dir',
+    'delete_file',
+    'get_random_string',
+    'get_tests_ids_to_run',
+    'get_tests_to_run',
+]

=== added file 'telegram/autopilot/telegram/common/config.py'
--- telegram/autopilot/telegram/common/config.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/common/config.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,350 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2014-2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import configparser
+import logging
+import os
+
+from telegram.common import options
+
+logger = logging.getLogger(__name__)
+config_stack = None
+
+DEFAULT_CONF = 'ubuntu-system-tests.conf'
+KEY_DEFAULT = 'default'
+
+
+CONFIG_OPTIONS = [
+    options.Option(
+        'device_serial', help_string='Device serial'),
+    options.Option(
+        'device_password', help_string='Device password', mandatory=True),
+    options.Option(
+        'output_dir', mandatory=True,
+        help_string='Directory to store the tests results and artifacts.\n'
+                    'WARNING: This directory will have all existing content '
+                    'deleted!'),
+    options.Option(
+        'sim_0_pin', mandatory=True,
+        help_string='SIM pin for the card in the first slot'),
+    options.Option(
+        'sim_1_pin',
+        help_string='SIM pin for the card in the second slot'),
+    options.Option(
+        'wifi_ssid', mandatory=True,
+        help_string='Wi-Fi SSID used to connect during setup wizard'),
+    options.Option(
+        'wifi_password', mandatory=True,
+        help_string='Wi-Fi password used to connect during setup wizard'),
+    options.Option(
+        'device_security', default='Passcode',
+        help_string='The security method to select during setup wizard'),
+    options.Option(
+        'bluetooth_device_name',
+        help_string='Name of a nearby bluetooth pairing device'),
+    options.Option(
+        'device_phone_number',
+        help_string="The phone number of the SIM card inserted in the first "
+                    "SIM slot. This must be formatted exactly as you would "
+                    "dial it."),
+    options.Option(
+        'device_phone_number2',
+        help_string="The phone number of the SIM card inserted in the second "
+                    "SIM slot. If the device has only one SIM slot, you can "
+                    "leave this blank. This must be formatted exactly as you "
+                    "would dial it."),
+    options.Option(
+        'telephony_service_number1',
+        help_string="The phone number to call and message from "
+                    "in the telephony service. In Twilio go to "
+                    "https://www.twilio.com/user/account/"
+                    "phone-numbers/incoming and click on the number "
+                    "you want to use, then copy the 'Phone Number' "
+                    "field exactly."),
+    options.Option(
+        'telephony_service_number2',
+        help_string="The second phone number to call and message from "
+                    "in the telephony service. In Twilio go to "
+                    "https://www.twilio.com/user/account/"
+                    "phone-numbers/incoming and click on the number "
+                    "you want to use, then copy the 'Phone Number' "
+                    "field exactly."),
+    options.Option(
+        # this is a private key, that will not be exported to
+        # autopilot directly
+        '_twilio_account_sid', mandatory=True,
+        help_string='Account SID for Twilio. Please log into '
+                    'https://www.twilio.com/login '
+                    'and select \'Dashboard -> Show API Credentials\'.'
+                    'Then copy and paste the Account SID value here.'),
+    options.Option(
+        # this is a private key, that will not be exported to
+        # autopilot directly
+        '_twilio_auth_token', mandatory=True,
+        help_string='Auth token for Twilio account. Please log into '
+                    'https://www.twilio.com/login '
+                    'and select \'Dashboard -> Show API Credentials\'.'
+                    'Then copy and paste the Auth token value here.'),
+    options.Option(
+        # this is a private key, that will not be exported to
+        # autopilot directly
+        'max_unity8_retry_delay', default=30000,
+        help_string='The boundary for how long we should be retrying until '
+                    'unity8 is started'),
+    options.Option(
+        'app_startup_cold_runs', default=0,
+        help_string='How many iterations to run for the cold start app '
+                    'performance tests?'),
+    options.Option(
+        'app_startup_hot_runs', default=0,
+        help_string='How many iterations to run for the hot start app '
+                    'performance tests?'),
+    options.Option(
+        'email_outlook', default='[e-mail]',
+        help_string='@outlook.com email address to use for email tests'),
+    options.Option(
+        'password_outlook', mandatory=True,
+        help_string='@outlook.com password to use for email tests'),
+    options.Option(
+        'email_yahoo', default='[e-mail]',
+        help_string='@yahoo.com email address to use for email tests'),
+    options.Option(
+        'password_yahoo', mandatory=True,
+        help_string='@yahoo.com password to use for email tests'),
+    options.Option(
+        'username_imap', default='platform-qa-test-account',
+        help_string='IMAP username to use for email tests'),
+    options.Option(
+        'password_imap', mandatory=True,
+        help_string='IMAP password to use for email tests'),
+    options.Option(
+        'pictures_scalability_runs',
+        help_string='The different loads used for scalability pictures tests '
+                    'separated by comma'),
+    options.Option(
+        '_practitest_project_id',
+        help_string='Practitest project ID to use for retrieving test lists.'),
+    options.Option(
+        '_practitest_api_token',
+        help_string='Practitest api token used for authentication.'),
+    options.Option(
+        'country_sim', default='United States',
+        help_string='The name of the country of the SIM card to use for '
+                    'telegram login'),
+]
+
+
+def get_user_config_dir():
+    """Return the path to the user configuration directory."""
+    conf_dir = os.environ.get(
+        'XDG_CONFIG_HOME', os.path.expanduser('~/.config'))
+    return conf_dir
+
+
+def get_device_config_file_path():
+    """Return the path of the config file copied to the device."""
+    return '/tmp/ubuntu-system-tests.conf'
+
+
+def get_device_config_section():
+    """Return the name of config section to use."""
+    return os.environ.get('CONFIG_SECTION')
+
+
+def get_config_stack_from_file(file_path, config_section=None):
+    """Return config stack from specified file path."""
+    config = UbuntuSystemTestsConfig(file_path, section=config_section)
+    config.get_config_from_file()
+    return config
+
+
+def get_device_config_stack():
+    """Return the config stack variable"""
+    global config_stack
+    if not config_stack:
+        config_stack = get_config_stack_from_file(
+            get_device_config_file_path(), get_device_config_section())
+    return config_stack
+
+
+def get_test_config_values(config_stack):
+    """ Return a string containing the comma separated key=value options.
+    The list includes the config values and the temporal ones as well
+    """
+    return config_stack.get_autopilot_config_string()
+
+
+class UbuntuSystemTestsConfig():
+
+    """Class to get and save test configuration data."""
+
+    def __init__(self, file_name=None, section=None, options=None):
+        """
+        Construct the config and parser object.
+        :param file_name: Name of config file to load. Default file is used if
+                          value is not specified.
+        :param section: Name of section to use in config file. Default section
+                        is used if not specified.
+        :param options: List of options that should be specified in config.
+                        Default list of options is used if not specified.
+        """
+        user_config_dir = get_user_config_dir()
+        if not os.path.exists(user_config_dir):
+            os.mkdir(user_config_dir)
+        self.file_path = os.path.join(
+            user_config_dir, file_name or DEFAULT_CONF)
+        self.section = section or KEY_DEFAULT
+        self.parser = configparser.ConfigParser(
+            allow_no_value=True, empty_lines_in_values=False,
+            default_section=KEY_DEFAULT)
+        self.config = {}
+        self.options = options or CONFIG_OPTIONS
+
+    def set(self, option_name, value):
+        """Set a config value.
+        :param option_name: Name of config option.
+        :param value: Value to set.
+        """
+        self.config[option_name] = value
+        self.save()
+
+    def get(self, option_name, default=''):
+        """Get a config value.
+        :param option_name: Name of config option to get.
+        :param default: Value to return as default if item doesn't exist.
+        :return: Config option value if it exists. If the config option itself
+        doesn't exist, return None. Otherwise if the option exists but no value
+        is defined return the default value."""
+        return self.config.get(option_name, default)
+
+    def save(self):
+        """Save the config to file."""
+        mode = 'r+' if os.path.exists(self.file_path) else 'w'
+        with open(self.file_path, mode) as f:
+            self.parser.write(f)
+
+    def get_config_from_string(self, string):
+        """Load config from a string. This is used for selftests only.
+        :param string: Config string to load from.
+        """
+        self.parser.read_string(string)
+        self._save_config_for_section()
+
+    def get_config_from_file(self):
+        """Load config from file."""
+        self.parser.read(self.file_path)
+        self._save_config_for_section()
+
+    def _save_config_for_section(self):
+        """Save the current config for the specified section only."""
+        self.config = self.parser[self.section]
+
+    def get_missing_options(self, silent=False):
+        """Check through each required option and get a value for each one
+        that is not present.
+        :param silent: Whether to query stdin for an input value or take a
+                       default value where it exists.
+        """
+        save_required = False
+        for option in self.options:
+            if option.name in self.config:
+                # name exists, check if its mandatory and if a value exists
+                if option.mandatory and not self.config.get(option.name):
+                    # mandatory and no value exists, so get one
+                    self._get_option_value(option, silent)
+                    save_required = True
+            else:
+                # option name not in config, get a value
+                self._get_option_value(option, silent)
+                save_required = True
+        self._save_if_required(save_required)
+
+    def _save_if_required(self, save_required):
+        """Save config if it is required.
+        :param save_required: Whether to save or not.
+        """
+        if save_required:
+            self.save()
+
+    def _get_option_value(self, option, silent):
+        """Request a value for specified option.
+        :param option: Required option.
+        :param silent: Whether to query stdin or take default value.
+        """
+        if silent:
+            default = option.default
+            if default:
+                self.config[option.name] = option.default
+                logger.warning(
+                    'In silent mode no value specified for option: "{o}". '
+                    'Using default value "{v}".'.format(
+                        o=option.name, v=default))
+            else:
+                logger.warning(
+                    'In silent mode no default value specified for option: '
+                    '"{o}". Continuing with value unset.'.format(
+                        o=option.name))
+        else:
+            self._get_option_value_from_stdin(option)
+
+    def _get_option_value_from_stdin(self, option):
+        """Request option value from stdin.
+        :param option: Required option.
+        """
+        help_msg = self._get_option_help_text(option)
+        print(help_msg, end='')
+        value = self._get_value_from_user_or_default(option)
+        self.config[option.name] = value
+
+    def _get_option_help_text(self, option):
+        """Return help message for specified option.
+        :param option: Required option.
+        """
+        help_msg = option.help_string
+        default = option.default
+        if default:
+            help_msg += ' (leave blank to use default value: {})'.format(
+                default)
+        elif not option.mandatory:
+            help_msg += ' (leave blank if not required)'
+        help_msg += ': '
+        return help_msg
+
+    def _get_value_from_user_or_default(self, option):
+        """Return value from stdin or default value if no stdin value."""
+        return input() or option.default
+
+    def get_autopilot_config_string(self):
+        """Return the configuration in a string usable by Autopilot.
+
+        That is, a list of key=value pairs serparated by comma.
+
+        Any keys starting with _ will be ignored.
+
+        """
+        config = ''
+        for key, value in self.config.items():
+            if not key.startswith('_'):
+                config += '{k}={v},'.format(k=key, v=value)
+
+        # remove trailing ',' if it exists
+        if config.endswith(','):
+            config = config[:-1]
+        return config

=== added file 'telegram/autopilot/telegram/common/options.py'
--- telegram/autopilot/telegram/common/options.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/common/options.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,37 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2016 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+class Option():
+
+    """Class to represent configuration option."""
+
+    def __init__(self, name, help_string, default=None, mandatory=False):
+        """
+        Construct the Option object.
+        :param name: Name of option.
+        :param help_string: Help message to explain option to user.
+        :param default: Default value for option.
+        :param mandatory: Whether the option is mandatory or not.
+        """
+        self.name = name
+        self.help_string = help_string
+        self.default = str(default) if default else None
+        self.mandatory = mandatory

=== added file 'telegram/autopilot/telegram/common/ssh.py'
--- telegram/autopilot/telegram/common/ssh.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/common/ssh.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,199 @@
+#!/usr/bin/env python3
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import getpass
+import glob
+import os
+import re
+import socket
+import stat
+import subprocess
+
+from ubuntu_system_tests.common import (
+    get_random_string,
+    delete_file
+)
+
+SSH_IP = 'SSH_IP'
+SSH_PASSPHRASE = 'SSH_PASSPHRASE'
+SSH_PRIVATE_KEY = 'SSH_PRIVATE_KEY'
+SSH_USER = 'SSH_USER'
+
+
+def get_ssh_ip_address():
+    """Return ssh passphrase value."""
+    return os.environ.get(SSH_IP)
+
+
+def get_ssh_passphrase():
+    """Return ssh passphrase value."""
+    return os.environ.get(SSH_PASSPHRASE)
+
+
+def get_ssh_private_key():
+    """Return path to ssh private key file."""
+    return os.environ.get(SSH_PRIVATE_KEY)
+
+
+def get_ssh_user():
+    """Return ssh username value."""
+    return os.environ.get(SSH_USER)
+
+
+def _get_local_ip_address():
+    """ Retrieve the local ip address
+    :return: The ip obtained from the socket connection
+    """
+    ip = '127.0.0.1'
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.connect(("8.8.8.8", 80))
+        ip = s.getsockname()[0]
+    finally:
+        s.close()
+    return ip
+
+
+def _get_set_env_var_command(name, value):
+    """Return command to set environment variable on device."""
+    return ['--env={n}={v}'.format(n=name, v=value)]
+
+
+def _get_copy_file_to_device_command(src, dest):
+    """Return command to copy a file to the device."""
+    return ['--copy', '{s}:{d}'.format(s=src, d=dest)]
+
+
+def get_ssh_config_commands():
+    """ Retrieve a private key that can be used to connect to the host and add
+    the public key to the authorized_keys if it is not included yet. If either
+    it is not required to configure ssh or the ssh password is defined,
+    keypairs are not used and the function return None
+    """
+    cmds = []
+    cmds.extend(_get_set_env_var_command(SSH_IP, _get_local_ip_address()))
+    cmds.extend(_get_set_env_var_command(SSH_USER, getpass.getuser()))
+
+    # Add the private key and the passphrase when it is needed
+    private_key = get_valid_key()
+    if not private_key:
+        private_key, public_key = generate_keypair(get_random_string(10))
+        add_public_key_to_ssh_uthorized_keys(public_key)
+        os.remove(public_key)
+
+    device_key_file = get_device_keyfile_path(private_key)
+    cmds.extend(_get_set_env_var_command(
+        SSH_PASSPHRASE, _get_key_passprhase(private_key)))
+    cmds.extend(_get_set_env_var_command(SSH_PRIVATE_KEY, device_key_file))
+    cmds.extend(_get_copy_file_to_device_command(private_key, device_key_file))
+    return cmds
+
+
+def _get_key_passprhase(private_key):
+    """ Get the passphrase from the name, None if it is not found """
+    keyname = os.path.basename(private_key)
+    match = re.search(r'test_(.+)_key', keyname)
+    if match:
+        return match.group(1)
+    else:
+        return
+
+
+def _get_ssh_authorized_keys_path():
+    path = os.path.join(os.path.expanduser('~'), '.ssh', 'authorized_keys')
+    directory = os.path.dirname(path)
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+    if not os.path.exists(path):
+        file = open(path, 'w')
+        file.close()
+    return path
+
+
+def is_authorized_key(id):
+    """ Indicate if the comment it is part of the ssh authorized_keys file
+    :param id: a string used to identify the public key. Currently the
+    passphrase is being used for that
+    """
+    authorized_keys = _get_ssh_authorized_keys_path()
+    command_check = ['grep', '"{c}"'.format(c=id), authorized_keys]
+    return subprocess.call(command_check, stdout=subprocess.PIPE) == 0
+
+
+def add_public_key_to_ssh_uthorized_keys(public_key):
+    """ Add the public key to the ssh authorized_keys if is not included yet"""
+    # In case the public key is not authorized yet, add it to the
+    # authorized_keys file
+    authorized_keys = _get_ssh_authorized_keys_path()
+    command_add = 'cat {public_key} >> {authorized_keys}'.format(
+        public_key=public_key, authorized_keys=authorized_keys)
+    subprocess.call(command_add, shell=True)
+
+
+def get_valid_key():
+    """ Retrieve a private key which has its public key is already authorized
+    to be used through ssh
+    """
+    all_keys = get_all_defined_keys()
+    for key in all_keys:
+        passphrase = _get_key_passprhase(key)
+        if passphrase and is_authorized_key(passphrase):
+            return key
+    return
+
+
+def get_all_defined_keys():
+    """ Retrieve the keys already saved in the tmp dir """
+    return glob.glob('/tmp/test_*_key')
+
+
+def generate_keypair(passphrase):
+    """ Create a pair of keys with the passphrase as part of the key names """
+    keypath = '/tmp/test_{}_key'.format(passphrase)
+    command = 'ssh-keygen -t rsa -b 4096 -C "{p}" -P "{p}" -f {k} -q'
+    command = command.format(p=passphrase,
+                             k=keypath)
+    subprocess.check_call(command, shell=True)
+    return keypath, keypath + '.pub'
+
+
+def get_device_keyfile_path(filepath):
+    """Return the path of the config file copied to the device."""
+    return os.path.join('/tmp', os.path.basename(filepath))
+
+
+def prepare_device_keys():
+    """ Prepare the keyfile to be used by changing the ownership and the
+    permissions. These changes are done when other ssh authentication
+    mechanisms have not being selected
+    """
+    passphrase = get_ssh_passphrase()
+    key_file = get_ssh_private_key()
+
+    if passphrase and key_file and os.path.isfile(key_file):
+        os.chown(key_file, os.getuid(), os.getgid())
+        os.chmod(key_file, stat.S_IREAD)
+
+
+def ensure_device_keyfile_deleted():
+    """ Delete the private key file in the device when required  """
+    key_file = get_ssh_private_key()
+    not key_file or delete_file(key_file)

=== added file 'telegram/autopilot/telegram/common/utils.py'
--- telegram/autopilot/telegram/common/utils.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/common/utils.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,87 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import inspect
+import os
+import random
+import shutil
+import string
+
+
+def clean_dir(dir_path):
+    """Delete all the content of the directory"""
+    if os.path.isdir(dir_path):
+        for obj in os.listdir(dir_path):
+            _delete(os.path.join(dir_path, obj))
+
+
+def _delete(obj):
+    """ Delete an object which could be either a file or a dir """
+    if os.path.isfile(obj):
+        os.remove(obj)
+    else:
+        shutil.rmtree(obj, True)
+
+
+def delete_file(file_name):
+    """Delete the file passed as parameter. In case the file does not
+    exist, the deletion is skipped"""
+    if os.path.isfile(file_name):
+        os.unlink(file_name)
+
+
+def get_random_string(length=10):
+    """Get a string with random content"""
+    return ''.join(random.choice(string.ascii_uppercase) for i in
+                   range(length))
+
+
+def get_tests_ids_to_run(tests_module=None, testsuite_list_filepath=None):
+    """Return a list of the test ids to run in the test bed.
+
+    :param tests_module: The module that contains the Ubuntu System Tests.
+        Default value is ubuntu_system_tests.tests. Currently, a value other
+        than the default is used only for self-testing.
+
+    """
+    tests_from_config = get_tests_to_run()
+    if tests_from_config:
+        return tests_from_config.split()
+
+    # If we do this at the module level then we need to have unity8 and UITK on
+    # the host and would rather avoid this
+    from ubuntu_system_tests import external_tests
+    test_ids = external_tests.get_external_test_ids(testsuite_list_filepath)
+
+    if tests_module is None:
+        # We delay the import so this is only executed in the test bed, not on
+        # the host which might have a different version of the libraries used
+        # in the system tests.
+        from ubuntu_system_tests import tests
+        tests_module = tests
+
+    if inspect.ismodule(tests_module):
+        test_ids.append(tests_module.__name__)
+
+    return test_ids
+
+
+def get_tests_to_run():
+    return os.getenv('TESTS_TO_RUN')

=== added file 'telegram/autopilot/telegram/emulators.py'
--- telegram/autopilot/telegram/emulators.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/emulators.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,550 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2016 Canonical
+#
+# This file is part of telegram-app.
+#
+# telegram-app is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+
+"""Telegram app autopilot emulators."""
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection.dbus import StateNotFoundError
+from autopilot.utilities import sleep
+from autopilot import platform
+
+from ubuntuuitoolkit import emulators as toolkit_emulators
+from ubuntuuitoolkit._custom_proxy_objects import _common
+from ubuntuuitoolkit._custom_proxy_objects._common import is_maliit_process_running
+#from ubuntu_keyboard.emulators.keyboard import Keyboard as UbuntuKeyboard
+#from address_book_app import address_book
+
+from telegram import utilities
+
+import logging
+import time
+import dbus
+
+# from telegram.helpers.notifications.utils import Notifications
+
+
+#logger = logging.getLogger(__name__)
+class MainView(toolkit_emulators.MainView):
+
+    def __init__(self, *args):
+        super(MainView, self).__init__(*args)
+        self.pointing_device = toolkit_emulators.get_pointing_device()
+        self._account_page = None
+        self._apl = None
+        self._content_hub_popup = None
+        self._content_picker = None
+        self._content_hub_app_gallery = None
+        self._confirmation_dialog = None
+
+    @property
+    def account_page(self):
+        if self._account_page is None:
+            try:
+                self._account_page = self.wait_select_single(AccountPage, objectName="accountPage", active=True)
+            except StateNotFoundError:
+                raise RuntimeError("User needs to be logged on")
+        return self._account_page
+     
+    @property
+    def apl(self):
+        if self._apl is None:
+            self._apl = self.wait_select_single(AdaptivePageLayout, objectName="APL", active=True)
+        return self._apl
+    
+    @property
+    def content_picker(self):
+        if self._content_hub_popup is None:
+            self._content_hub_popup = self.wait_select_single(objectName="mediaImportPopup")
+        self._content_picker = self._content_hub_popup.wait_select_single(objectName="contentPeerPicker")
+        return self._content_picker
+
+    def select_content_hub_app(self, appName):
+        cp = self.content_picker
+        content_hub_gridviews = cp.select_many(objectName="responsiveGridViewGrid")
+        for gridview in content_hub_gridviews:
+            app_icon_labels = gridview.select_many(objectName="label")
+            if len(app_icon_labels) > 0:
+                for app_icon_label in app_icon_labels:
+                    if appName in app_icon_label.text:
+                        self.pointing_device.click_object(app_icon_label)
+                        return
+
+    @property
+    def confirmation_dialog(self):
+        if self._confirmation_dialog is None:
+            self._confirmation_dialog = self.wait_select_single(Dialog, objectName='confirmationDialog')
+        return self._confirmation_dialog
+    
+    def click_header_action(self, action):
+        """Click the action 'action' on the header"""
+        action = self.wait_select_single(objectName='%s_button' % action)
+        self.pointing_device.click_object(action)
+
+    # def get_notifications_list(self):
+    #     """Return a list of notifications currently being displayed."""
+    #     return self.wait_select_single(Notifications, objectName='notificationList')
+
+
+class AdaptivePageLayout(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AdaptivePageLayout, self).__init__(*args)
+        self._intro_page = None
+        self._contacts_page = None
+        self._dialog_page = None
+        self._settings_page = None
+        self._profile_page = None
+        self._countries_page = None
+        self._auth_phone_page = None
+        self._auth_code_page = None
+
+    @property
+    def intro_page(self):
+        if self._intro_page is None:
+            try:
+                self._intro_page = self.wait_select_single(IntroPage, objectName='introPage', active=True)
+            except StateNotFoundError:
+                raise RuntimeError("Intro page is not active")                
+        return self._intro_page
+
+    @property
+    def countries_page(self):
+        if self._countries_page is None:
+            self._countries_page = self.wait_select_single(AuthCountriesPage, objectName='countriesListPage', active=True)
+        return self._countries_page
+
+    @property
+    def auth_phone_page(self):
+        if self._auth_phone_page is None:
+            self._auth_phone_page = self.wait_select_single(AuthNumberPage, objectName='authPhonePage', active=True)
+        return self._auth_phone_page
+
+    @property
+    def auth_code_page(self):
+        if self._auth_code_page is None:
+            self._auth_code_page = self.wait_select_single(AuthCodePage, objectName='authCodePage', active=True)
+        return self._auth_code_page
+
+    @property
+    def contacts_page(self):
+        if self._contacts_page is None:
+            self._contacts_page = self.wait_select_single(AccountContactsPage, objectName='accountContactsPage', active=True)
+        return self._contacts_page
+
+    @property
+    def dialog_page(self):
+        if self._dialog_page is None:
+            self._dialog_page = self.wait_select_single(AccountDialogPage, objectName='dialogPage', active=True)
+        return self._dialog_page
+
+    @property
+    def settings_page(self):
+        if self._settings_page is None:
+            self._settings_page = self.wait_select_single(AccountSettings, objectName="settingsPage", active=True)
+        return self._settings_page
+    
+    @property
+    def profile_page(self):
+        if self._profile_page is None:
+            self._profile_page = self.wait_select_single(ProfilePage, objectName="profilePage", active=True)
+        return self._profile_page
+
+    def clear_profile_page(self):
+        self._profile_page = None
+
+
+class IntroPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+    def __init__(self, *args):
+        super(IntroPage, self).__init__(*args)
+
+    def press_start_messaging(self):
+        return self.pointing_device.click_object(self.wait_select_single(objectName="startMessagingButton"))
+
+class AccountPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def open_account_panel(self):
+        self.click_action_button('navigationMenu')
+        account_panel = self.wait_select_single(AccountPanel, objectName='accountPanel')
+        account_panel.visible.wait_for(True)
+        return account_panel
+
+    def get_mainview_header(self):
+        """Return the Header custom proxy object of the Page."""
+        return self.get_root_instance().wait_select_single('MainView').get_header()
+
+    def get_default_header(self):
+        try:
+            return self.wait_select_single('PageHeader', objectName='defaultHeader')
+        except:
+            raise RuntimeError('The Account Page has no header.')
+
+    def click_action_button(self, action_name):
+        action = self.wait_select_single(objectName='%s_button' % action_name)
+        self.pointing_device.click_object(action)
+
+    def get_dialog_list_page(self):
+        return self.wait_select_single(AccountDialogList, objectName='accountDialogList')
+
+
+class AccountPanel(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def get_account_panel_list(self):
+        return self.wait_select_single('AccountPanel', objectName='accountPanel')
+
+    def get_account_panel_count(self):
+        return self.get_account_panel_list().count
+
+    def get_account_panel_delegate(self, index):
+        return self.wait_select_single('AccountPanelItem', objectName='contact{}'.format(index))
+
+    def select_secret_chat(self):
+        action = self.wait_select_single('AccountPanelItem', objectName='secretChatItem')
+        self.pointing_device.click_object(action)
+
+    def select_group_chat(self):
+        action = self.wait_select_single('AccountPanelItem', objectName='groupChatItem')
+        self.pointing_device.click_object(action)
+
+    def select_contacts(self):
+        action = self.wait_select_single('AccountPanelItem', objectName='panelContacts')
+        self.pointing_device.click_object(action)
+
+    def select_settings(self):
+        action = self.wait_select_single('AccountPanelItem', objectName='panelSettings')
+        self.pointing_device.click_object(action)
+
+
+class AccountContactsPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AccountContactsPage, self).__init__(*args)
+        self._index_of_first_online_contact = None
+
+
+    def _get_contacts_list(self):
+        return self.wait_select_single('MultipleSelectionListView', objectName='contactList')
+
+    def _get_contacts_count(self):
+        return self._get_contacts_list().count
+
+    def _get_contact_delegate(self, index):
+        return self.wait_select_single(
+            'TelegramContactsListItem', objectName='contact{}'.format(index))
+
+    def _click_action_button(self, action_name):
+        action = self.wait_select_single(objectName='%s_button' % action_name)
+        if (action):
+            self.pointing_device.click_object(action)
+        else:
+            raise StateNotFoundError(action_name)
+
+
+    def select_first_online_contact(self):
+        #Select first contact if online (User MUST be online)
+        delegate = None
+        for index in range(self._get_contacts_count()):
+            delegate = self._get_contact_delegate(index)
+            if (delegate.isOnline):
+                self._index_of_first_online_contact = index
+                break
+
+        if delegate != None:
+            return delegate
+        else:
+            raise RuntimeError('Chat cannot be created. There are no online users')
+
+    def select_second_contact(self):
+        if self._index_of_first_online_contact is None:
+            raise RuntimeError('Please select first online contact before selecting a second contact')
+
+        #Select a second contact
+        delegate = None
+        for index in range(self._get_contacts_count()):
+            if index is not self._index_of_first_online_contact:
+                delegate = self._get_contact_delegate(index)
+                break
+
+        if delegate != None:
+            return delegate
+        else:
+            raise RuntimeError('Chat cannot be created. Cannot select second contact')
+
+    def select_contact_at_index(self, index):
+        delegate = self._get_contact_delegate(index)
+        return delegate
+
+    def enter_group_chat_title(self, title):
+        text_field = self.wait_select_single('TextField', objectName='groupChatTextField')
+        utilities.enter_text_in_text_area(text_field, title)
+        self._click_action_button("createGroupChatOK")
+
+
+class AccountDialogList(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    @property
+    def dialog_count(self):
+        return self._get_dialog_list().count
+    
+    def select_dialog_at_index(self, index):
+        selected_dialog = self._get_dialog_delegate(index)
+        self.pointing_device.click_object(selected_dialog)
+
+    def select_new_secret_chat(self):
+        count = self.dialog_count
+        count_including_new_secret_chat = count + 1
+        while (count != count_including_new_secret_chat):
+            count = self.dialog_count
+        self.select_first_dialog()
+
+    def _get_dialog_list(self):
+        return self.wait_select_single(objectName='dialogListView')
+
+    def _get_dialog_delegate(self, index):
+        return self.wait_select_single(
+            'DialogsListItem', objectName='dialog{}'.format(index))
+
+
+class AccountDialogPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AccountDialogPage, self).__init__(*args)
+        self._account_message_list = None
+        self._message_area = None
+
+    @property
+    def account_message_list(self):
+        if self._account_message_list is None:
+            self._account_message_list = self.wait_select_single(AccountMessageList, objectName="accountMessageList")
+        return self._account_message_list
+
+    @property
+    def message_area(self):
+        if self._message_area is None:
+            self._message_area = self.wait_select_single(AccountSendMessage, objectName='accountSendMessageArea')
+        return self._message_area
+    
+    def enter_message(self, message):
+        text_area = self.message_area.select_text_area()
+        utilities.enter_text_in_text_area(text_area, message)
+
+    def _get_sending_message_area(self):
+        return self.wait_select_single(AccountSendMessage, objectName='accountSendMessageArea')
+
+    def select_chat_info(self):
+        self.pointing_device.click_object(self.wait_select_single(objectName='groupInfo_button'))
+
+class AccountMessageList(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AccountMessageList, self).__init__(*args)
+        self._messages = None
+
+    @property
+    def messages(self):
+        if self._messages is None:
+            self._messages = self.wait_select_single('MultipleSelectionListView', objectName="messagesListView")
+        return self._messages
+
+    def get_message_at_index(self, index):
+        return self.wait_select_single(
+            MessagesListItem, objectName='message{}'.format(index))
+
+
+class AccountSendMessage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def select_text_area(self):
+        return(self.wait_select_single('TextArea', objectName='sendMessageTextArea'))
+
+    def select_attach_or_send(self):
+        self.pointing_device.click_object(self.wait_select_single(objectName='sendMouseArea'))
+
+    def select_attach_sticker_option(self):
+        self.pointing_device.click_object(self.wait_select_single(objectName='stickerButton'))
+
+    def select_attach_photo_option(self):
+        self.pointing_device.click_object(self.wait_select_single(objectName="panelPhoto"))
+
+    def select_attach_video_option(self):
+        self.pointing_device.click_object(self.wait_select_single(objectName="panelVideo"))
+
+
+class MessagesListItem(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(MessagesListItem, self).__init__(*args)
+        self._message_status = None
+        self._message_status_image = None
+        self._message_label = None
+        self._account_message_media = None
+
+    @property
+    def message_status(self):
+        self._message_status = self.wait_select_single(objectName="messageStatus")
+        return self._message_status
+
+    @property
+    def message_status_image(self):
+        self._message_status_image = self.message_status.wait_select_single(objectName="statusImage")    
+        return self._message_status_image
+
+    @property
+    def message_label(self):
+        self._message_label = self.wait_select_single(objectName="messageText")    
+        return self._message_label
+
+    @property
+    def account_message_media(self):
+        self._account_message_media = self.wait_select_single(AccountMessageMedia, objectName="accountMessageMedia")
+        return self._account_message_media
+
+
+class AccountMessageMedia(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AccountMessageMedia, self).__init__(*args)
+        self._media_message_status = None
+        self._media_message_status_image = None
+
+    @property
+    def media_message_status(self):
+        self._media_message_status = self.wait_select_single(objectName="mediaMessageStatus")
+        return self._media_message_status
+
+    @property
+    def media_message_status_image(self):
+        self._media_message_status_image = self.media_message_status.wait_select_single(objectName="statusImage")    
+        return self._media_message_status_image
+
+    
+class AccountSettings(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AccountSettings, self).__init__(*args)
+        self._list_item_logout = None
+        self._settings_list = None
+        self._popup_logout = None
+
+    @property
+    def settings_list(self):
+        if self._settings_list is None:
+            self._settings_list = self.wait_select_single(objectName='settingsList')
+        return self._settings_list
+    
+    @property
+    def list_item_logout(self):
+        if self._list_item_logout is None:
+            self._list_item_logout = self.wait_select_single(objectName="listItem_logout")
+        return self._list_item_logout    
+
+    def select_list_item_logout(self):
+        self.settings_list.swipe_to_bottom()
+        self.pointing_device.click_object(self.list_item_logout)
+
+
+class ProfilePage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(ProfilePage, self).__init__(*args)
+
+    @property
+    def _member_list_count(self):
+        return self._get_member_list().count
+
+    def _get_member_list(self):
+        return self.wait_select_single(objectName='memberListView')
+
+    def _get_member_delegate(self, index):
+        return self.wait_select_single(
+            'TelegramContactsListItem', objectName='dialog{}'.format(index))
+    
+    def profile_member_at_index(self,index):
+        return self._get_member_delegate(index)
+
+    @property
+    def profile_user_name(self):
+        return self.wait_select_single(objectName="profileUserName")
+
+    @property
+    def profile_user_phone_number(self):
+        return self.wait_select_single(objectName="profilePhoneNumber")
+
+    @property
+    def profile_user_photo(self):
+        return self.wait_select_single(objectName="profileImageImport")
+
+    def select_user_photo(self):
+        return self.wait_select_single(objectName="profileImage")
+
+    @property
+    def switch_block(self):
+        return self.wait_select_single(objectName="switchBlock")
+
+    def select_switch_block(self):
+        self.pointing_device.click_object(self.wait_select_single(objectName="switchBlock"))
+
+    def select_switch_notification(self):
+        self.pointing_device.click_object(self.wait_select_single(objectName="switchNotification"))
+
+    def select_back_button(self):
+        # if platform.model() == "Desktop":
+        #     action = self.wait_select_single(objectName='apl_back_action_button')
+        # else:
+        action = self.wait_select_single(objectName='profileBack_button')
+        self.pointing_device.click_object(action)
+
+class AuthCountriesPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AuthCountriesPage, self).__init__(*args)
+
+    def _click_action_button(self, action_name):
+        action = self.wait_select_single(objectName='%s_button' % action_name)
+        try:
+            self.pointing_device.click_object(action)
+        except:
+            raise StateNotFoundError(action_name)
+    
+    def profile_member_at_index(self,index):
+        return self._get_member_delegate(index)
+
+    def enter_country_title_and_select(self, title):
+        # Select search icon
+        self._click_action_button("searchIcon")
+        # Type for country
+        text_field = self.wait_select_single('TextField', objectName='countryField')
+        utilities.enter_text_in_text_area(text_field, title)
+        # Select the search country
+        self.pointing_device.click_object(self.wait_select_single(objectName="united_kingdom"))
+
+class AuthNumberPage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AuthNumberPage, self).__init__(*args)
+
+    def enter_phone_number(self, title):
+        # Enter text
+        text_field = self.wait_select_single('TextField', objectName='phoneNumberEntry')
+        utilities.enter_text_in_text_area(text_field, title)
+        # Press Send Code button
+        self.pointing_device.click_object(self.wait_select_single(objectName="doneButton"))
+
+class AuthCodePage(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
+
+    def __init__(self, *args):
+        super(AuthCodePage, self).__init__(*args)
+
+    def enter_code_in_textfield(self, title):
+        # Enter text
+        text_field = self.wait_select_single('TextField', objectName='verificationCodeEntry')
+        utilities.enter_text_in_text_area(text_field, title)
+
+    def press_sign_in_button(self):
+        # Press 'Sign In' button
+        self.pointing_device.click_object(self.wait_select_single(objectName="signInButton"))
\ No newline at end of file

=== added file 'telegram/autopilot/telegram/setup.py'
--- telegram/autopilot/telegram/setup.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/setup.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+
+#
+# Ubuntu System Tests
+# Copyright (C) 2014 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+from setuptools import find_packages, setup
+
+assert sys.version_info >= (3,), 'Python 3 is required'
+
+
+VERSION = '1.0'
+
+
+setup(
+    name='ubuntu-system-tests',
+    version=VERSION,
+    description='Automated tests for Ubuntu Touch images.',
+    author='Canonical Platform QA Team',
+    author_email='[e-mail]',
+    url='https://launchpad.net/ubuntu-system-tests',
+    license='GPLv3',
+    packages=find_packages(),
+    package_data={
+        'ubuntu_system_tests': ['tests/data/*/*']
+    },
+    install_requires=[
+        'chardet',
+        'python-debian',
+        'requests',
+        'retrying',
+    ],
+    entry_points={
+        'console_scripts': [
+            'ubuntu-system-tests = ubuntu_system_tests.run:main'
+        ]
+    },
+    test_suite='ubuntu_system_tests.selftests',
+    tests_require=[
+        'python-subunit',
+    ]
+)

=== added directory 'telegram/autopilot/telegram/tests'
=== added file 'telegram/autopilot/telegram/tests/__init__.py'
--- telegram/autopilot/telegram/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/tests/__init__.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,76 @@
+from autopilot.testcase import AutopilotTestCase
+from autopilot import platform
+from ubuntuuitoolkit import emulators as toolkit_emulators
+from autopilot.input import Mouse, Touch, Pointer
+from telegram import emulators
+from os.path import abspath, dirname, join
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+
+import fixtures
+import ubuntuuitoolkit
+import subprocess
+
+class TelegramAppTestCase(AutopilotTestCase):
+
+	def __init__(self, *args):
+		super(TelegramAppTestCase, self).__init__(*args)
+		self._main_view = None
+
+	@property
+	def main_view(self):
+		if self._main_view is None:
+			self._main_view = self.app.wait_select_single(emulators.MainView)
+		return self._main_view	
+
+	def setUp(self, parameter=""):
+		#self.pointing_device = Pointer(self.input_device_class.create())
+		super(TelegramAppTestCase, self).setUp()
+
+		subprocess.call(['pkill', 'telegram-app'])
+
+		#Preconditions: Logged In
+		if platform.model() == "Desktop":
+			self.app = self.launch_desktop_application(parameter)
+		else:
+			self.app = self.launch_mobile_application(parameter)
+		self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+		# self.check_user_has_logged_in()
+
+		# if (self.check_user_has_logged_in()):
+		# 	self.assertThat(self.main_view.visible, Eventually(Equals(True)))
+		# else:
+		# 	raise RuntimeError("User must be logged in")
+
+
+	def launch_desktop_application(self, parameter):
+		#Setup the lib path environment variable using absolute path values, required by the app to access the necessary libs
+		library_path = abspath(join(dirname(__file__), '..', '..', '..', '..', 'build_desktop',))
+		envValue = library_path + ':$LD_LIBRARY_PATH'
+		self.useFixture(fixtures.EnvironmentVariable('LD_LIBRARY_PATH',envValue))
+
+		#Launch the test application using absolute path values
+		full_path = abspath(join(dirname(__file__), '..', '..', '..', '..', 'build_desktop','lib','x86_64-linux-gnu','bin','telegram'))
+		print(full_path + " " + parameter)
+		return self.launch_test_application(
+			full_path, 
+			parameter, 
+			app_type='qt', 
+			emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+	def launch_mobile_application(self, parameter):
+		return self.launch_click_package(
+			"com.ubuntu.telegram",
+			app_uris=['QT_LOAD_TESTABILITY=1'], 
+			emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+
+	def check_user_has_logged_in(self):
+		account_page = self.main_view.account_page
+		self.assertThat(account_page.visible, Eventually(Equals(True)))
+
+		# try:
+		# 	self.main_view.get_account_page()
+		# 	self.assertThat(self.main_view.account_page.visible, Eventually(Equals(True)))
+		# 	return True
+		# except:
+		# 	return False
\ No newline at end of file

=== added file 'telegram/autopilot/telegram/tests/test_Logout.py'
--- telegram/autopilot/telegram/tests/test_Logout.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/tests/test_Logout.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,52 @@
+from telegram.tests import TelegramAppTestCase
+from telegram import emulators
+
+import os
+import dbus
+import time
+import datetime
+import ubuntuuitoolkit
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from autopilot.utilities import sleep
+
+
+#from autopilot import logging as autopilot_logging
+#from telegram import displays_and_interactions as interactions
+
+
+class BaseTelegramTestCase(TelegramAppTestCase):
+
+	def setUp(self):
+		super(BaseTelegramTestCase, self).setUp()
+
+
+class Logout(BaseTelegramTestCase):
+
+	# Prerequisites:
+	# - User is already logged on
+	# - User has one contact which is online
+	# - Online contact is running on Telegram CLI
+
+
+	def test_UserLogout(self):
+
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select the Settings option
+		account_panel.select_settings()
+
+		# Scroll to select the logout list item
+		apl = self.main_view.apl
+		settings_page = apl.settings_page
+		settings_page.select_list_item_logout()
+		sleep(3)
+		logout_confirm_dialog = self.app.wait_select_single(objectName='logoutDialog')
+		self.main_view.pointing_device.click_object(logout_confirm_dialog.wait_select_single(objectName='logoutConfirm'))
+
+		# Checks that the Intro Page is now active
+		introPage = apl.intro_page

=== added file 'telegram/autopilot/telegram/tests/test_MessageDisplay.py'
--- telegram/autopilot/telegram/tests/test_MessageDisplay.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/tests/test_MessageDisplay.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,205 @@
+from telegram.tests import TelegramAppTestCase
+from telegram import emulators
+from telegram import utilities
+
+import os
+import dbus
+import time
+import datetime
+# import subprocess
+import ubuntuuitoolkit
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from autopilot.display import Display
+from autopilot import platform
+from autopilot.utilities import sleep
+
+#from autopilot import logging as autopilot_logging
+#from telegram import displays_and_interactions as interactions
+
+messageTypeText = "Autopilot: Text DO NOT REPLY"
+messageTypeSpecialChar = "Autopilot: !$%^&*""()-_''=+?; DO NOT REPLY"
+messageTypeUrl = "http://google.co.uk DO NOT REPLY"
+
+message_status_received = "qrc:/qml/files/check_single_green.png"
+message_status_read = "qrc:/qml/files/check_double_green.png"
+
+class BaseTelegramTestCase(TelegramAppTestCase):
+
+	def setUp(self):
+		super(BaseTelegramTestCase, self).setUp()
+
+class SecretChatTests(BaseTelegramTestCase):
+
+	scenarios = [
+		('dialog_msgText', {'input': "dialog_msgText"}),
+		('dialog_msgSpecialChar', {'input': "dialog_msgSpecialChar"}),
+		('dialog_msgUrl', {'input': "dialog_msgUrl"}),
+		]
+
+	def test_create_secret_chat(self):
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select the secret chat option
+		account_panel.select_secret_chat()
+
+		contact_page = self.main_view.apl.contacts_page
+
+		# PAZ always select online user - Done
+		# Select first contact
+		self.main_view.pointing_device.click_object(contact_page.select_first_online_contact())
+
+		dialog_list_page = account_page.get_dialog_list_page()
+		# Give chance for app to add the secret chat to top of chat list
+		sleep(3)
+		# Select the top chat
+		dialog_list_page.select_dialog_at_index(0)
+
+		dialog_page = self.main_view.apl.dialog_page
+		message_list = dialog_page.account_message_list
+		inital_count = message_list.messages.count
+
+		if self.input == "dialog_msgSpecialChar":
+			dialog_page.enter_message(messageTypeSpecialChar)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "dialog_msgUrl":
+			dialog_page.enter_message(messageTypeUrl)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "dialog_msgText":
+			dialog_page.enter_message(messageTypeText)
+			dialog_page.message_area.select_attach_or_send()
+
+		# Wait for the message to be sent and allow for network latency
+		# Check that the single tick image is displayed for the sent message
+		sleep(2)
+
+		message = message_list.get_message_at_index(0)
+		self.assertThat(message.message_status_image.source, Eventually(Equals(message_status_received)))
+
+		# Check that the double tick image is displayed for the read message
+		self.assertThat(message.message_status_image.source, Eventually(Equals(message_status_read)))
+
+		# PAZ I believe you need to tap on the URL to make sure it opens up in a browser. Not just
+		# check that the URL received is the same as the URL sent
+		
+		# ASH - I don't believe theres a way to determine that Browser app opens up from taping 
+		# a link. Could be wrong but some help on this would be appreciated.
+
+		# ASH - Hold off. Needs to be rethinked	
+
+		# if self.input == "dialog_msgUrl":
+		# 	#Click on link
+		# 	self.main_view.pointing_device.click_object(message.message_label)
+		# 	#Check hovered link is same as entered link
+		# 	self.assertThat(message.message_label.hoveredLink, Eventually(Equals(messageTypeUrl)))	
+
+		#PAZ - always need to check for double tick
+
+class GroupChatTests(BaseTelegramTestCase):
+
+	scenarios = [
+		('dialog_msgText', {'input': "dialog_msgText"}),
+		('dialog_msgSpecialChar', {'input': "dialog_msgSpecialChar"}),
+		('dialog_msgUrl', {'input': "dialog_msgUrl"}),
+		]
+
+	def test_create_group_chat(self):
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select the secret chat option
+		account_panel.select_group_chat()
+		contact_page = self.main_view.apl.contacts_page
+
+		# Select first contact
+		self.main_view.pointing_device.click_object(contact_page.select_first_online_contact())
+		# Select second contact
+		self.main_view.pointing_device.click_object(contact_page.select_second_contact())
+
+		contact_page.enter_group_chat_title('NewGroupTitle')
+
+		dialog_list_page = account_page.get_dialog_list_page()
+		# Give chance for app to add the group chat to top of chat list
+		sleep(3)
+		# Select the top chat
+		dialog_list_page.select_dialog_at_index(0)
+
+		dialog_page = self.main_view.apl.dialog_page
+		message_list = dialog_page.account_message_list
+		inital_count = message_list.messages.count
+
+		if self.input == "dialog_msgSpecialChar":
+			dialog_page.enter_message(messageTypeSpecialChar)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "dialog_msgUrl":
+			dialog_page.enter_message(messageTypeUrl)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "dialog_msgText":
+			dialog_page.enter_message(messageTypeText)
+			dialog_page.message_area.select_attach_or_send()
+
+		# Wait for the message to be sent and allow for network latency
+		# Check that the single tick image is displayed for the sent message
+		sleep(1)
+
+		message = message_list.get_message_at_index(0)
+		self.assertThat(message.message_status_image.source, Eventually(Equals(message_status_received)))
+
+		# Check that the double tick image is displayed for the read message
+		self.assertThat(message.message_status_image.source, Eventually(Equals(message_status_read)))
+
+class BasicMessagingTests(BaseTelegramTestCase):
+
+	scenarios = [
+		('dialog_msgText', {'input': "dialog_msgText"}),
+		('dialog_msgSpecialChar', {'input': "dialog_msgSpecialChar"}),
+		('dialog_msgUrl', {'input': "dialog_msgUrl"}),
+		]
+
+	def test_create_basic_chat(self):
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select Contacts option
+		account_panel.select_contacts()
+
+		#Select first contact
+		contact_page = self.main_view.apl.contacts_page
+		self.main_view.pointing_device.click_object(contact_page.select_first_online_contact())
+
+		dialog_page = self.main_view.apl.dialog_page
+		message_list = dialog_page.account_message_list
+		inital_count = message_list.messages.count
+
+		if self.input == "dialog_msgSpecialChar":
+			dialog_page.enter_message(messageTypeSpecialChar)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "dialog_msgUrl":
+			dialog_page.enter_message(messageTypeUrl)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "dialog_msgText":
+			dialog_page.enter_message(messageTypeText)
+			dialog_page.message_area.select_attach_or_send()
+
+		# Check that the single tick image is displayed for the sent message
+		sleep(1)
+
+		message = message_list.get_message_at_index(0)
+		self.assertThat(message.message_status_image.source, Eventually(Equals(message_status_received)))
+
+		# Check that the double tick image is displayed for the read message
+		self.assertThat(message.message_status_image.source, Eventually(Equals(message_status_read)))
\ No newline at end of file

=== added file 'telegram/autopilot/telegram/tests/test_Messaging.py'
--- telegram/autopilot/telegram/tests/test_Messaging.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/tests/test_Messaging.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,402 @@
+from telegram.tests import TelegramAppTestCase
+from telegram import emulators
+
+import os
+import dbus
+import time
+import datetime
+import threading
+# import subprocess
+import ubuntuuitoolkit
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals, NotEquals
+from autopilot.display import Display
+from autopilot import platform
+from autopilot.utilities import sleep
+
+
+#from autopilot import logging as autopilot_logging
+#from telegram import displays_and_interactions as interactions
+
+message_sending_image = "qrc:/qml/files/msg_clock.png"
+message_received_image = "qrc:/qml/files/check_single_green.png"
+message_read_image = "qrc:/qml/files/check_double_green.png"
+media_received_image = "qrc:/qml/files/check_single_white.png"
+media_read_image = "qrc:/qml/files/check_double_white.png"
+
+
+class BaseTelegramTestCase(TelegramAppTestCase):
+
+	def setUp(self):
+		super(BaseTelegramTestCase, self).setUp()
+
+
+class SecretMessaging(BaseTelegramTestCase):
+
+	# Prerequisites:
+	# - User is already logged on
+	# - User has one contact which is online
+	# - Online contact is running on Telegram CLI
+
+	scenarios = [
+		('textMessageSend', {'input': "textMessageSend"}),
+		('textMessageSendReceive', {'input': "textMessageSendReceive"}),
+		('photoMessageSend', {'input': "photoMessageSend"}),
+		# ('photoMessageReceive', {'input': "photoMessageReceive"}),
+		]
+
+	def test_SecretMessage(self):
+
+		# Note the number of dialogs in the dialog list at the start of the test
+		account_page = self.main_view.account_page
+		dialog_list_page = account_page.get_dialog_list_page()
+		count = dialog_list_page.dialog_count
+
+		# Open the account panel by tapping the navigation menu icon
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select the secret chat option
+		account_panel.select_secret_chat()
+
+		# Select an online contact
+		apl = self.main_view.apl
+		contacts_page = apl.contacts_page
+		recipient = contacts_page.select_first_online_contact()
+		self.main_view.pointing_device.click_object(recipient)
+
+		# Create a new secret chat
+		self.assertThat(count, Eventually(Equals(count + 1)))
+		dialog_list_page.select_dialog_at_index(0)
+		dialog_page = apl.dialog_page
+
+		# Check that only system message is being displayed
+		message_list = dialog_page.account_message_list
+		initial_count = message_list.messages.count
+		self.assertThat(initial_count, Equals(1))
+
+		status_received = message_received_image
+		status_read = message_read_image
+
+		if "textMessage" in self.input or self.input == "photoMessageReceive":
+			# Send the first message
+
+			ts = time.time()
+			timestamp = datetime.datetime.fromtimestamp(ts).strftime('%y:%m:%d,%H:%M:%S')
+			message_to_send = "Autopilot:" + timestamp
+			if self.input == "textMessageSend":
+				message_to_send = message_to_send + " DO NOT REPLY"
+			elif self.input == "photoMessageReceive":
+				message_to_send = message_to_send + " SEND IMAGE"
+
+			dialog_page.enter_message(message_to_send)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "photoMessageSend":
+
+			if platform.model() == "Desktop":
+				return
+
+			dialog_page.message_area.select_attach_or_send()
+			dialog_page.message_area.select_attach_photo_option()
+			self.main_view.select_content_hub_app("Camera")
+
+			# Allow time to open the app
+			sleep(5)
+
+			display = Display.create()
+			screen_width = display.get_screen_width()
+			screen_height = display.get_screen_height()
+			button_x_pos = screen_width / 2.0
+			button_y_pos = screen_height - 100.0
+
+			# Click on the take photo button
+			self.main_view.pointing_device.move(button_x_pos, button_y_pos)
+			self.main_view.pointing_device.click()
+
+			# Allow time to take the photo
+			sleep(5)
+
+			# Tap the tick to return to Telegram
+			self.main_view.pointing_device.move(button_x_pos, button_y_pos)
+			self.main_view.pointing_device.click()
+
+			status_received = media_received_image
+			status_read = media_read_image
+
+			# Allow time for photo to be sent
+			sleep(5)
+
+		# Check that sent message appears in the dialog content
+		self.assertThat(message_list.messages.count, Eventually(Equals(initial_count + 1)))
+
+		# Check that the message received image is displayed for the sent message
+		index_of_sent_message = 0
+		message = message_list.get_message_at_index(index_of_sent_message)
+		status_image = message.message_status_image
+
+		if self.input == "photoMessageSend" and platform.model() != "Desktop":
+			status_image = message.account_message_media.media_message_status_image
+
+		self.assertThat(status_image.source, Eventually(Equals(status_received)))
+
+		if "Receive" in self.input:
+
+			index_of_sent_message = index_of_sent_message + 1
+
+			# Check for reply
+			self.assertThat(message_list.messages.count, Eventually(Equals(initial_count + 2)))
+
+		# Check that the message read image is displayed for the sent message
+		message = message_list.get_message_at_index(index_of_sent_message)
+		status_image = message.message_status_image
+
+		if self.input == "photoMessageSend" and platform.model() != "Desktop":
+			status_image = message.account_message_media.media_message_status_image
+
+		self.assertThat(status_image.source, Eventually(Equals(status_read)))
+
+				
+
+class BasicMessaging(BaseTelegramTestCase):
+
+	scenarios = [
+		('textMessageSend', {'input': "textMessageSend"}),
+		('textMessageSendReceive', {'input': "textMessageSendReceive"}),
+		('photoMessageSend', {'input': "photoMessageSend"}),
+		('photoMessageReceive', {'input': "photoMessageReceive"}),
+		]
+
+	def test_BasicMessage(self):
+
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select contacts
+		account_panel.select_contacts()
+
+		# Select an online contact
+		apl = self.main_view.apl
+		contacts_page = apl.contacts_page
+		recipient = contacts_page.select_first_online_contact()
+		self.main_view.pointing_device.click_object(recipient)
+
+		# Check that no messages are being displayed
+		dialog_page = apl.dialog_page
+		message_list = dialog_page.account_message_list
+		initial_count = message_list.messages.count
+
+		# Initialise status image values
+		status_received = message_received_image
+		status_read = message_read_image
+
+		if "textMessage" in self.input or self.input == "photoMessageReceive":
+
+			# Send the first message
+			ts = time.time()
+			timestamp = datetime.datetime.fromtimestamp(ts).strftime('%y:%m:%d,%H:%M:%S')
+			message_to_send = "Autopilot" + timestamp
+			if self.input == "textMessageSend":
+				message_to_send = message_to_send + " DO NOT REPLY"
+			elif self.input == "photoMessageReceive":
+				message_to_send = message_to_send + " SEND IMAGE"
+
+			dialog_page.enter_message(message_to_send)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "photoMessageSend":
+
+			if platform.model() == "Desktop":
+				return
+
+			dialog_page.message_area.select_attach_or_send()
+			dialog_page.message_area.select_attach_photo_option()
+			self.main_view.select_content_hub_app("Camera")
+
+			# Allow time to open the app
+			sleep(5)
+
+			display = Display.create()
+			screen_width = display.get_screen_width()
+			screen_height = display.get_screen_height()
+			button_x_pos = screen_width / 2.0
+			button_y_pos = screen_height - 100.0
+
+			# Click on the take photo button
+			self.main_view.pointing_device.move(button_x_pos, button_y_pos)
+			self.main_view.pointing_device.click()
+
+			# Allow time to take the photo
+			sleep(5)
+
+			# Tap the tick to return to Telegram
+			self.main_view.pointing_device.move(button_x_pos, button_y_pos)
+			self.main_view.pointing_device.click()
+
+			status_received = media_received_image
+			status_read = media_read_image
+
+			# Allow time for photo to be sent
+			sleep(5)
+
+		# Check that sent message appears in the dialog content
+		self.assertThat(message_list.messages.count, Eventually(Equals(initial_count + 1)))
+
+		# Check that the message received image is displayed for the sent message
+		index_of_sent_message = 0
+		message = message_list.get_message_at_index(index_of_sent_message)
+		status_image = message.message_status_image
+
+		if self.input == "photoMessageSend" and platform.model() != "Desktop":
+			status_image = message.account_message_media.media_message_status_image
+
+		self.assertThat(status_image.source, Eventually(Equals(status_received)))
+
+		if "Receive" in self.input:
+
+			index_of_sent_message = index_of_sent_message + 1
+
+			# Check for reply
+			self.assertThat(message_list.messages.count, Eventually(Equals(initial_count + 2)))
+
+		# Check that the message read image is displayed for the sent message
+		message = message_list.get_message_at_index(index_of_sent_message)
+		status_image = message.message_status_image
+
+		if self.input == "photoMessageSend" and platform.model() != "Desktop":
+			status_image = message.account_message_media.media_message_status_image
+
+		self.assertThat(status_image.source, Eventually(Equals(status_read)))
+
+
+class GroupMessaging(BaseTelegramTestCase):
+
+	scenarios = [
+		('textMessageSend', {'input': "textMessageSend"}),
+		('textMessageSendReceive', {'input': "textMessageSendReceive"}),
+		('photoMessageSend', {'input': "photoMessageSend"}),
+		('photoMessageReceive', {'input': "photoMessageReceive"}),
+		]
+
+	def test_GroupMessage(self):
+
+		# Note the number of dialogs in the dialog list at the start of the test
+		account_page = self.main_view.account_page
+		dialog_list_page = account_page.get_dialog_list_page()
+		count = dialog_list_page.dialog_count
+
+		# Open the account panel by tapping the navigation menu icon
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select the group chat option
+		account_panel.select_group_chat()
+
+		# Select an online contact
+		apl = self.main_view.apl
+		contacts_page = apl.contacts_page
+		online_member_one = contacts_page.select_first_online_contact()
+		self.main_view.pointing_device.click_object(online_member_one)
+
+		# Select another contact
+		member_two = contacts_page.select_second_contact()
+		self.main_view.pointing_device.click_object(member_two)
+
+		# Add a group chat title
+		contacts_page.enter_group_chat_title('Autopilot Group Messaging')
+
+		# Select the group chat dialog just created
+		self.assertThat(count, Eventually(Equals(count + 1)))
+		dialog_list_page.select_dialog_at_index(0)
+		dialog_page = apl.dialog_page
+
+		# Check that only system message is being displayed
+		message_list = dialog_page.account_message_list
+		initial_count = message_list.messages.count
+		self.assertThat(initial_count, Equals(1))
+
+		# Initialise status image values
+		status_received = message_received_image
+		status_read = message_read_image
+
+		if "textMessage" in self.input or self.input == "photoMessageReceive":
+
+			# Generate and send the first message
+			ts = time.time()
+			timestamp = datetime.datetime.fromtimestamp(ts).strftime('%y:%m:%d,%H:%M:%S')
+			message_to_send = "Autopilot:" + timestamp
+			if self.input == "textMessageSend":
+				message_to_send = message_to_send + " DO NOT REPLY"
+			elif self.input == "photoMessageReceive":
+				message_to_send = message_to_send + " SEND IMAGE"
+
+			dialog_page.enter_message(message_to_send)
+			dialog_page.message_area.select_attach_or_send()
+
+		elif self.input == "photoMessageSend":
+
+			if platform.model() == "Desktop":
+				return
+
+			dialog_page.message_area.select_attach_or_send()
+			sleep(1)
+			dialog_page.message_area.select_attach_photo_option()
+			self.main_view.select_content_hub_app("Camera")
+
+			# Allow time to open the app
+			sleep(5)
+
+			display = Display.create()
+			screen_width = display.get_screen_width()
+			screen_height = display.get_screen_height()
+			button_x_pos = screen_width / 2.0
+			button_y_pos = screen_height - 100.0
+
+			# Click on the take photo button
+			self.main_view.pointing_device.move(button_x_pos, button_y_pos)
+			self.main_view.pointing_device.click()
+
+			# Allow time to take the photo
+			sleep(5)
+
+			# Tap the tick to return to Telegram
+			self.main_view.pointing_device.move(button_x_pos, button_y_pos)
+			self.main_view.pointing_device.click()
+
+			status_received = media_received_image
+			status_read = media_read_image
+
+			# Allow time for photo to be sent
+			sleep(5)
+
+		# Check that sent message appears in the dialog content
+		self.assertThat(message_list.messages.count, Eventually(Equals(initial_count + 1)))
+
+		# Check that the message received image is displayed for the sent message
+		index_of_sent_message = 0
+		message = message_list.get_message_at_index(index_of_sent_message)
+		status_image = message.message_status_image
+
+		if self.input == "photoMessageSend" and platform.model() != "Desktop":
+			status_image = message.account_message_media.media_message_status_image
+
+		self.assertThat(status_image.source, Eventually(Equals(status_received)))
+
+		if "Receive" in self.input:
+
+			index_of_sent_message = index_of_sent_message + 1
+
+			# Check for reply
+			self.assertThat(message_list.messages.count, Eventually(Equals(initial_count + 2)))
+
+		# Check that the double tick image is displayed for the read message
+		message = message_list.get_message_at_index(index_of_sent_message)
+		status_image = message.message_status_image
+
+		if self.input == "photoMessageSend" and platform.model() != "Desktop":
+			status_image = message.account_message_media.media_message_status_image
+
+		self.assertThat(status_image.source, Eventually(Equals(status_read)))

=== added file 'telegram/autopilot/telegram/tests/test_Offline.py'
--- telegram/autopilot/telegram/tests/test_Offline.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/tests/test_Offline.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,54 @@
+from telegram.tests import TelegramAppTestCase
+from telegram import emulators
+
+# import subprocess
+import ubuntuuitoolkit
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from autopilot.display import Display
+from autopilot import platform
+from testtools import skipUnless
+
+class BaseTelegramTestCase(TelegramAppTestCase):
+
+	def setUp(self):
+		super(BaseTelegramTestCase, self).setUp()
+
+class OfflineTests(BaseTelegramTestCase):
+
+	@skipUnless(
+		platform.model() != "Desktop",
+		"Offline Test is only available on Device"
+	)
+
+	def test_check_for_offline_message(self):
+		display = Display.create()
+		screenWidth = display.get_screen_width()
+		screenHeight = display.get_screen_height()
+
+		#Pull menu from top
+		self.main_view.pointing_device.drag(screenWidth-202, 0, screenWidth-202, screenHeight)
+		#Tap Flight Mode switch
+		self.main_view.pointing_device.move(screenWidth-130,150)
+		self.main_view.pointing_device.click()
+		#Close menu
+		self.main_view.pointing_device.drag(0,screenHeight, 0,0)
+
+		account_page = self.main_view.account_page
+
+		# if account_page.get_default_header().title in ('Telegram', 'Connecting...'):
+		# 	print("WARNING - Please turn ON Airplane Mode")
+
+		self.assertThat(account_page.get_default_header().title, Eventually(Equals("Waiting for network...")))
+
+		#Pull menu from top
+		self.main_view.pointing_device.drag(screenWidth-180, 0, screenWidth-180, screenHeight)
+		#Tap Flight Mode switch
+		self.main_view.pointing_device.move(screenWidth-130,150)
+		self.main_view.pointing_device.click()
+		#Close menu
+		self.main_view.pointing_device.drag(0,screenHeight, 0,0)
+
+		# Check header no longer says offline message
+		self.assertThat(account_page.get_default_header().title, Eventually(Equals("Telegram")))

=== added file 'telegram/autopilot/telegram/tests/test_Profile.py'
--- telegram/autopilot/telegram/tests/test_Profile.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/tests/test_Profile.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,186 @@
+from telegram.tests import TelegramAppTestCase
+from telegram import emulators
+from telegram import utilities
+
+import os
+import dbus
+import time
+import datetime
+# import subprocess
+import ubuntuuitoolkit
+
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
+from autopilot.utilities import sleep
+
+messageTypeText = "Autopilot: Text INSTANT REPLY"
+
+class BaseTelegramTestCase(TelegramAppTestCase):
+
+	def setUp(self):
+		super(BaseTelegramTestCase, self).setUp()
+
+class ProfileTests(BaseTelegramTestCase):
+
+	def test_check_group_to_verify_members(self):
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select the secret chat option
+		account_panel.select_group_chat()
+
+		# Select first online contact
+		contacts_page = self.main_view.apl.contacts_page
+
+		# Select first contact
+		self.main_view.pointing_device.click_object(contacts_page.select_contact_at_index(0))
+		# Temporarily save fullname of contact
+		tempUser1Name = contacts_page.select_contact_at_index(0).fullName
+
+		# Select second contact
+		self.main_view.pointing_device.click_object(contacts_page.select_contact_at_index(1))
+		tempUser2Name = contacts_page.select_contact_at_index(1).fullName
+
+		#Enter group title and press Enter
+		contacts_page.enter_group_chat_title('ProfileTest-NewGroup')
+
+		#Assign dialog list
+		account_page = self.main_view.account_page
+		dialog_list_page = account_page.get_dialog_list_page()
+		count = dialog_list_page.dialog_count
+		self.assertThat(count, Eventually(Equals(count + 1)))
+		dialog_list_page.select_dialog_at_index(0)
+
+		#Press groupInfo button
+		self.main_view.apl.dialog_page.select_chat_info()
+
+		#Assign ProfilePage
+		profile_page = self.main_view.apl.profile_page
+
+		# Check user 1 is listed
+		self.assertThat(str(profile_page.profile_member_at_index(1).title), Equals(tempUser1Name))
+		# Check user 2 is listed
+		self.assertThat(str(profile_page.profile_member_at_index(0).title), Equals(tempUser2Name))
+
+
+	def test_check_blocked_user(self):
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select Contacts option
+		account_panel.select_contacts()
+
+		#Select first contact
+		contacts_page = self.main_view.apl.contacts_page
+		recipient = contacts_page.select_first_online_contact()
+		self.main_view.pointing_device.click_object(recipient)
+
+		dialog_page = self.main_view.apl.dialog_page
+		message_list = dialog_page.account_message_list
+		inital_count = message_list.messages.count
+
+		#Send message
+		dialog_page.enter_message(messageTypeText)
+		dialog_page.message_area.select_attach_or_send()
+
+		#Check received reply
+		self.assertThat(message_list.messages.count, Eventually(Equals(inital_count + 2)))
+
+		#Tap the groupInfo button
+		self.main_view.apl.dialog_page.select_chat_info()
+		#Assign ProfilePage
+		profile_page = self.main_view.apl.profile_page
+		#Turn on Block contact
+		switch = profile_page.switch_block
+		self.main_view.pointing_device.click_object(switch)
+		#Verify blocked user switch is turned ON
+		self.assertThat(switch.checked, Equals(True))
+		#Go back to dialog page
+		profile_page.select_back_button()
+		self.main_view.apl.clear_profile_page()
+
+		#Send message
+		dialog_page.enter_message(messageTypeText)
+		dialog_page.message_area.select_attach_or_send()
+
+		# Check that the sent message was read
+		message = None
+		for idx in range(0, message_list.messages.count):
+			message = message_list.get_message_at_index(idx)
+			if message.message_label.text == messageTypeText:
+				self.assertThat(message.message_status_image.source, Eventually(Equals("qrc:/qml/files/check_double_green.png")))
+				break
+			else:
+				message = None
+		self.assertThat(message is None, Equals(False))
+
+		# Check that no response was received (wait for 10 seconds)
+		sleep(10)
+		self.assertThat(message_list.messages.count, Equals(inital_count + 3))
+
+		#Tap the groupInfo button
+		self.main_view.apl.dialog_page.select_chat_info()
+		#Assign ProfilePage
+		profile_page = self.main_view.apl.profile_page
+		#Turn off Block contact.
+		switch = profile_page.switch_block
+		self.assertThat(switch.checked, Eventually(Equals(True)))
+		self.main_view.pointing_device.click_object(switch)
+		#Verify blocked user switch is turned OFF
+		self.assertThat(switch.checked, Eventually(Equals(False)))
+		#Go back to dialog page
+		profile_page.select_back_button()
+
+		#Check number of messages and send message
+		self.assertThat(message_list.messages.count, Equals(inital_count + 3))
+		#Send message
+		dialog_page.enter_message(messageTypeText)
+		dialog_page.message_area.select_attach_or_send()
+
+		#Check received reply
+		self.assertThat(message_list.messages.count, Eventually(Equals(inital_count + 5)))
+
+class ProfileDetails(BaseTelegramTestCase):
+
+	def test_verify_profile_details(self):
+		# Open the account panel by tapping the navigation menu icon
+		account_page = self.main_view.account_page
+		account_panel = account_page.open_account_panel()
+		self.assertThat(account_panel.opened, Eventually(Equals(True)))
+
+		# Select Contacts option
+		account_panel.select_contacts()
+
+		#Select first contact
+		contact_page = self.main_view.apl.contacts_page
+		contact = contact_page.select_contact_at_index(0)
+
+		self.main_view.pointing_device.click_object(contact)
+
+		self.main_view.apl.dialog_page.select_chat_info()
+
+		profile_page = self.main_view.apl.profile_page
+
+		# print(profile_page.profile_user_photo.get_properties())
+
+		# print("IMAGE SRC: " + profile_page.profile_user_photo.source)
+
+		sleep(3)
+
+		if profile_page.select_user_photo() is None:
+			#User does not have a profile image
+			print('WARNING - Profiles - Contact does not have Profile image')
+		else:
+			self.assertThat(profile_page.select_user_photo() is not None, Equals(True))
+
+		# Check the user has a name
+		if profile_page.profile_user_name.text is None:
+			raise RuntimeError("Profiles - Contact does not have Name")
+
+		# Check the user has a phone number 
+		if profile_page.profile_user_phone_number.text is None:
+			raise RuntimeError("Profiles - Contact does not have valid Phone Number")
\ No newline at end of file

=== added file 'telegram/autopilot/telegram/utilities.py'
--- telegram/autopilot/telegram/utilities.py	1970-01-01 00:00:00 +0000
+++ telegram/autopilot/telegram/utilities.py	2016-11-14 11:39:33 +0000
@@ -0,0 +1,36 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2016 Canonical
+#
+# This file is part of telegram-app.
+#
+# telegram-app is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+
+"""Telegram app helper functions"""
+
+from autopilot.input import Keyboard
+
+""" KEYBOARD UTILITIES """
+
+global mainKeyboard
+
+def enter_text_in_text_area(text_area, text):
+	#Assign keyboard type
+	mainKeyboard = Keyboard.create()
+
+	#Focus TextArea and begin typing
+	with mainKeyboard.focused_type(text_area) as kb:	    
+		kb.type(text)
+
+def enter_text_in_text_area_and_press_enter(text_area, text):
+	#Assign keyboard type
+	mainKeyboard = Keyboard.create()
+
+	#Focus TextArea and begin typing
+	with mainKeyboard.focused_type(text_area) as kb:	    
+		kb.type(text)
+
+	#Simulate 'Enter' key being pressed
+	mainKeyboard.press_and_release('Enter')
\ No newline at end of file