Merge lp://staging/~boiko/history-service/improve_tests_and_test_contact_matching into lp://staging/history-service
| Status: | Merged |
|---|---|
| Approved by: | Tiago Salem Herrmann |
| Approved revision: | 196 |
| Merged at revision: | 191 |
| Proposed branch: | lp://staging/~boiko/history-service/improve_tests_and_test_contact_matching |
| Merge into: | lp://staging/history-service |
| Prerequisite: | lp://staging/~boiko/history-service/improve_contact_matching |
| Diff against target: |
5322 lines (+3345/-753) 54 files modified
.bzrignore (+14/-5) CMakeLists.txt (+31/-17) cmake/modules/GenerateTest.cmake (+131/-0) daemon/CMakeLists.txt (+0/-2) daemon/tests/dbus-test-wrapper.sh.in (+0/-20) daemon/tests/telepathyhelper.cpp (+0/-279) daemon/tests/telepathyhelper.h (+0/-94) historyprivate/contactmatcher.cpp (+9/-4) historyprivate/contactmatcher_p.h (+2/-2) historyprivate/telepathyhelper.cpp (+14/-0) historyprivate/telepathyhelper_p.h (+2/-0) plugins/sqlite/CMakeLists.txt (+0/-1) plugins/sqlite/sqlitedatabase.cpp (+2/-0) src/CMakeLists.txt (+0/-2) tests/CMakeLists.txt (+7/-0) tests/common/CMakeLists.txt (+14/-0) tests/common/dbus-services/CMakeLists.txt (+9/-0) tests/common/dbus-session.conf.in (+42/-0) tests/common/mock/CMakeLists.txt (+4/-1) tests/common/mock/MockConnection.xml (+103/-11) tests/common/mock/callchannel.cpp (+29/-11) tests/common/mock/callchannel.h (+13/-3) tests/common/mock/conferencecallchannel.cpp (+268/-0) tests/common/mock/conferencecallchannel.h (+84/-0) tests/common/mock/connection.cpp (+313/-78) tests/common/mock/connection.h (+68/-11) tests/common/mock/dbustypes.h (+3/-3) tests/common/mock/emergencymodeiface.cpp (+133/-0) tests/common/mock/emergencymodeiface.h (+121/-0) tests/common/mock/main.cpp (+10/-3) tests/common/mock/mockconnectiondbus.cpp (+76/-10) tests/common/mock/mockconnectiondbus.h (+30/-7) tests/common/mock/protocol.cpp (+16/-3) tests/common/mock/protocol.h (+1/-0) tests/common/mock/speakeriface.cpp (+131/-0) tests/common/mock/speakeriface.h (+129/-0) tests/common/mock/textchannel.cpp (+68/-16) tests/common/mock/textchannel.h (+13/-5) tests/common/mock/ussdiface.cpp (+312/-0) tests/common/mock/ussdiface.h (+244/-0) tests/common/mock/voicemailiface.cpp (+202/-0) tests/common/mock/voicemailiface.h (+150/-0) tests/common/mockcontroller.cpp (+80/-26) tests/common/mockcontroller.h (+32/-9) tests/common/telepathytest.cpp (+144/-0) tests/common/telepathytest.h (+54/-0) tests/daemon/CMakeLists.txt (+8/-43) tests/daemon/DaemonTest.cpp (+45/-25) tests/daemon/handler.cpp (+1/-1) tests/historyprivate/CMakeLists.txt (+12/-0) tests/historyprivate/ContactMatcherTest.cpp (+131/-0) tests/libhistoryservice/CMakeLists.txt (+32/-37) tests/plugins/CMakeLists.txt (+1/-0) tests/plugins/sqlite/CMakeLists.txt (+7/-24) |
| To merge this branch: | bzr merge lp://staging/~boiko/history-service/improve_tests_and_test_contact_matching |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tiago Salem Herrmann (community) | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Change the tests to use the same infrastructure as the one used in telephony-service, and add some tests for the contact matching changes.
Description of the change
Change the tests to use the same infrastructure as the one used in telephony-service, and add some tests for the contact matching changes.
== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
Yes: https:/
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes
Did you successfully run all tests found in your component's Test Plan (https:/
Yes
If you changed the UI, was the change specified/approved by design?
N/A
If you changed UI labels, did you update the pot file?
N/A
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A
| PS Jenkins bot (ps-jenkins) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
PASSED: Continuous integration, rev:195
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://