~ci-train-bot/history-service/history-service-ubuntu-yakkety-landing-052

Viewing changes to tests/daemon/DaemonTest.cpp

Committer: CI Train Bot
Author(s): Gustavo Pichorim Boiko
Date: 2015-10-20 20:21:43 UTC
mfrom: (209.2.54 history-service-cached_contact_matching)
Revision ID: ci-train-bot@canonical.com-20151020202143-1p8dga82hd9jbk1x

Request contact information for all known participants on history-daemon initialization, and use this cached information on the models.
Approved by: Tiago Salem Herrmann, PS Jenkins bot

files added:
daemon/history-daemon.conf

src/Participant

src/participant.cpp

src/participant.h

src/participant_p.h

tests/libhistoryservice/ParticipantTest.cpp

files modified:
Ubuntu/History/historyeventmodel.cpp

Ubuntu/History/historyeventmodel.h

Ubuntu/History/historygroupedeventsmodel.cpp

Ubuntu/History/historygroupedthreadsmodel.cpp

Ubuntu/History/historymodel.cpp

Ubuntu/History/historymodel.h

Ubuntu/History/historythreadmodel.cpp

daemon/CMakeLists.txt

daemon/historydaemon.cpp

daemon/historydaemon.h

daemon/historyservicedbus.cpp

debian/history-service.install

historyprivate/contactmatcher.cpp

historyprivate/contactmatcher_p.h

plugins/sqlite/sqlitehistoryplugin.cpp

plugins/sqlite/sqlitehistoryplugin.h

src/CMakeLists.txt

src/event.cpp

src/event.h

src/event_p.h

src/eventview.cpp

src/manager.cpp

src/manager.h

src/manager_p.h

src/plugin.h

src/textevent.cpp

src/textevent.h

src/textevent_p.h

src/thread.cpp

src/thread.h

src/thread_p.h

src/threadview.cpp

src/voiceevent.cpp

src/voiceevent.h

src/voiceevent_p.h

tests/daemon/DaemonTest.cpp

tests/historyprivate/ContactMatcherTest.cpp

tests/libhistoryservice/CMakeLists.txt

tests/libhistoryservice/ManagerTest.cpp

tests/libhistoryservice/TextEventTest.cpp

tests/libhistoryservice/ThreadTest.cpp

tests/libhistoryservice/VoiceEventTest.cpp

tests/plugins/sqlite/SqlitePluginTest.cpp

tools/makevoiceevents/main.cpp

tools/reader/main.cpp

Show diffs side-by-side

added added

removed removed

tests/daemon/DaemonTest.cpp

142

QCOMPARE(threads.count(), 1);

143

History::Thread thread = threads.first();

144

QCOMPARE(thread.participants().count(), 1);

145

QCOMPARE(thread.participants().first(), sender);

145

QCOMPARE(thread.participants().first().identifier(), sender);

146

147

QTRY_COMPARE(threadsModifiedSpy.count(), 1);

148

threads = threadsModifiedSpy.first().first().value<History::Threads>();

253

QCOMPARE(threads.count(), 1);

254

History::Thread thread = threads.first();

255

QCOMPARE(thread.participants().count(), 1);

256

QCOMPARE(thread.participants().first(), recipient);

256

QCOMPARE(thread.participants().first().identifier(), recipient);

257

258

QTRY_COMPARE(threadsModifiedSpy.count(), 1);

259

threads = threadsModifiedSpy.first().first().value<History::Threads>();

297

QCOMPARE(threads.count(), 1);

298

History::Thread thread = threads.first();

299

QCOMPARE(thread.participants().count(), 1);

300

QCOMPARE(thread.participants().first(), callerId);

300

QCOMPARE(thread.participants().first().identifier(), callerId);

301

302

QTRY_COMPARE(threadsModifiedSpy.count(), 1);

303

threads = threadsModifiedSpy.first().first().value<History::Threads>();

358

QCOMPARE(threads.count(), 1);

359

History::Thread thread = threads.first();

360

QCOMPARE(thread.participants().count(), 1);

361

QCOMPARE(thread.participants().first(), phoneNumber);

361

QCOMPARE(thread.participants().first().identifier(), phoneNumber);

362

363

QTRY_COMPARE(threadsModifiedSpy.count(), 1);

364

threads = threadsModifiedSpy.first().first().value<History::Threads>();

Older »