Merge lp:~boiko/history-service/fix_telepathy_init_on_qml into lp:history-service

[Gustavo Pichorim Boiko]

Make sure Telepathy types are always initialized.

Make sure Telepathy types are always initialized.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/history-service-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/170
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/171/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/170

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/332/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/history-service-ci/333/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/171/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/333/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:227
http://jenkins.qa.ubuntu.com/job/history-service-ci/334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/173
        deb: http://jenkins.qa.ubuntu.com/job/history-service-vivid-armhf-ci/173/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/history-service-vivid-i386-ci/172

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/history-service-ci/334/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good. thanks.

review: Approve

=== modified file 'daemon/main.cpp'
--- daemon/main.cpp	2013-09-17 14:41:07 +0000
+++ daemon/main.cpp	2016-04-25 17:57:17 +0000
@@ -20,8 +20,6 @@
  */
 
 #include "historydaemon.h"
-#include <TelepathyQt/Types>
-#include <TelepathyQt/Debug>
 
 bool checkApplicationRunning()
 {
@@ -35,9 +33,6 @@
 }
 int main(int argc, char **argv)
 {
-    Tp::registerTypes();
-    Tp::enableWarnings(true);
-
     QCoreApplication app(argc, argv);
 
     if (checkApplicationRunning()) {

=== modified file 'src/telepathyhelper.cpp'
--- src/telepathyhelper.cpp	2015-10-06 12:50:14 +0000
+++ src/telepathyhelper.cpp	2016-04-25 17:57:17 +0000
@@ -23,6 +23,8 @@
 #include "telepathyhelper_p.h"
 
 #include <TelepathyQt/ClientRegistrar>
+#include <TelepathyQt/Types>
+#include <TelepathyQt/Debug>
 
 namespace History
 {
@@ -32,6 +34,10 @@
       mChannelObserver(0),
       mReady(false)
 {
+    // initialize telepathy
+    Tp::registerTypes();
+    Tp::enableWarnings(true);
+
     mAccountFeatures << Tp::Account::FeatureCore
                      << Tp::Account::FeatureProtocolInfo;
     mContactFeatures << Tp::Contact::FeatureAlias

=== modified file 'tests/Ubuntu.History/CMakeLists.txt'
--- tests/Ubuntu.History/CMakeLists.txt	2015-05-19 11:55:20 +0000
+++ tests/Ubuntu.History/CMakeLists.txt	2016-04-25 17:57:17 +0000
@@ -2,6 +2,8 @@
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}/Ubuntu/History
     ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/tests/common
+    ${TP_QT5_INCLUDE_DIRS}
     )
 
 set(SOURCE_DIR ${CMAKE_SOURCE_DIR}/Ubuntu/History)
@@ -12,3 +14,9 @@
               USE_XVFB
               TASKS --task ${CMAKE_BINARY_DIR}/daemon/history-daemon --ignore-return --task-name history-daemon
               WAIT_FOR com.canonical.HistoryService)
+generate_telepathy_test(HistoryEventModelTest
+                        SOURCES HistoryEventModelTest.cpp
+                        LIBRARIES ${TP_QT5_LIBRARIES} mockcontroller telepathytest history-qml
+                        USE_XVFB
+                        TASKS --task ${CMAKE_BINARY_DIR}/daemon/history-daemon --ignore-return --task-name history-daemon
+                        WAIT_FOR com.canonical.HistoryService)

=== added file 'tests/Ubuntu.History/HistoryEventModelTest.cpp'
--- tests/Ubuntu.History/HistoryEventModelTest.cpp	1970-01-01 00:00:00 +0000
+++ tests/Ubuntu.History/HistoryEventModelTest.cpp	2016-04-25 17:57:17 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This file is part of history-service.
+ *
+ * telephony-service is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-service 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/>.
+ */
+
+#include <QtTest/QtTest>
+#include "telepathytest.h"
+#include "manager.h"
+#include "textevent.h"
+#include "historyeventmodel.h"
+
+class HistoryEventModelTest : public TelepathyTest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void testTelepathyInitializedCorrectly();
+
+private:
+    History::Manager *mManager;
+};
+
+void HistoryEventModelTest::initTestCase()
+{
+    initialize(0);
+
+    mManager = History::Manager::instance();
+}
+
+void HistoryEventModelTest::testTelepathyInitializedCorrectly()
+{
+    Tp::AccountPtr account = addAccount("mock", "ofono", "My Account");
+    QVERIFY(!account.isNull());
+
+    // we don't actually test anything on the model other than it having the event
+    // but if telepathy is not properly initialized, this will crash.
+    HistoryEventModel model;
+    QString participant("textParticipant");
+
+    // create a temporary thread to populate the model
+    History::Thread textThread = mManager->threadForParticipants(account->uniqueIdentifier(),
+                                                             History::EventTypeText,
+                                                             QStringList() << participant,
+                                                             History::MatchCaseSensitive, true);
+
+    History::TextEvent event(textThread.accountId(),
+                             textThread.threadId(),
+                             "theEventId",
+                             participant,
+                             QDateTime::currentDateTime(),
+                             true,
+                             "Hi there",
+                             History::MessageTypeText,
+                             History::MessageStatusRead,
+                             QDateTime::currentDateTime(),
+                             "The subject",
+                             History::TextEventAttachments(),
+                             textThread.participants());
+    QVERIFY(mManager->writeEvents(History::Events() << event));
+
+    HistoryQmlFilter *filter = new HistoryQmlFilter(this);
+    filter->setFilterProperty(History::FieldThreadId);
+    filter->setFilterValue(textThread.threadId());
+    model.setFilter(filter);
+
+    HistoryQmlSort *sort = new HistoryQmlSort(this);
+    sort->setSortOrder(HistoryQmlSort::DescendingOrder);
+    sort->setSortField("timestamp");
+    model.setSort(sort);
+
+    QTRY_COMPARE(model.rowCount(), 1);
+
+    // this will trigger the crash if tp-qt is not properly initialized
+    qDebug() << model.index(0).data(HistoryEventModel::SenderRole);
+
+    mManager->removeThreads(History::Threads() << textThread);
+    QTRY_COMPARE(model.rowCount(), 0);
+}
+
+QTEST_MAIN(HistoryEventModelTest)
+#include "HistoryEventModelTest.moc"

=== modified file 'tests/common/telepathytest.cpp'
--- tests/common/telepathytest.cpp	2015-10-06 12:50:14 +0000
+++ tests/common/telepathytest.cpp	2016-04-25 17:57:17 +0000
@@ -24,10 +24,8 @@
 #include "telepathytest.h"
 #include "telepathyhelper_p.h"
 
-void TelepathyTest::initialize()
+void TelepathyTest::initialize(int waitTime)
 {
-    Tp::registerTypes();
-
     QSignalSpy spy(History::TelepathyHelper::instance(), SIGNAL(setupReady()));
     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, DEFAULT_TIMEOUT);
 
@@ -70,7 +68,7 @@
     QTRY_VERIFY(mReady);
 
     // give some time for telepathy stuff to settle
-    QTest::qWait(1000);
+    QTest::qWait(waitTime);
 }
 
 void TelepathyTest::doCleanup()

=== modified file 'tests/common/telepathytest.h'
--- tests/common/telepathytest.h	2015-04-07 14:40:58 +0000
+++ tests/common/telepathytest.h	2016-04-25 17:57:17 +0000
@@ -30,7 +30,7 @@
     Q_OBJECT
 
 protected:
-    void initialize();
+    void initialize(int waitTime = 1000);
     void doCleanup();
 
     // helper slots