address-book-app

Merge lp://qastaging/~renatofilho/address-book-app/fix-test_import_from_sim into lp://qastaging/address-book-app

  1. fix-test_import_from_sim
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp://qastaging/~renatofilho/address-book-app/fix-test_import_from_sim
Merge into: lp://qastaging/address-book-app
Diff against target: 8750 lines (+3847/-3489)
135 files modified
CMakeLists.txt (+1/-0)
debian/control (+12/-1)
debian/qtdeclarative5-ubuntu-addressbook0.1.install (+4/-0)
src/app/CMakeLists.txt (+0/-2)
src/app/addressbookapp.cpp (+1/-24)
src/app/addressbookapp.h (+1/-2)
src/app/main.cpp (+1/-1)
src/imports/ABContactEditorPage.qml (+56/-0)
src/imports/ABContactListPage.qml (+530/-0)
src/imports/ABContactViewPage.qml (+87/-0)
src/imports/CMakeLists.txt (+3/-5)
src/imports/Common/CMakeLists.txt (+0/-15)
src/imports/Common/ContactDetailItem.qml (+0/-62)
src/imports/Common/ContactExporter.qml (+0/-167)
src/imports/Common/KeyboardRectangle.qml (+0/-74)
src/imports/Common/RemoveContactsDialog.qml (+0/-78)
src/imports/Common/StandardAnimation.qml (+0/-22)
src/imports/ContactEdit/ContactEditor.qml (+0/-461)
src/imports/ContactList/CMakeLists.txt (+0/-11)
src/imports/ContactList/ContactListPage.qml (+0/-554)
src/imports/ContactList/VCardImportDialog.qml (+0/-94)
src/imports/ContactShare/CMakeLists.txt (+0/-10)
src/imports/ContactShare/ContactSharePage.qml (+0/-56)
src/imports/ContactView/ContactView.qml (+0/-123)
src/imports/ContentHubProxy.qml (+1/-1)
src/imports/MainWindow.qml (+1/-2)
src/imports/Ubuntu/AddressBook/Base/CMakeLists.txt (+30/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml (+112/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml (+159/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupWithTypeBase.qml (+132/-0)
src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+62/-0)
src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+167/-0)
src/imports/Ubuntu/AddressBook/Base/KeyboardRectangle.qml (+70/-0)
src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml (+78/-0)
src/imports/Ubuntu/AddressBook/Base/qmldir (+9/-0)
src/imports/Ubuntu/AddressBook/CMakeLists.txt (+4/-0)
src/imports/Ubuntu/AddressBook/ContactEditor/CMakeLists.txt (+20/-7)
src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+5/-5)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAddressesEditor.qml (+7/-7)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+7/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailEmailsEditor.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+3/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+4/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOnlineAccountsEditor.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailOrganizationsEditor.qml (+5/-5)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailPhoneNumbersEditor.qml (+3/-3)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml (+4/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+3/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+444/-0)
src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/qmldir (+18/-0)
src/imports/Ubuntu/AddressBook/ContactShare/CMakeLists.txt (+26/-0)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+60/-0)
src/imports/Ubuntu/AddressBook/ContactShare/qmldir (+3/-0)
src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml (+34/-0)
src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+85/-0)
src/imports/Ubuntu/AddressBook/ContactView/CMakeLists.txt (+32/-7)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml (+32/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml (+89/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml (+29/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml (+66/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml (+2/-2)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml (+31/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOrganizationsView.qml (+32/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumberView.qml (+94/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml (+41/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml (+62/-0)
src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml (+5/-8)
src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+198/-0)
src/imports/Ubuntu/AddressBook/ContactView/qmldir (+19/-0)
src/imports/Ubuntu/CMakeLists.txt (+3/-1)
src/imports/Ubuntu/Contacts/ActionButton.qml (+1/-1)
src/imports/Ubuntu/Contacts/BasicFieldView.qml (+0/-85)
src/imports/Ubuntu/Contacts/CMakeLists.txt (+4/-18)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailAddressesView.qml (+0/-32)
src/imports/Ubuntu/Contacts/ContactDetailAvatarView.qml (+0/-86)
src/imports/Ubuntu/Contacts/ContactDetailBase.qml (+0/-110)
src/imports/Ubuntu/Contacts/ContactDetailEmailsView.qml (+0/-29)
src/imports/Ubuntu/Contacts/ContactDetailGroupBase.qml (+0/-159)
src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeBase.qml (+0/-126)
src/imports/Ubuntu/Contacts/ContactDetailGroupWithTypeView.qml (+0/-63)
src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountsView.qml (+0/-29)
src/imports/Ubuntu/Contacts/ContactDetailOrganizationsView.qml (+0/-32)
src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberView.qml (+0/-90)
src/imports/Ubuntu/Contacts/ContactDetailPhoneNumbersView.qml (+0/-38)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailWithTypeView.qml (+0/-60)
src/imports/Ubuntu/Contacts/ContactFetch.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactList.js (+1/-1)
src/imports/Ubuntu/Contacts/ContactListModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListView.qml (+5/-5)
src/imports/Ubuntu/Contacts/ContactPreviewPage.qml (+0/-131)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+1/-1)
src/imports/Ubuntu/Contacts/Contacts.js (+24/-0)
src/imports/Ubuntu/Contacts/MostCalledModel.qml (+11/-11)
src/imports/Ubuntu/Contacts/MultipleSelectionVisualModel.qml (+1/-1)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+11/-11)
src/imports/Ubuntu/Contacts/contacts.cpp (+26/-0)
src/imports/Ubuntu/Contacts/contacts.h (+2/-1)
src/imports/Ubuntu/Contacts/imagescalethread.cpp (+1/-1)
src/imports/Ubuntu/Contacts/imagescalethread.h (+1/-1)
src/imports/Ubuntu/Contacts/mostcalledproxymodel.cpp (+1/-1)
src/imports/Ubuntu/Contacts/mostcalledproxymodel.h (+1/-1)
src/imports/Ubuntu/Contacts/plugin.cpp (+1/-1)
src/imports/Ubuntu/Contacts/plugin.h (+1/-1)
src/imports/Ubuntu/Contacts/qmldir (+1/-16)
tests/autopilot/address_book_app/__init__.py (+6/-5)
tests/autopilot/address_book_app/address_book/__init__.py (+32/-0)
tests/autopilot/address_book_app/address_book/_common.py (+52/-0)
tests/autopilot/address_book_app/address_book/_contact_editor_page.py (+303/-0)
tests/autopilot/address_book_app/address_book/_contact_view_page.py (+28/-0)
tests/autopilot/address_book_app/address_book/_remove_contact_dialog.py (+36/-0)
tests/autopilot/address_book_app/address_book/_sim_card_import_page.py (+101/-0)
tests/autopilot/address_book_app/pages/__init__.py (+7/-8)
tests/autopilot/address_book_app/pages/_ab_contact_list_page.py (+136/-0)
tests/autopilot/address_book_app/pages/_ab_contact_view_page.py (+28/-0)
tests/autopilot/address_book_app/pages/_common.py (+0/-52)
tests/autopilot/address_book_app/pages/_contact_editor.py (+0/-299)
tests/autopilot/address_book_app/pages/_contact_list_page.py.THIS (+6/-0)
tests/autopilot/address_book_app/pages/_contact_view.py (+0/-28)
tests/autopilot/address_book_app/pages/_sim_card_import_page.py (+0/-103)
tests/autopilot/address_book_app/tests/test_add_contact.py (+2/-2)
tests/autopilot/address_book_app/tests/test_custom_proxy_objects.py (+2/-1)
tests/autopilot/address_book_app/tests/test_data.py (+1/-1)
tests/autopilot/address_book_app/tests/test_edit_contact.py (+1/-1)
tests/autopilot/address_book_app/tests/test_import_from_sim.py (+2/-7)
tests/qml/tst_ContactEditor.qml (+2/-2)
tests/qml/tst_ContactList.qml (+2/-2)
tests/qml/tst_ContactListView.qml (+0/-1)
tests/qml/tst_ContactPreviewPage.qml (+3/-1)
To merge this branch: bzr merge lp://qastaging/~renatofilho/address-book-app/fix-test_import_from_sim
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Leo Arias (community) Approve
Omer Akram (community) Approve
Review via email: mp+256204@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2015-05-12.

Commit message

Updated autopilot test:

Check if "import from sim button" is invisible when all SIM cards get removed.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:423
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/792/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2225
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/801/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2223
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19619
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/641/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/960
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/960/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

Now that the test behavior have been changed, please change the test name to something like:

test_import_item_disabled_without_sim_card()

review: Needs Fixing
Revision history for this message
Omer Akram (om26er) wrote :

Other than that code looks good to me.

lp://qastaging/~renatofilho/address-book-app/fix-test_import_from_sim updated
424. By Renato Araujo Oliveira Filho

Renamed test.

Revision history for this message
Omer Akram (om26er) wrote :

Looks good now.

review: Approve
lp://qastaging/~renatofilho/address-book-app/fix-test_import_from_sim updated
425. By Renato Araujo Oliveira Filho

Cleaned up the test.

Revision history for this message
Leo Arias (elopio) wrote :

Every failed test is an opportunity to clean up the test and make it more readable.
Take a look at:
https://code.launchpad.net/~canonical-platform-qa/address-book-app/fix-test_import_from_sim-cleanup/+merge/257931

In there, I removed the initial check because it has nothing to do with the name of the test. It should be tested elsewhere that when you open the app, no contacts are shown.

Also, I moved the selection to the page helper object. Every time you have a select single in the test body, there's something wrong. If we move them to the page object it will be easier to read and easier to maintain.

After the cleanup, it seems to me that this is a good candidate to be turned into a QML test. Here we are only checking that a button is not shown if certain conditions are not met. That's purely UI, it has nothing to do with a user story so autopilot seems like a tool too big and slow for it. Do you agree?

Finally, the name of the test still sounds wrong: test_import_item_disabled_without_sim_card
We are not checking that the item is disabled. We are checking that it is not visible.

review: Needs Fixing
Revision history for this message
Leo Arias (elopio) wrote :

ah, and this might conflicts with federico's flake8 branch:
https://code.launchpad.net/~canonical-platform-qa/address-book-app/flake8-fixes/+merge/256684

It would be safer using that branch as a prerequisite.

lp://qastaging/~renatofilho/address-book-app/fix-test_import_from_sim updated
426. By Renato Araujo Oliveira Filho

renamed test function.

Revision history for this message
Leo Arias (elopio) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:424
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/799/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2574
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/850/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2572
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2572/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20093
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/680/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1017
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1017/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:426
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/800/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2581
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/856/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2579
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2579/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20103
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/684/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1024
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1024/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
lp://qastaging/~renatofilho/address-book-app/fix-test_import_from_sim updated
427. By Renato Araujo Oliveira Filho

Trunk merged.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches