Merge lp:~elopio/address-book-app/refactoring_tests1 into lp:address-book-app

[Leo Arias]

[lp:~elopio/address-book-app/refactoring_tests1]

229. By Leo Arias on 2014-05-22

Merged with prerequisite.

230. By Leo Arias on 2014-05-22

Removed an unused import.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:228
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~elopio/address-book-app/refactoring_tests1/+merge/220654/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/address-book-app-ci/582/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/415/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/364/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/816/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/478/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/582/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~elopio/address-book-app/refactoring_tests1/+merge/220654/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/address-book-app-ci/583/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/419/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/370/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/829/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/489/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/583/rebuild

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

could you resubmit this proposal against the lp:~phablet-team/address-book-app/staging

[lp:~elopio/address-book-app/refactoring_tests1]

231. By Leo Arias on 2014-05-30

Merged with prerequisite.

Unmerged revisions

=== removed file 'tests/autopilot/address_book_app/__init__.py'
--- tests/autopilot/address_book_app/__init__.py	2013-07-09 18:42:30 +0000
+++ tests/autopilot/address_book_app/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""address-book-app autopilot tests and emulators - top level package."""

=== added file 'tests/autopilot/address_book_app/_errors.py'
--- tests/autopilot/address_book_app/_errors.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/_errors.py	2014-05-22 14:40:49 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import ubuntuuitoolkit
+
+
+class AddressBookAppError(ubuntuuitoolkit.ToolkitException):
+    """Exception raised when there is an error with the emulator."""

=== removed directory 'tests/autopilot/address_book_app/emulators'
=== removed file 'tests/autopilot/address_book_app/emulators/__init__.py'
--- tests/autopilot/address_book_app/emulators/__init__.py	2013-07-09 18:42:30 +0000
+++ tests/autopilot/address_book_app/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.

=== removed file 'tests/autopilot/address_book_app/emulators/main_window.py'
--- tests/autopilot/address_book_app/emulators/main_window.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,376 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013, 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-import collections
-import logging
-import time
-
-from autopilot import logging as autopilot_logging
-from autopilot.introspection.dbus import StateNotFoundError
-from ubuntuuitoolkit import emulators as uitk
-from address_book_app import data
-from address_book_app.emulators.page_with_bottom_edge import ContactListPage
-
-
-logger = logging.getLogger(__name__)
-
-
-_TEXT_FIELD_OBJECT_NAMES = {
-    'first_name': 'firstName',
-    'last_name': 'lastName',
-    'street': 'streetAddress_{}',
-    'locality': 'localityAddress_{}',
-    'region': 'regionAddress_{}',
-    'postal_code': 'postcodeAddress_{}',
-    'country': 'countryAddress_{}'
-}
-
-
-def _get_text_field(parent, field, index=None):
-    if field not in _TEXT_FIELD_OBJECT_NAMES:
-        raise AddressBookAppError('Unknown field: {}.'.format(field))
-
-    object_name = _TEXT_FIELD_OBJECT_NAMES[field]
-    if index is not None:
-        object_name = object_name.format(index)
-    return parent.select_single(TextInputDetail, objectName=object_name)
-
-
-class AddressBookAppError(uitk.ToolkitEmulatorException):
-    """Exception raised when there is an error with the emulator."""
-
-
-class MainWindow(uitk.MainView):
-    """An emulator class that makes it easy to interact with the app."""
-
-    def get_contact_list_page(self):
-        # ContactListPage is the only page that can appears multiple times
-        # Ex.: During the pick mode we alway push a new contactListPage, to
-        # preserve the current application status.
-        pages = self.select_many(ContactListPage,
-                                 objectName="contactListPage")
-
-        # alway return the page without pickMode
-        for p in pages:
-            if not p.pickMode:
-                return p
-        return None
-
-    def get_contact_edit_page(self):
-        # We can have two contact editor page because of bottom edge page
-        # but we will return only the actived one
-        list_page = self.get_contact_list_page()
-        list_page.bottomEdgePageLoaded.wait_for(True)
-        pages = self.select_many(ContactEditor,
-                                 objectName="contactEditorPage")
-        for p in pages:
-            if p.active:
-                return p
-        raise StateNotFoundError('contactEditorPage not found')
-        return None
-
-
-    def get_contact_view_page(self):
-        return self.wait_select_single("ContactView",
-                                       objectName="contactViewPage")
-
-    def get_contact_list_pick_page(self):
-        pages = self.select_many("ContactListPage",
-                                 objectName="contactListPage")
-        for p in pages:
-            if p.pickMode:
-                return p
-        return None
-
-    def get_contact_list_view(self):
-        """
-        Returns a ContactListView iobject for the current window
-        """
-        return self.wait_select_single("ContactListView",
-                                       objectName="contactListView")
-
-    def get_button(self, buttonName):
-        return self.get_header()._get_action_button(buttonName)
-
-    def open_header(self):
-        header = self.get_header()
-        if (header.y != 0):
-            edit_page = self.get_contact_edit_page()
-            flickable = edit_page.wait_select_single(
-                "QQuickFlickable",
-                objectName="scrollArea")
-            
-            while (header.y != 0):
-                globalRect = flickable.globalRect
-                start_x = globalRect.x + (globalRect.width * 0.5)
-                start_y = globalRect.y + (flickable.height * 0.1)
-                stop_y = start_y + (flickable.height * 0.1)
-
-                self.pointing_device.drag(start_x, start_y, start_x, stop_y, rate=5)
-                # wait flicking stops to move to the next field
-                flickable.flicking.wait_for(False)
-
-        return header
-
-    def cancel(self):
-        """
-        Press the 'Cancel' button
-        """
-        header = self.open_header()
-        header.click_custom_back_button()
-
-    def save(self):
-        """
-        Press the 'Save' button
-        """        
-        bottom_swipe_page = self.get_contact_list_page()
-        self.click_action_button("save")
-        bottom_swipe_page.isCollapsed.wait_for(True)
-
-    def done_selection(self):
-        """
-        Press the 'doneSelection' button
-        """        
-        bottom_swipe_page = self.get_contact_list_page()
-        self.click_action_button("doneSelection")
-        bottom_swipe_page.isCollapsed.wait_for(True)
-
-    def get_toolbar(self):
-        """Override base class so we get our expected Toolbar subclass."""
-        return self.select_single(Toolbar)
-
-    @autopilot_logging.log_action(logger.info)
-    def go_to_add_contact(self):
-        """
-        Press the 'Add' button and return the contact editor page
-        """
-        bottom_swipe_page = self.get_contact_list_page()
-        bottom_swipe_page.revel_bottom_edge_page()
-        return self.get_contact_edit_page()
-
-
-class ContactEditor(uitk.UbuntuUIToolkitEmulatorBase):
-    """Custom proxy object for the Contact Editor."""
-
-    @autopilot_logging.log_action(logger.info)
-    def fill_form(self, contact_information):
-        """Fill the edit contact form.
-
-        :param contact_information: Values of the contact to fill the form.
-        :type contact_information: data object with the attributes first_name,
-            last_name, phones, emails, social_aliases, addresses and
-             professional_details
-
-        """
-        if contact_information.first_name is not None:
-            self._fill_first_name(contact_information.first_name)
-        if contact_information.last_name is not None:
-            self._fill_last_name(contact_information.last_name)
-
-        groups = collections.OrderedDict()
-        groups['phones'] = contact_information.phones
-        groups['emails'] = contact_information.emails
-        groups['ims'] = contact_information.social_aliases
-        groups['addresses'] = contact_information.addresses
-        groups['professionalDetails'] = (
-            contact_information.professional_details)
-
-        for key, information in groups.items():
-            if information:
-                self._fill_detail_group(
-                    object_name=key, details=information)
-
-    def _fill_first_name(self, first_name):
-        text_field = _get_text_field(self, 'first_name')
-        text_field.write(first_name)
-
-    def _fill_last_name(self, last_name):
-        text_field = _get_text_field(self, 'last_name')
-        text_field.write(last_name)
-
-    def _fill_detail_group(self, object_name, details):
-        editor = self.select_single(
-            ContactDetailGroupWithTypeEditor, objectName=object_name)
-        editor.fill(details)
-
-    def _get_form_values(self):
-        first_name = _get_text_field(self, 'first_name').text
-        last_name = _get_text_field(self, 'last_name').text
-        phones = self._get_values_from_detail_group(object_name='phones')
-        emails = self._get_values_from_detail_group(object_name='emails')
-        social_aliases = self._get_values_from_detail_group(object_name='ims')
-        addresses = self._get_values_from_detail_group(object_name='addresses')
-        professional_details = self._get_values_from_detail_group(
-            object_name='professionalDetails')
-
-        return data.Contact(
-            first_name=first_name, last_name=last_name, phones=phones,
-            emails=emails, social_aliases=social_aliases, addresses=addresses,
-            professional_details=professional_details)
-
-    def _get_values_from_detail_group(self, object_name):
-        editor = self.select_single(
-            ContactDetailGroupWithTypeEditor, objectName=object_name)
-        return editor.get_values(object_name)
-
-    def wait_to_stop_moving(self):
-        flickable = self.select_single(
-            'QQuickFlickable', objectName='scrollArea')
-        flickable.flicking.wait_for(False)
-
-
-class TextInputDetail(uitk.TextField):
-    """Custom proxy object for the Text Input Detail field."""
-
-
-class ContactDetailGroupWithTypeEditor(uitk.UbuntuUIToolkitEmulatorBase):
-    """Custom proxy object for the ContactDetailGroupWithTypeEditor widget."""
-
-    _DETAIL_EDITORS = {
-        'phones': 'base_phoneNumber_{}',
-        'emails': 'base_email_{}',
-        'ims': 'base_onlineAccount_{}',
-        'addresses': 'base_address_{}',
-        # FIXME fix the unknown. --elopio - 2014-03-01
-        'professionalDetails': 'base_unknown_{}'
-    }
-
-    def fill(self, details):
-        """Fill a contact detail group."""
-        for index, detail in enumerate(details[:-1]):
-            self._fill_detail(index, detail)
-            self._add_detail()
-        self._fill_detail(len(details) - 1, details[-1])
-
-    def _fill_detail(self, index, detail):
-        detail_editor = self._get_detail_editor_by_index(index)
-        detail_editor.fill(field=self.objectName, index=index, detail=detail)
-
-    def _get_detail_editor_by_index(self, index):
-        object_name = self._get_contact_detail_editor_object_name(index)
-        return self.select_single(
-            ContactDetailWithTypeEditor, objectName=object_name)
-
-    def _get_contact_detail_editor_object_name(self, index):
-        return self._DETAIL_EDITORS[self.objectName].format(index)
-
-    def _add_detail(self):
-        # TODO --elopio - 2014-03-01
-        raise NotImplementedError('Add extra details not yet implemented.')
-
-    def get_values(self, object_name):
-        """Return the values of a contact detail group."""
-        values = []
-        for index in range(self.detailsCount):
-            detail_editor = self._get_detail_editor_by_index(index)
-            value = detail_editor.get_values(field=object_name, index=index)
-            if (value):
-                values.append(value)
-
-        return values
-
-
-class ContactDetailWithTypeEditor(uitk.UbuntuUIToolkitEmulatorBase):
-    """Custom proxy object for the ContactDetailWithTypeEditor widget."""
-
-    def __init__(self, *args):
-        super(ContactDetailWithTypeEditor, self).__init__(*args)
-        self.main_view = self.get_root_instance().select_single(MainWindow)
-
-    def fill(self, field, index, detail):
-        self._select_type(detail)
-        self._fill_value(field, index, detail)
-
-    def _select_type(self, detail):
-        type_index = detail.TYPES.index(detail.type)
-        selected_type_index = self._get_selected_type_index()
-        if type_index != selected_type_index:
-            # TODO --elopio - 2014-03-01
-            raise NotImplementedError('Type selection not yet implemented.')
-
-    def _get_selected_type_index(self):
-        value_selector = self.select_single('ValueSelector')
-        return value_selector.currentIndex
-
-    def _fill_value(self, field, index, detail):
-        single_values = {
-            'phones': 'number',
-            'emails': 'address',
-            'ims': 'alias'
-        }
-        if field in single_values:
-            self._fill_single_field(getattr(detail, single_values[field]))
-        elif field == 'addresses':
-            self._fill_address(index, detail)
-        elif field == 'professionalDetails':
-            self._fill_professional_details(index, detail)
-        else:
-            raise AddressBookAppError('Unknown field: {}.'.format(field))
-
-    def _fill_single_field(self, value):
-        text_field = self.select_single(TextInputDetail)
-        self._make_field_visible_and_write(text_field, value)
-
-    def _make_field_visible_and_write(self, text_field, value):
-        while not text_field.activeFocus:
-            # XXX We should just swipe the text field into view.
-            # Update this once bug http://pad.lv/1286479 is implemented.
-            # --elopio - 2014-03-01
-            text_field.keyboard.press_and_release('Tab')
-            time.sleep(0.1)
-            self.main_view.get_contact_edit_page().wait_to_stop_moving()
-
-        text_field.write(value)
-
-    def _fill_address(self, index, address):
-        fields = collections.OrderedDict()
-        fields['street'] = address.street
-        fields['locality'] = address.locality
-        fields['region'] = address.region
-        fields['postal_code'] = address.postal_code
-        fields['country'] = address.country
-        for key, value in fields.items():
-            text_field = _get_text_field(self, key, index)
-            self._make_field_visible_and_write(text_field, value)
-
-    def _fill_professional_details(self, index, address):
-        # TODO --elopio - 2014-03-01
-        raise NotImplementedError('Not yet implemented.')
-
-    def get_values(self, field, index):
-        if field == 'phones':
-            return data.Phone(
-                type_=data.Phone.TYPES[self._get_selected_type_index()],
-                number=self._get_single_field_value())
-        if field == 'emails':
-            return data.Email(
-                type_=data.Email.TYPES[self._get_selected_type_index()],
-                address=self._get_single_field_value())
-        if field == 'ims':
-            return data.SocialAlias(
-                type_=data.SocialAlias.TYPES[self._get_selected_type_index()],
-                alias=self._get_single_field_value())
-        if field == 'addresses':
-            return self._get_address_value(index)
-        if field == 'professionalDetails':
-            # TODO --elopio - 2014-03-01
-            return None
-        raise AddressBookAppError('Unknown field: {}.'.format(field))
-
-    def _get_single_field_value(self):
-        return self.select_single(TextInputDetail).text
-
-    def _get_address_value(self, index):
-        street = _get_text_field(self, 'street', index).text
-        locality = _get_text_field(self, 'locality', index).text
-        region = _get_text_field(self, 'region', index).text
-        postal_code = _get_text_field(self, 'postal_code', index).text
-        country = _get_text_field(self, 'country', index).text
-        return data.Address(
-            type_=data.Address.TYPES[self._get_selected_type_index()],
-            street=street, locality=locality, region=region,
-            postal_code=postal_code, country=country)

=== removed file 'tests/autopilot/address_book_app/emulators/page_with_bottom_edge.py'
--- tests/autopilot/address_book_app/emulators/page_with_bottom_edge.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/emulators/page_with_bottom_edge.py	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-
-""" PageWithBottomEdge emulator """
-
-# Copyright 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-import logging
-from address_book_app.emulators.contact_list_page import ContactListPage
-from autopilot.introspection.dbus import StateNotFoundError
-from ubuntuuitoolkit import emulators as toolkit_emulators
-
-logger = logging.getLogger(__name__)
-      
-class PageWithBottomEdge(ContactListPage):
-    """An emulator class that makes it easy to interact with the bottom edge
-       swipe page"""
-    def __init__(self, *args):
-        super(PageWithBottomEdge, self).__init__(*args)
-
-    def revel_bottom_edge_page(self):
-        """Bring the bottom edge page to the screen"""
-        self.bottomEdgePageLoaded.wait_for(True)
-        try:
-            action_item = self.wait_select_single('QQuickItem', objectName='bottomEdgeTip')
-            start_x = action_item.globalRect.x + (action_item.globalRect.width * 0.5)
-            start_y = action_item.globalRect.y + (action_item.height * 0.5)
-            stop_y = start_y - (self.height * 0.7)
-            self.pointing_device.drag(start_x, start_y, start_x, stop_y, rate=2)
-            self.isReady.wait_for(True)
-        except StateNotFoundError:
-            logger.error('ButtomEdge element not found.')
-            raise
-
-class ContactListPage(PageWithBottomEdge):
-    pass
-

=== added directory 'tests/autopilot/address_book_app/pages'
=== added file 'tests/autopilot/address_book_app/pages/__init__.py'
--- tests/autopilot/address_book_app/pages/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/__init__.py	2014-05-22 14:40:49 +0000
@@ -0,0 +1,25 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+__all__ = [
+    'ContactEditor',
+    'ContactListPage',
+    'ContactView',
+]
+
+from address_book_app.pages._contact_editor import ContactEditor
+from address_book_app.pages._contact_list_page import ContactListPage
+from address_book_app.pages._contact_view import ContactView

=== added file 'tests/autopilot/address_book_app/pages/_common.py'
--- tests/autopilot/address_book_app/pages/_common.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/_common.py	2014-05-22 14:40:49 +0000
@@ -0,0 +1,53 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+import ubuntuuitoolkit
+from autopilot.introspection import dbus
+
+
+logger = logging.getLogger(__name__)
+
+
+class PageWithHeader(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    def get_header(self):
+        """Return the Header custom proxy object of the Page."""
+        return self.get_root_instance().select_single(
+            'Header', objectName='MainView_Header')
+
+
+class PageWithBottomEdge(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """An emulator class that makes it easy to interact with the bottom edge
+       swipe page"""
+
+    def revel_bottom_edge_page(self):
+        """Bring the bottom edge page to the screen"""
+        self.bottomEdgePageLoaded.wait_for(True)
+        try:
+            action_item = self.wait_select_single(
+                'QQuickItem', objectName='bottomEdgeTip')
+            start_x = (action_item.globalRect.x +
+                       (action_item.globalRect.width * 0.5))
+            start_y = action_item.globalRect.y + (action_item.height * 0.5)
+            stop_y = start_y - (self.height * 0.7)
+            self.pointing_device.drag(
+                start_x, start_y, start_x, stop_y, rate=2)
+            self.isReady.wait_for(True)
+        except dbus.StateNotFoundError:
+            logger.error('ButtomEdge element not found.')
+            raise

=== added file 'tests/autopilot/address_book_app/pages/_contact_editor.py'
--- tests/autopilot/address_book_app/pages/_contact_editor.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/_contact_editor.py	2014-05-22 14:40:49 +0000
@@ -0,0 +1,272 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import collections
+import logging
+import time
+
+import autopilot.logging
+import ubuntuuitoolkit
+from address_book_app import data, _errors
+from address_book_app.pages import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+_TEXT_FIELD_OBJECT_NAMES = {
+    'first_name': 'firstName',
+    'last_name': 'lastName',
+    'street': 'streetAddress_{}',
+    'locality': 'localityAddress_{}',
+    'region': 'regionAddress_{}',
+    'postal_code': 'postcodeAddress_{}',
+    'country': 'countryAddress_{}'
+}
+
+
+def _get_text_field(parent, field, index=None):
+    if field not in _TEXT_FIELD_OBJECT_NAMES:
+        raise _errors.AddressBookAppError('Unknown field: {}.'.format(field))
+
+    object_name = _TEXT_FIELD_OBJECT_NAMES[field]
+    if index is not None:
+        object_name = object_name.format(index)
+    return parent.select_single(TextInputDetail, objectName=object_name)
+
+
+class ContactEditor(_common.PageWithHeader):
+    """Custom proxy object for the Contact Editor."""
+
+    @autopilot.logging.log_action(logger.info)
+    def fill_form(self, contact_information):
+        """Fill the edit contact form.
+
+        :param contact_information: Values of the contact to fill the form.
+        :type contact_information: data object with the attributes first_name,
+            last_name, phones, emails, social_aliases, addresses and
+             professional_details
+
+        """
+        if contact_information.first_name is not None:
+            self._fill_first_name(contact_information.first_name)
+        if contact_information.last_name is not None:
+            self._fill_last_name(contact_information.last_name)
+
+        groups = collections.OrderedDict()
+        groups['phones'] = contact_information.phones
+        groups['emails'] = contact_information.emails
+        groups['ims'] = contact_information.social_aliases
+        groups['addresses'] = contact_information.addresses
+        groups['professionalDetails'] = (
+            contact_information.professional_details)
+
+        for key, information in groups.items():
+            if information:
+                self._fill_detail_group(
+                    object_name=key, details=information)
+
+    def _fill_first_name(self, first_name):
+        text_field = _get_text_field(self, 'first_name')
+        text_field.write(first_name)
+
+    def _fill_last_name(self, last_name):
+        text_field = _get_text_field(self, 'last_name')
+        text_field.write(last_name)
+
+    def _fill_detail_group(self, object_name, details):
+        editor = self.select_single(
+            ContactDetailGroupWithTypeEditor, objectName=object_name)
+        editor.fill(details)
+
+    def _get_form_values(self):
+        first_name = _get_text_field(self, 'first_name').text
+        last_name = _get_text_field(self, 'last_name').text
+        phones = self._get_values_from_detail_group(object_name='phones')
+        emails = self._get_values_from_detail_group(object_name='emails')
+        social_aliases = self._get_values_from_detail_group(object_name='ims')
+        addresses = self._get_values_from_detail_group(object_name='addresses')
+        professional_details = self._get_values_from_detail_group(
+            object_name='professionalDetails')
+
+        return data.Contact(
+            first_name=first_name, last_name=last_name, phones=phones,
+            emails=emails, social_aliases=social_aliases, addresses=addresses,
+            professional_details=professional_details)
+
+    def _get_values_from_detail_group(self, object_name):
+        editor = self.select_single(
+            ContactDetailGroupWithTypeEditor, objectName=object_name)
+        return editor.get_values(object_name)
+
+    def wait_to_stop_moving(self):
+        flickable = self.select_single(
+            'QQuickFlickable', objectName='scrollArea')
+        flickable.flicking.wait_for(False)
+
+
+class TextInputDetail(ubuntuuitoolkit.TextField):
+    """Custom proxy object for the Text Input Detail field."""
+
+
+class ContactDetailGroupWithTypeEditor(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Custom proxy object for the ContactDetailGroupWithTypeEditor widget."""
+
+    _DETAIL_EDITORS = {
+        'phones': 'base_phoneNumber_{}',
+        'emails': 'base_email_{}',
+        'ims': 'base_onlineAccount_{}',
+        'addresses': 'base_address_{}',
+        # FIXME fix the unknown. --elopio - 2014-03-01
+        'professionalDetails': 'base_unknown_{}'
+    }
+
+    def fill(self, details):
+        """Fill a contact detail group."""
+        for index, detail in enumerate(details[:-1]):
+            self._fill_detail(index, detail)
+            self._add_detail()
+        self._fill_detail(len(details) - 1, details[-1])
+
+    def _fill_detail(self, index, detail):
+        detail_editor = self._get_detail_editor_by_index(index)
+        detail_editor.fill(field=self.objectName, index=index, detail=detail)
+
+    def _get_detail_editor_by_index(self, index):
+        object_name = self._get_contact_detail_editor_object_name(index)
+        return self.select_single(
+            ContactDetailWithTypeEditor, objectName=object_name)
+
+    def _get_contact_detail_editor_object_name(self, index):
+        return self._DETAIL_EDITORS[self.objectName].format(index)
+
+    def _add_detail(self):
+        # TODO --elopio - 2014-03-01
+        raise NotImplementedError('Add extra details not yet implemented.')
+
+    def get_values(self, object_name):
+        """Return the values of a contact detail group."""
+        values = []
+        for index in range(self.detailsCount):
+            detail_editor = self._get_detail_editor_by_index(index)
+            value = detail_editor.get_values(field=object_name, index=index)
+            if (value):
+                values.append(value)
+
+        return values
+
+
+class ContactDetailWithTypeEditor(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Custom proxy object for the ContactDetailWithTypeEditor widget."""
+
+    def fill(self, field, index, detail):
+        self._select_type(detail)
+        self._fill_value(field, index, detail)
+
+    def _select_type(self, detail):
+        type_index = detail.TYPES.index(detail.type)
+        selected_type_index = self._get_selected_type_index()
+        if type_index != selected_type_index:
+            # TODO --elopio - 2014-03-01
+            raise NotImplementedError('Type selection not yet implemented.')
+
+    def _get_selected_type_index(self):
+        value_selector = self.select_single('ValueSelector')
+        return value_selector.currentIndex
+
+    def _fill_value(self, field, index, detail):
+        single_values = {
+            'phones': 'number',
+            'emails': 'address',
+            'ims': 'alias'
+        }
+        if field in single_values:
+            self._fill_single_field(getattr(detail, single_values[field]))
+        elif field == 'addresses':
+            self._fill_address(index, detail)
+        elif field == 'professionalDetails':
+            self._fill_professional_details(index, detail)
+        else:
+            raise _errors.AddressBookAppError(
+                'Unknown field: {}.'.format(field))
+
+    def _fill_single_field(self, value):
+        text_field = self.select_single(TextInputDetail)
+        self._make_field_visible_and_write(text_field, value)
+
+    def _make_field_visible_and_write(self, text_field, value):
+        while not text_field.activeFocus:
+            # XXX We should just swipe the text field into view.
+            # Update this once bug http://pad.lv/1286479 is implemented.
+            # --elopio - 2014-03-01
+            text_field.keyboard.press_and_release('Tab')
+            time.sleep(0.1)
+            contact_editor = self.get_root_instance().select_single(
+                ContactEditor, objectName='contactEditorPage', active=True)
+            contact_editor.wait_to_stop_moving()
+
+        text_field.write(value)
+
+    def _fill_address(self, index, address):
+        fields = collections.OrderedDict()
+        fields['street'] = address.street
+        fields['locality'] = address.locality
+        fields['region'] = address.region
+        fields['postal_code'] = address.postal_code
+        fields['country'] = address.country
+        for key, value in fields.items():
+            text_field = _get_text_field(self, key, index)
+            self._make_field_visible_and_write(text_field, value)
+
+    def _fill_professional_details(self, index, address):
+        # TODO --elopio - 2014-03-01
+        raise NotImplementedError('Not yet implemented.')
+
+    def get_values(self, field, index):
+        if field == 'phones':
+            return data.Phone(
+                type_=data.Phone.TYPES[self._get_selected_type_index()],
+                number=self._get_single_field_value())
+        if field == 'emails':
+            return data.Email(
+                type_=data.Email.TYPES[self._get_selected_type_index()],
+                address=self._get_single_field_value())
+        if field == 'ims':
+            return data.SocialAlias(
+                type_=data.SocialAlias.TYPES[self._get_selected_type_index()],
+                alias=self._get_single_field_value())
+        if field == 'addresses':
+            return self._get_address_value(index)
+        if field == 'professionalDetails':
+            # TODO --elopio - 2014-03-01
+            return None
+        raise _errors.AddressBookAppError('Unknown field: {}.'.format(field))
+
+    def _get_single_field_value(self):
+        return self.select_single(TextInputDetail).text
+
+    def _get_address_value(self, index):
+        street = _get_text_field(self, 'street', index).text
+        locality = _get_text_field(self, 'locality', index).text
+        region = _get_text_field(self, 'region', index).text
+        postal_code = _get_text_field(self, 'postal_code', index).text
+        country = _get_text_field(self, 'country', index).text
+        return data.Address(
+            type_=data.Address.TYPES[self._get_selected_type_index()],
+            street=street, locality=locality, region=region,
+            postal_code=postal_code, country=country)

=== renamed file 'tests/autopilot/address_book_app/emulators/contact_list_page.py' => 'tests/autopilot/address_book_app/pages/_contact_list_page.py'
--- tests/autopilot/address_book_app/emulators/contact_list_page.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/pages/_contact_list_page.py	2014-05-22 14:40:49 +0000
@@ -1,23 +1,33 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """ ContactListPage emulator for Addressbook App tests """
 
-# Copyright 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
 import logging
+import time
 
 from autopilot.introspection.dbus import StateNotFoundError
-from ubuntuuitoolkit import emulators as uitk
+
+from address_book_app.pages import _common, _contact_view
+
 
 LOGGER = logging.getLogger(__name__)
-from time import sleep
-
-
-class ContactListPage(uitk.UbuntuUIToolkitEmulatorBase):
+
+
+class ContactListPage(_common.PageWithHeader, _common.PageWithBottomEdge):
     """ ContactListPage emulator class """
 
     def __init__(self, *args):
@@ -26,6 +36,18 @@
         self.selected_marks = []
         super(ContactListPage, self).__init__(*args)
 
+    def open_contact(self, index):
+        """Open the page with the contact information.
+
+        :param index: The index of the contact to open.
+        :return: The page with the contact information.
+
+        """
+        contacts = self.get_contacts()
+        self.pointing_device.click_object(contacts[index])
+        return self.get_root_instance().select_single(
+            _contact_view.ContactView, objectName='contactViewPage')
+
     def _get_list_view(self):
         return self.wait_select_single("ContactListView",
                                        objectName="contactListView")
@@ -35,7 +57,7 @@
         Returns a list of ContactDelegate objects and populate
         self.selection_marks
         """
-        sleep(1)
+        time.sleep(1)
         self.contacts = self.select_many("ContactDelegate")
         self.selection_marks = []
         for contact in self.contacts:
@@ -52,7 +74,7 @@
             self.selected_marks.append(self.selection_marks[idx])
             self.pointing_device.move_to_object(self.contacts[idx])
             self.pointing_device.press()
-            sleep(2.0)
+            time.sleep(2.0)
             self.pointing_device.release()
             view.isInSelectionMode.wait_for(True)
         else:
@@ -110,4 +132,3 @@
         dialog = main_window.wait_select_single("RemoveContactsDialog",
             objectName="removeContactsDialog")
         self.click_button(main_window, "removeContactsDialog.Yes")
-

=== added file 'tests/autopilot/address_book_app/pages/_contact_view.py'
--- tests/autopilot/address_book_app/pages/_contact_view.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/_contact_view.py	2014-05-22 14:40:49 +0000
@@ -0,0 +1,28 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from address_book_app.pages import _common, _contact_editor
+
+
+class ContactView(_common.PageWithHeader):
+    """Autopilot helper for the ContactView page."""
+
+    def go_to_edit_contact(self):
+        self.get_header().click_action_button('edit')
+        return self.get_root_instance().select_single(
+            _contact_editor.ContactEditor,
+            objectName='contactEditorPage',
+            active=True)

=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2014-05-22 14:40:49 +0000
@@ -16,7 +16,8 @@
 from autopilot.platform import model
 from testtools.matchers import Equals
 
-from address_book_app.emulators.main_window import MainWindow
+import address_book_app
+from address_book_app import MainWindow
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
 
@@ -71,6 +72,7 @@
         AddressBookAppTestCase.ARGS = []
         AddressBookAppTestCase.PRELOAD_VCARD = False
         self.main_window.visible.wait_for(True)
+        self.app = address_book_app.AddressBookApp(self.app_proxy)
 
     def tearDown(self):
         super(AddressBookAppTestCase, self).tearDown()
@@ -80,7 +82,7 @@
             subprocess.check_call(["/sbin/initctl", "start", "maliit-server"])
 
     def launch_test_local(self):
-        self.app = self.launch_test_application(
+        self.app_proxy = self.launch_test_application(
             self.app_bin,
             *AddressBookAppTestCase.ARGS,
             app_type='qt',
@@ -89,19 +91,19 @@
     def launch_test_installed(self):
         df = "/usr/share/applications/address-book-app.desktop"
         self.ARGS.append("--desktop_file_hint=" + df)
-        self.app = self.launch_test_application(
+        self.app_proxy = self.launch_test_application(
             "address-book-app",
             *AddressBookAppTestCase.ARGS,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_click_installed(self):
-        self.app = self.launch_click_package(
+        self.app_proxy = self.launch_click_package(
             "com.ubuntu.address-book")
 
     @property
     def main_window(self):
-        return self.app.select_single(MainWindow)
+        return self.app_proxy.select_single(MainWindow)
 
     def select_a_value(self, field, value_selector, value):
         # Make sure the field has focus

=== modified file 'tests/autopilot/address_book_app/tests/test_add_contact.py'
--- tests/autopilot/address_book_app/tests/test_add_contact.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/tests/test_add_contact.py	2014-05-22 14:40:49 +0000
@@ -11,9 +11,9 @@
 from autopilot.matchers import Eventually
 from autopilot.introspection import dbus
 
+import address_book_app
 from address_book_app import data
 from address_book_app.tests import AddressBookAppTestCase
-from address_book_app.emulators import main_window
 
 
 class TestAddContact(AddressBookAppTestCase):
@@ -22,37 +22,39 @@
     def test_go_to_add_contact(self):
         """Test to launch the add contact screen using emulator method"""
         self.assertRaises(
-            dbus.StateNotFoundError, self.main_window.get_contact_edit_page)
-        contact_editor = self.main_window.go_to_add_contact()
+            dbus.StateNotFoundError,
+            self.app.main_window.get_contact_edit_page)
+        contact_editor = self.app.main_window.go_to_add_contact()
         self.assertTrue(contact_editor.visible)
-        self.assertIsInstance(contact_editor, main_window.ContactEditor)
+        self.assertIsInstance(
+            contact_editor, address_book_app.pages.ContactEditor)
 
     def test_add_and_cancel_contact(self):
-        list_page = self.main_window.get_contact_list_page()
+        list_page = self.app.main_window.get_contact_list_page()
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # Check if the contact list disapear and contact editor appears
         self.assertThat(list_page.visible, Eventually(Equals(False)))
         self.assertThat(contact_editor.visible, Eventually(Equals(True)))
 
         # cancel new contact without save
-        self.main_window.cancel()
+        self.app.main_window.cancel()
 
         # Check if the contact list is visible again
         self.assertThat(list_page.visible, Eventually(Equals(True)))
 
         # Check if the contact list still empty
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
     def test_add_contact_without_name(self):
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # Try to save a empty contact
-        acceptButton = self.main_window.get_button("save")
+        acceptButton = self.app.main_window.get_button("save")
 
         # Save button must be disabled
         self.assertThat(acceptButton.enabled, Eventually(Equals(False)))
@@ -82,59 +84,59 @@
         self.pointing_device.click_object(acceptButton)
 
         # Check if the contact editor still visbile
-        list_page = self.main_window.get_contact_list_page()
+        list_page = self.app.main_window.get_contact_list_page()
 
         self.assertThat(list_page.visible, Eventually(Equals(False)))
         self.assertThat(contact_editor.visible, Eventually(Equals(True)))
 
         # Check if the contact list still empty
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
     def test_add_contact_with_full_name(self):
         test_contact = data.Contact(first_name='Fulano', last_name='de Tal')
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if the contact list is visible again
-        list_page = self.main_window.get_contact_list_page()
+        list_page = self.app.main_window.get_contact_list_page()
         self.assertThat(list_page.visible, Eventually(Equals(True)))
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_contact_with_first_name(self):
         test_contact = data.Contact(first_name='Fulano')
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_contact_with_last_name(self):
         test_contact = data.Contact(last_name='de Tal')
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_contact_with_name_and_phone(self):
@@ -143,14 +145,14 @@
             phones=[data.Phone.make()])
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_full_contact(self):
@@ -160,19 +162,19 @@
         test_contact.professional_details = []
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_email_label_save(self):
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # fill name
         contact_editor.fill_form(
@@ -186,13 +188,13 @@
         self.set_email_address(2, "[e-mail]", 2)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
-        contacts = self.main_window.select_many("ContactDelegate")
+        contacts = self.app.main_window.select_many("ContactDelegate")
         self.pointing_device.click_object(contacts[0])
 
         # check if contacts was saved with the correct labels
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have 3 emails"""
@@ -222,7 +224,7 @@
 
     def test_phone_label_save(self):
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # fill name
         contact_editor.fill_form(
@@ -240,13 +242,13 @@
         self.set_phone_number(4, "[phone]", 4)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
-        contacts = self.main_window.select_many("ContactDelegate")
+        contacts = self.app.main_window.select_many("ContactDelegate")
         self.pointing_device.click_object(contacts[0])
 
         # check if contacts was saved with the correct labels
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have five phones"""

=== modified file 'tests/autopilot/address_book_app/tests/test_contactlist.py'
--- tests/autopilot/address_book_app/tests/test_contactlist.py	2014-03-12 20:35:16 +0000
+++ tests/autopilot/address_book_app/tests/test_contactlist.py	2014-05-22 14:40:49 +0000
@@ -17,6 +17,6 @@
     """Tests the contact list features"""
 
     def test_contact_list(self):
-        contact_list = self.main_window.get_contact_list_page()
+        contact_list = self.app.main_window.get_contact_list_page()
         self.assertThat(contact_list.visible, Eventually(Equals(True)))
         pass

=== modified file 'tests/autopilot/address_book_app/tests/test_create_new_from_uri.py'
--- tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2014-05-22 14:40:49 +0000
@@ -23,17 +23,17 @@
         super(TestCreateNewContactFromURI, self).setUp()
 
     def test_save_new_contact(self):
-        list_page = self.main_window.get_contact_list_page()
+        list_page = self.app.main_window.get_contact_list_page()
         list_page.isReady.wait_for(True)
-        
-        edit_page = self.main_window.get_contact_edit_page()
+
+        edit_page = self.app.main_window.get_contact_edit_page()
         self.assertThat(edit_page.visible, Eventually(Equals(True)))
 
         # add name to the contact
-        firstNameField = self.main_window.wait_select_single(
+        firstNameField = self.app.main_window.wait_select_single(
             "TextInputDetail",
             objectName="firstName")
-        lastNameField = self.main_window.wait_select_single(
+        lastNameField = self.app.main_window.wait_select_single(
             "TextInputDetail",
             objectName="lastName")
 
@@ -41,14 +41,14 @@
         self.type_on_field(lastNameField, "de Tal")
 
         # save the contact
-        acceptButton = self.main_window.save()
+        self.app.main_window.save()
 
         # open contact view
-        contacts = self.main_window.select_many("ContactDelegate")
+        contacts = self.app.main_window.select_many("ContactDelegate")
         self.pointing_device.click_object(contacts[0])
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
-        
+
 
         # check if we have the new phone"""
         phone_group = view_page.select_single(

=== renamed file 'tests/autopilot/address_book_app/tests/test_emulators.py' => 'tests/autopilot/address_book_app/tests/test_custom_proxy_objects.py'
--- tests/autopilot/address_book_app/tests/test_emulators.py	2014-03-01 11:03:45 +0000
+++ tests/autopilot/address_book_app/tests/test_custom_proxy_objects.py	2014-05-22 14:40:49 +0000
@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from address_book_app import data, tests
-from address_book_app.emulators import main_window
-
 
 class ContactEditorTestCase(tests.AddressBookAppTestCase):
 
@@ -29,7 +27,7 @@
         # --elopio - 2014-03-01
         test_contact.professional_details = []
 
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         contact_editor.fill_form(test_contact)
 

=== modified file 'tests/autopilot/address_book_app/tests/test_delete_contact.py'
--- tests/autopilot/address_book_app/tests/test_delete_contact.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/tests/test_delete_contact.py	2014-05-22 14:40:49 +0000
@@ -35,7 +35,7 @@
     def setUp(self):
         AddressBookAppTestCase.PRELOAD_VCARD = True
         super(TestDeleteSelectContact, self).setUp()
-    
+
     def test_select(self):
         """
         Delete a contact in pick mode
@@ -45,15 +45,15 @@
         contact in the list before and after the action.
         Note that it doesn't check which contact has been deleted.
         """
-        listpage = self.main_window.get_contact_list_page()
+        listpage = self.app.main_window.get_contact_list_page()
         contacts_before = listpage.get_contacts()
 
         listpage.select_contacts_by_index(self.select)
         deleted = []
         if self.action == "cancel":
-            self.main_window.cancel()
+            self.app.main_window.cancel()
         elif self.action == "delete":
-            listpage.delete(self.main_window)
+            listpage.delete(self.app.main_window)
             deleted = self.select
 
         contacts_after = listpage.get_contacts()

=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-05-22 14:40:49 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-05-22 14:40:49 +0000
@@ -10,6 +10,7 @@
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
+from address_book_app import data
 from address_book_app.tests import AddressBookAppTestCase
 
 
@@ -17,6 +18,21 @@
     """Tests edit a contact"""
     PHONE_NUMBERS = ['[phone]', '[phone]', '[phone]']
 
+    PHONE_NUMBERS = ['[phone]', '[phone]', '[phone]']
+
+    def add_test_contact(self):
+        test_contact = data.Contact('test', 'test')
+        # TODO implement the filling of professional details.
+        # --elopio - 2014-03-01
+        test_contact.professional_details = []
+
+        # execute add new contact
+        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor.fill_form(test_contact)
+
+        # Save contact
+        self.main_window.save()
+
     def test_add_new_phone(self):
         self.add_contact("Fulano", "de Tal", [self.PHONE_NUMBERS[0]])
         edit_page = self.edit_contact(0)
@@ -28,15 +44,15 @@
         self.create_new_detail(phoneGroup)
 
         # fill phone number
-        phone_number_1 = self.main_window.select_single(
+        phone_number_1 = self.app.main_window.select_single(
             "TextInputDetail",
             objectName="phoneNumber_1")
         self.type_on_field(phone_number_1, self.PHONE_NUMBERS[1])
 
-        self.main_window.save()
+        self.app.main_window.save()
 
         # go back to view page
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have two phones"""
@@ -62,10 +78,10 @@
         self.clear_text_on_field(phone_number_1)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # check if we have onlye one phone
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         phone_group = view_page.select_single(
             "ContactDetailGroupWithTypeView",
             objectName="phones")
@@ -92,10 +108,10 @@
             objectName="emailAddress_0")
         self.type_on_field(email_field, "[e-mail]")
 
-        self.main_window.save()
+        self.app.main_window.save()
 
         # go back to view page
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have a new email
@@ -122,10 +138,10 @@
         self.clear_text_on_field(email_address_0)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # check if the email list is empty
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         emails_group = view_page.select_single(
             "ContactDetailGroupWithTypeView",
             objectName="emails")
@@ -147,15 +163,15 @@
         self.clear_text_on_field(last_name_field)
 
         # check if is possible to save a contact without name
-        self.main_window.save()
-        accept_button = self.main_window.get_button("save")
+        self.app.main_window.save()
+        accept_button = self.app.main_window.get_button("save")
         self.assertThat(accept_button.enabled, Eventually(Equals(False)))
 
         # Cancel edit
-        self.main_window.cancel()
+        self.app.main_window.cancel()
 
         # Check if the names still there
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.title, Eventually(Equals("Fulano de Tal")))
 
     def test_im_type(self):
@@ -177,9 +193,9 @@
         self.select_a_value(im_address_0, im_value_selector, 0)
 
         # save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
 
         # check if the type was saved correct
         im_type = view_page.select_single(

=== modified file 'tests/autopilot/address_book_app/tests/test_multiple_pick_mode.py'
--- tests/autopilot/address_book_app/tests/test_multiple_pick_mode.py	2014-03-12 20:35:16 +0000
+++ tests/autopilot/address_book_app/tests/test_multiple_pick_mode.py	2014-05-22 14:40:49 +0000
@@ -22,7 +22,7 @@
         super(TestMultiplePickerMode, self).setUp()
 
     def test_select_contacts(self):
-        pick_page = self.main_window.get_contact_list_pick_page()
+        pick_page = self.app.main_window.get_contact_list_pick_page()
         contacts = pick_page.select_many("ContactDelegate")
         # all selection marks should be visible
         selection_marks = []

=== modified file 'tests/autopilot/address_book_app/tests/test_single_pick_mode.py'
--- tests/autopilot/address_book_app/tests/test_single_pick_mode.py	2014-03-12 20:35:16 +0000
+++ tests/autopilot/address_book_app/tests/test_single_pick_mode.py	2014-05-22 14:40:49 +0000
@@ -22,7 +22,7 @@
         super(TestSinglePickerMode, self).setUp()
 
     def test_select_single_contact(self):
-        pick_page = self.main_window.get_contact_list_pick_page()
+        pick_page = self.app.main_window.get_contact_list_pick_page()
         contacts = pick_page.select_many("ContactDelegate")
         # all selection marks should be visible
         selection_marks = []

=== renamed file 'tests/autopilot/address_book_app/emulators/toolbar.py' => 'tests/autopilot/address_book_app/toolbar.py'