← Back to branch summary

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

« back to all changes in this revision

Viewing changes to tests/daemon/DaemonTest.cpp

Move the classes from historyprivate static library to libhistoryservice itself and just keep their header files private.
Approved by: Tiago Salem Herrmann, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/daemon/DaemonTest.cpp
90
90
 
91
91
    // register the handler
92
92
    mHandler = new Handler(this);
93
 
    TelepathyHelper::instance()->registerClient(mHandler, "HistoryTestHandler");
 
93
    History::TelepathyHelper::instance()->registerClient(mHandler, "HistoryTestHandler");
94
94
    QTRY_VERIFY(mHandler->isRegistered());
95
95
 
96
96
    // register the approver
97
97
    mApprover = new Approver(this);
98
 
    TelepathyHelper::instance()->registerClient(mApprover, "HistoryTestApprover");
 
98
    History::TelepathyHelper::instance()->registerClient(mApprover, "HistoryTestApprover");
99
99
    // Tp-qt does not set registered status to approvers
100
100
    QTRY_VERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(TELEPHONY_SERVICE_APPROVER));
101
101
 
109
109
    QVERIFY(!mAccount.isNull());
110
110
    QTRY_VERIFY(mAccount->isReady(Tp::Account::FeatureCore));
111
111
    QTRY_VERIFY(!mAccount->connection().isNull());
112
 
    QTRY_VERIFY(TelepathyHelper::instance()->connected());
 
112
    QTRY_VERIFY(History::TelepathyHelper::instance()->connected());
113
113
 
114
114
    mMockController = new MockController("mock", this);
115
115
}