Merge lp:~boiko/telephony-service/clear_call_notifications into lp:telephony-service

[Gustavo Pichorim Boiko]

Make it possible to remove call notifications from the messaging menu

Make it possible to remove call notifications from the messaging menu

== Checklist ==

Are there any related MPs required for this MP to build/function as expected? Please list.
No

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://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
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

[lp:~boiko/telephony-service/clear_call_notifications]

1078. By Gustavo Pichorim Boiko on 2015-05-21

Merge latest changes from trunk.

1079. By Gustavo Pichorim Boiko on 2015-05-21

Fix build when srcdir != builddir

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1079
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/446/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/118/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/114/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/114/console

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

review: Needs Fixing (continuous-integration)

[lp:~boiko/telephony-service/clear_call_notifications]

1080. By Gustavo Pichorim Boiko on 2015-05-21

Fix the property installing on the messaging menu mock.

[Tiago Salem Herrmann (tiagosh)]

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1080
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/447/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/119/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/115/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/115/console

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

review: Needs Fixing (continuous-integration)

[lp:~boiko/telephony-service/clear_call_notifications]

1081. By Gustavo Pichorim Boiko on 2015-05-22

Add missing copyright headers and remove some commented out include files.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1081
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/448/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/120/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/116/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/116/console

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

review: Needs Fixing (continuous-integration)

[lp:~boiko/telephony-service/clear_call_notifications]

1082. By Gustavo Pichorim Boiko on 2015-05-22

Use the memory contacts backend in the messaging menu test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1082
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/449/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/121/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/117
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/117/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/117

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

review: Needs Fixing (continuous-integration)

[lp:~boiko/telephony-service/clear_call_notifications]

1083. By Gustavo Pichorim Boiko on 2015-05-22

Workaround a test failure that happens only on arm64.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1083
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/450/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/118
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/118/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/118

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good.

--Checklist--

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

review: Approve

[lp:~boiko/telephony-service/clear_call_notifications]

1084. By Gustavo Pichorim Boiko on 2015-06-08

Merge latest changes from trunk.

1085. By Gustavo Pichorim Boiko on 2015-06-08

Revert the TelepathyHelperTest fix, it is being fixed in a separate MP.

1086. By Gustavo Pichorim Boiko on 2015-06-08

Merge test fixing branch.

1087. By Gustavo Pichorim Boiko on 2015-06-08

Merge latest changes from parent branch.

1088. By Gustavo Pichorim Boiko on 2015-06-08

Fix building.

Unmerged revisions

=== modified file '.bzrignore'
--- .bzrignore	2015-05-07 16:44:43 +0000
+++ .bzrignore	2015-06-08 18:29:15 +0000
@@ -55,4 +55,4 @@
 tests/Ubuntu.Telephony/ContactWatcherTest
 tests/libtelephonyservice/GreeterContactsTestExe
 tests/libtelephonyservice/GreeterContactsTestServerExe
-tests/libtelephonyservice/ToneGeneratorMock
+tests/libtelephonyservice/*Mock
 
=== modified file 'Ubuntu/Telephony/components.cpp'
--- Ubuntu/Telephony/components.cpp	2015-04-16 22:26:23 +0000
+++ Ubuntu/Telephony/components.cpp	2015-06-08 18:29:15 +0000
@@ -24,6 +24,7 @@
 #include "telepathyhelper.h"
 #include "callentry.h"
 #include "callmanager.h"
+#include "callnotification.h"
 #include "ussdmanager.h"
 #include "channelobserver.h"
 #include "chatmanager.h"
@@ -55,6 +56,7 @@
     mRootContext->setContextProperty("chatManager", ChatManager::instance());
     mRootContext->setContextProperty("callManager", CallManager::instance());
     mRootContext->setContextProperty("greeter", GreeterContacts::instance());
+    mRootContext->setContextProperty("callNotification", CallNotification::instance());
 
 }
 
 
=== modified file 'cmake/modules/GenerateTest.cmake'
--- cmake/modules/GenerateTest.cmake	2015-05-07 20:36:24 +0000
+++ cmake/modules/GenerateTest.cmake	2015-06-08 18:29:15 +0000
@@ -76,7 +76,8 @@
                 set(ARG_ENVIRONMENT HOME=${TMPDIR}
                                     HISTORY_SQLITE_DBPATH=:memory:
                                     MC_ACCOUNT_DIR=${TMPDIR}
-                                    MC_MANAGER_DIR=${TMPDIR})
+                                    MC_MANAGER_DIR=${TMPDIR}
+                                    MC_CLIENTS_DIR=${TMPDIR})
             endif ()
 
             set(TEST_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} ${PLATFORM} -p -o -p -,txt -p -o -p ${CMAKE_BINARY_DIR}/test_${TESTNAME}.xml,xunitxml)
 
=== modified file 'indicator/Indicator.xml'
--- indicator/Indicator.xml	2015-04-28 19:18:55 +0000
+++ indicator/Indicator.xml	2015-06-08 18:29:15 +0000
@@ -14,5 +14,11 @@
                 Remove any notification currently being displayed.
             ]]></dox:d>
         </method>
+        <method name="ClearCallNotification">
+            <dox:d><![CDATA[
+                Remove notifications for the given call
+            ]]></dox:d>
+             <arg name="targetId" type="s" direction="in"/>
+             <arg name="accountId" type="s" direction="in"/>
     </interface>
 </node>
 
=== modified file 'indicator/indicatordbus.cpp'
--- indicator/indicatordbus.cpp	2015-04-29 14:56:59 +0000
+++ indicator/indicatordbus.cpp	2015-06-08 18:29:15 +0000
@@ -23,6 +23,7 @@
 
 #include "indicatordbus.h"
 #include "indicatoradaptor.h"
+#include "messagingmenu.h"
 
 // Qt
 #include <QtDBus/QDBusConnection>
@@ -57,3 +58,8 @@
     Q_EMIT clearNotificationsRequested();
 }
 
+void IndicatorDBus::ClearCallNotification(const QString &targetId, const QString &accountId)
+{
+    MessagingMenu::instance()->removeCall(targetId, accountId);
+}
+
 
=== modified file 'indicator/indicatordbus.h'
--- indicator/indicatordbus.h	2015-04-29 14:56:59 +0000
+++ indicator/indicatordbus.h	2015-06-08 18:29:15 +0000
@@ -43,6 +43,7 @@
 
 public Q_SLOTS:
     Q_NOREPLY void ClearNotifications();
+    Q_NOREPLY void ClearCallNotification(const QString &targetId, const QString &accountId);
 
 Q_SIGNALS:
     void clearNotificationsRequested();
 
=== modified file 'indicator/messagingmenu.cpp'
--- indicator/messagingmenu.cpp	2015-03-04 18:02:13 +0000
+++ indicator/messagingmenu.cpp	2015-06-08 18:29:15 +0000
@@ -310,13 +310,17 @@
     QContactFetchRequest *request = new QContactFetchRequest(this);
     request->setFilter(QContactPhoneNumber::match(targetId));
 
+    //FIXME: on arm64 the connect() statement below fails at runtime with the following output:
+    //QObject::connect: signal not found in QtContacts::QContactFetchRequest
+    // so we just disable it
+#ifndef __aarch64__
     // place the messaging-menu item only after the contact fetch request is finished, as we can´t simply update
     QObject::connect(request, &QContactAbstractRequest::stateChanged, [request, call, text, this]() {
         // only process the results after the finished state is reached
         if (request->state() != QContactAbstractRequest::FinishedState) {
             return;
         }
-
+#endif
         Call newCall = call;
         if (request->contacts().size() > 0) {
             QContact contact = request->contacts().at(0);
@@ -332,8 +336,10 @@
             }
         }
         addCallToMessagingMenu(newCall, text);
+#ifndef __aarch64__
     });
 
+
     // FIXME: For accounts not based on phone numbers, don't try to match contacts for now
     if (account->type() == AccountEntry::PhoneAccount) {
         request->setManager(ContactUtils::sharedManager());
@@ -342,6 +348,31 @@
         // just emit the signal to pretend we did a contact search
         Q_EMIT request->stateChanged(QContactAbstractRequest::FinishedState);
     }
+#endif
+}
+
+void MessagingMenu::removeCall(const QString &targetId, const QString &accountId)
+{
+    Call call;
+    bool found = false;
+    AccountEntry *account = TelepathyHelper::instance()->accountForId(accountId);
+    if (!account) {
+        qWarning() << "Account not found for id" << accountId;
+        return;
+    }
+
+    Q_FOREACH(Call callMessage, mCalls) {
+        // FIXME: we need a better strategy to group calls from different accounts
+        if (account->compareIds(callMessage.targetId, targetId)) {
+            call = callMessage;
+            found = true;
+            mCalls.removeOne(callMessage);
+
+            // remove the previous entry and add a new one increasing the missed call count
+            messaging_menu_app_remove_message_by_id(mCallsApp, callMessage.messageId.toUtf8().data());
+            break;
+        }
+    }
 }
 
 void MessagingMenu::showVoicemailEntry(AccountEntry *account)
 
=== modified file 'indicator/messagingmenu.h'
--- indicator/messagingmenu.h	2015-03-04 18:02:13 +0000
+++ indicator/messagingmenu.h	2015-06-08 18:29:15 +0000
@@ -57,6 +57,7 @@
     void removeMessage(const QString &messageId);
 
     void addCall(const QString &targetId, const QString &accountId, const QDateTime &timestamp);
+    void removeCall(const QString &targetId, const QString &accountId);
     void addCallToMessagingMenu(Call call, const QString &text);
 
     static void flashMessageActivateCallback(MessagingMenuMessage *message, const char *actionId, GVariant *param, MessagingMenu *instance);
 
=== modified file 'libtelephonyservice/applicationutils.cpp'
--- libtelephonyservice/applicationutils.cpp	2013-10-07 19:20:02 +0000
+++ libtelephonyservice/applicationutils.cpp	2015-06-08 18:29:15 +0000
@@ -25,6 +25,7 @@
 #include <QDBusConnectionInterface>
 #include <QDBusInterface>
 #include <QDBusReply>
+#include <QDBusServiceWatcher>
 #include <QDebug>
 #include <QProcess>
 #include <TelepathyQt/Constants>
 
=== modified file 'libtelephonyservice/applicationutils.h'
--- libtelephonyservice/applicationutils.h	2013-10-07 19:20:02 +0000
+++ libtelephonyservice/applicationutils.h	2015-06-08 18:29:15 +0000
@@ -23,7 +23,6 @@
 #define APPLICATIONUTILS_H
 
 #include <QObject>
-#include <QDBusServiceWatcher>
 #include <QUrl>
 
 class ApplicationUtils : public QObject
 
=== modified file 'libtelephonyservice/callnotification.cpp'
--- libtelephonyservice/callnotification.cpp	2014-02-10 18:55:35 +0000
+++ libtelephonyservice/callnotification.cpp	2015-06-08 18:29:15 +0000
@@ -20,18 +20,16 @@
  */
 
 #include "callnotification.h"
-#include "contactutils.h"
 #include "config.h"
-#include <QContactAvatar>
-#include <QContactFetchRequest>
-#include <QContactPhoneNumber>
-#include <libnotify/notify.h>
+
 namespace C {
 #include <libintl.h>
 }
 
 CallNotification::CallNotification(QObject *parent) :
-    QObject(parent)
+    QObject(parent), mIndicatorIface("com.canonical.TelephonyServiceIndicator",
+                                     "/com/canonical/TelephonyServiceIndicator",
+                                     "com.canonical.TelephonyServiceIndicator")
 {
 }
 
@@ -107,3 +105,8 @@
     request->start();
 #endif
 }
+
+void CallNotification::clearCallNotification(const QString &participantId, const QString &accountId)
+{
+    mIndicatorIface.asyncCall("ClearCallNotification", participantId, accountId);
+}
 
=== modified file 'libtelephonyservice/callnotification.h'
--- libtelephonyservice/callnotification.h	2014-01-20 12:57:43 +0000
+++ libtelephonyservice/callnotification.h	2015-06-08 18:29:15 +0000
@@ -23,6 +23,7 @@
 #define CALLNOTIFICATION_H
 
 #include <QObject>
+#include <QDBusInterface>
 
 class CallNotification : public QObject
 {
@@ -37,9 +38,11 @@
 public Q_SLOTS:
     static CallNotification *instance();
     void showNotificationForCall(const QStringList &participants, NotificationReason reason);
+    void clearCallNotification(const QString &participantId, const QString &accountId);
 
 private:
     explicit CallNotification(QObject *parent = 0);
+    QDBusInterface mIndicatorIface;
 };
 
 #endif // CALLNOTIFICATION_H
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-03-20 21:50:47 +0000
+++ tests/CMakeLists.txt	2015-06-08 18:29:15 +0000
@@ -2,5 +2,6 @@
 
 add_subdirectory(common)
 add_subdirectory(handler)
+add_subdirectory(indicator)
 add_subdirectory(libtelephonyservice)
 add_subdirectory(Ubuntu.Telephony)
 
=== modified file 'tests/common/CMakeLists.txt'
--- tests/common/CMakeLists.txt	2015-04-21 16:22:55 +0000
+++ tests/common/CMakeLists.txt	2015-06-08 18:29:15 +0000
@@ -1,6 +1,7 @@
 include_directories(${TP_QT5_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/libtelephonyservice
-                    ${CMAKE_CURRENT_BINARY_DIR})
+                    ${CMAKE_CURRENT_BINARY_DIR}
+                    ${GSETTINGS_QT_INCLUDE_DIRS})
 
 configure_file(dbus-session.conf.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-session.conf)
 
@@ -10,7 +11,7 @@
 
 add_library(telepathytest STATIC telepathytest.cpp telepathytest.h)
 qt5_use_modules(telepathytest Core DBus)
-target_link_libraries(telepathytest telephonyservice ${TP_QT5_LIBRARIES})
+target_link_libraries(telepathytest telephonyservice ${TP_QT5_LIBRARIES} ${GSETTINGS_QT_LDFLAGS})
 
 add_subdirectory(mock)
 add_subdirectory(dbus-services)
 
=== modified file 'tests/common/telepathytest.cpp'
--- tests/common/telepathytest.cpp	2015-04-29 20:11:14 +0000
+++ tests/common/telepathytest.cpp	2015-06-08 18:29:15 +0000
@@ -24,6 +24,11 @@
 #include "telepathyhelper.h"
 #include "accountentry.h"
 
+TelepathyTest::TelepathyTest() : mPhoneSettings("com.ubuntu.phone")
+{
+
+}
+
 void TelepathyTest::initialize()
 {
     Tp::registerTypes();
 
=== modified file 'tests/common/telepathytest.h'
--- tests/common/telepathytest.h	2015-05-08 13:28:09 +0000
+++ tests/common/telepathytest.h	2015-06-08 18:29:15 +0000
@@ -22,6 +22,7 @@
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
 #include <TelepathyQt/Account>
+#include "qgsettings.h"
 #include <TelepathyQt/AccountManager>
 
 #define DEFAULT_TIMEOUT 15000
@@ -34,6 +35,8 @@
 class TelepathyTest : public QObject
 {
     Q_OBJECT
+public:
+    TelepathyTest();
 
 protected:
     void initialize();
@@ -51,6 +54,8 @@
 private Q_SLOTS:
     void cleanup();
 
+protected:
+    QGSettings mPhoneSettings;
 private:
     Tp::AccountManagerPtr mAccountManager;
     bool mReady;
 
=== modified file 'tests/handler/CMakeLists.txt'
--- tests/handler/CMakeLists.txt	2015-04-21 16:29:11 +0000
+++ tests/handler/CMakeLists.txt	2015-06-08 18:29:15 +0000
@@ -5,6 +5,7 @@
     ${CMAKE_SOURCE_DIR}/libtelephonyservice
     ${CMAKE_BINARY_DIR}/tests/common
     ${TP_QT5_INCLUDE_DIRS}
+    ${GSETTINGS_QT_INCLUDE_DIRS}
     )
 
 generate_telepathy_test(HandlerTest SOURCES HandlerTest.cpp handlercontroller.cpp approver.cpp)
 
=== added directory 'tests/indicator'
=== added file 'tests/indicator/CMakeLists.txt'
--- tests/indicator/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/indicator/CMakeLists.txt	2015-06-08 18:29:15 +0000
@@ -0,0 +1,14 @@
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../common
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/libtelephonyservice
+    ${CMAKE_SOURCE_DIR}/indicator
+    ${MESSAGING_MENU_INCLUDE_DIRS}
+    ${TP_QT5_INCLUDE_DIRS}
+    ${HISTORY_INCLUDE_DIRS}
+    )
+
+generate_telepathy_test(MessagingMenuTest
+              SOURCES MessagingMenuTest.cpp messagingmenumock.cpp ${CMAKE_SOURCE_DIR}/indicator/messagingmenu.cpp
+              LIBRARIES  ${TP_QT5_LIBRARIES} telephonyservice mockcontroller telepathytest ${HISTORY_LIBRARIES})
 
=== added file 'tests/indicator/MessagingMenuTest.cpp'
--- tests/indicator/MessagingMenuTest.cpp	1970-01-01 00:00:00 +0000
+++ tests/indicator/MessagingMenuTest.cpp	2015-06-08 18:29:15 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This file is part of telephony-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 <QtCore/QObject>
+#include <QtTest/QtTest>
+#include "contactutils.h"
+#include "telepathytest.h"
+#include "messagingmenu.h"
+#include "messagingmenumock.h"
+#include "telepathyhelper.h"
+
+class MessagingMenuTest : public TelepathyTest
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+    void cleanup();
+    void testCallNotificationAdded();
+    void testCallNotificationRemoved();
+private:
+    Tp::AccountPtr mAccount;
+};
+
+void MessagingMenuTest::initTestCase()
+{
+    initialize();
+
+    // just trigger the creation of the mock singleton
+    MessagingMenuMock::instance();
+
+    // use the memory contact backend
+    ContactUtils::sharedManager("memory");
+
+    QSignalSpy accountAddedSpy(TelepathyHelper::instance(), SIGNAL(accountAdded(AccountEntry*)));
+    mAccount = addAccount("mock", "ofono", "theAccount");
+    QTRY_COMPARE(accountAddedSpy.count(), 1);
+}
+
+void MessagingMenuTest::cleanupTestCase()
+{
+    doCleanup();
+}
+
+void MessagingMenuTest::cleanup()
+{
+    // just to prevent the doCleanup() to run on every test
+}
+
+void MessagingMenuTest::testCallNotificationAdded()
+{
+    QString caller("12345");
+    QSignalSpy messageAddedSpy(MessagingMenuMock::instance(), SIGNAL(messageAdded(QString,QString,QString,bool)));
+    MessagingMenu::instance()->addCall(caller, mAccount->uniqueIdentifier(), QDateTime::currentDateTime());
+    QTRY_COMPARE(messageAddedSpy.count(), 1);
+    QCOMPARE(messageAddedSpy.first()[1].toString(), caller);
+}
+
+void MessagingMenuTest::testCallNotificationRemoved()
+{
+    QString caller("2345678");
+    QSignalSpy messageRemovedSpy(MessagingMenuMock::instance(), SIGNAL(messageRemoved(QString,QString)));
+    MessagingMenu::instance()->addCall(caller, mAccount->uniqueIdentifier(), QDateTime::currentDateTime());
+    MessagingMenu::instance()->removeCall(caller, mAccount->uniqueIdentifier());
+    QCOMPARE(messageRemovedSpy.count(), 1);
+    QCOMPARE(messageRemovedSpy.first()[1].toString(), caller);
+}
+
+QTEST_MAIN(MessagingMenuTest)
+#include "MessagingMenuTest.moc"
 
=== added file 'tests/indicator/messagingmenumock.cpp'
--- tests/indicator/messagingmenumock.cpp	1970-01-01 00:00:00 +0000
+++ tests/indicator/messagingmenumock.cpp	2015-06-08 18:29:15 +0000
@@ -0,0 +1,300 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This file is part of telephony-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 "messagingmenumock.h"
+#include "messaging-menu.h"
+#include <QDateTime>
+#include <QDebug>
+
+MessagingMenuMock *MessagingMenuMock::instance()
+{
+    static MessagingMenuMock *self = new MessagingMenuMock();
+    return self;
+}
+
+MessagingMenuMock::MessagingMenuMock(QObject *parent) :
+    QObject(parent)
+{
+}
+
+/*** Mock implementation of messaging messaging-menu functions ***/
+
+/*** MessagingMenuApp ***/
+struct _MessagingMenuApp {
+    GObject parent_instance;
+    gchar *desktopId;
+};
+
+G_DEFINE_TYPE(MessagingMenuApp, messaging_menu_app, G_TYPE_OBJECT)
+
+enum MessageProperties
+{
+    PROP_0,
+    PROP_ID,
+    PROP_ICON,
+    PROP_TITLE,
+    PROP_SUBTITLE,
+    PROP_BODY,
+    PROP_TIME,
+    PROP_DRAWS_ATTENTION,
+    NUM_PROPERTIES
+};
+
+#define PROP_DESKTOP_ID 1
+
+static void messaging_menu_app_set_property (GObject      *object,
+                                             guint         prop_id,
+                                             const GValue *value,
+                                             GParamSpec   *pspec)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    if (prop_id == PROP_DESKTOP_ID) {
+        MessagingMenuApp *app = MESSAGING_MENU_APP (object);
+        app->desktopId = g_value_dup_string (value);
+    }
+}
+
+static void messaging_menu_app_class_init (MessagingMenuAppClass *klass)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+    object_class->set_property = messaging_menu_app_set_property;
+
+    GParamSpec *prop = g_param_spec_string ("desktop-id",
+                                           "Desktop Id",
+                                           "The desktop id of the associated application",
+                                           NULL,
+                                           (GParamFlags)(G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
+
+    g_object_class_install_property (object_class, PROP_DESKTOP_ID, prop);
+}
+
+static void messaging_menu_app_init (MessagingMenuApp *app)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    Q_UNUSED(app)
+    // FIXME: check what needs implementing
+}
+
+MessagingMenuApp *messaging_menu_app_new(const gchar *desktop_id)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    MessagingMenuApp *app = (MessagingMenuApp*)g_object_new (MESSAGING_MENU_TYPE_APP,
+                                                             "desktop-id", desktop_id,
+                                                             NULL);
+    Q_EMIT MessagingMenuMock::instance()->appCreated(app->desktopId);
+    return app;
+}
+
+void messaging_menu_app_register(MessagingMenuApp *app)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    Q_EMIT MessagingMenuMock::instance()->appRegistered(app->desktopId);
+}
+
+void messaging_menu_app_append_source(MessagingMenuApp *app, const gchar *id, GIcon *icon, const gchar *label)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    Q_EMIT MessagingMenuMock::instance()->sourceAdded(app->desktopId, id, g_icon_to_string(icon), label);
+}
+
+/*** MessagingMenuMessage ***/
+
+struct _MessagingMenuMessage {
+    GObject parent;
+
+    gchar *id;
+    GIcon *icon;
+    gchar *title;
+    gchar *subtitle;
+    gchar *body;
+    gint64 time;
+    gboolean draws_attention;
+};
+
+typedef GObjectClass MessagingMenuMessageClass;
+G_DEFINE_TYPE (MessagingMenuMessage, messaging_menu_message, G_TYPE_OBJECT)
+
+// MessagingMenuMessage's properties
+static GParamSpec *properties[NUM_PROPERTIES];
+
+static void messaging_menu_message_get_property(GObject *object,
+                                                guint property_id,
+                                                GValue *value,
+                                                GParamSpec *pspec)
+{
+    MessagingMenuMessage *msg = MESSAGING_MENU_MESSAGE (object);
+
+    switch (property_id) {
+    case PROP_ID:
+        g_value_set_string (value, msg->id);
+        break;
+    case PROP_ICON:
+        g_value_set_object (value, msg->icon);
+        break;
+    case PROP_TITLE:
+        g_value_set_string (value, msg->title);
+        break;
+    case PROP_SUBTITLE:
+        g_value_set_string (value, msg->subtitle);
+        break;
+    case PROP_BODY:
+        g_value_set_string (value, msg->body);
+        break;
+    case PROP_TIME:
+        g_value_set_int64 (value, msg->time);
+        break;
+    case PROP_DRAWS_ATTENTION:
+        g_value_set_boolean (value, msg->draws_attention);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+
+static void messaging_menu_message_set_property(GObject *object,
+                                                guint property_id,
+                                                const GValue *value,
+                                                GParamSpec *pspec)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    MessagingMenuMessage *msg = MESSAGING_MENU_MESSAGE (object);
+
+    switch (property_id) {
+    case PROP_ID:
+        msg->id = g_value_dup_string (value);
+        break;
+    case PROP_ICON:
+        msg->icon = (GIcon*)g_value_dup_object (value);
+        break;
+    case PROP_TITLE:
+        msg->title = g_value_dup_string (value);
+        break;
+    case PROP_SUBTITLE:
+        msg->subtitle = g_value_dup_string (value);
+        break;
+    case PROP_BODY:
+        msg->body = g_value_dup_string (value);
+        break;
+    case PROP_TIME:
+        msg->time = g_value_get_int64 (value);
+        break;
+    case PROP_DRAWS_ATTENTION:
+       msg->draws_attention = g_value_get_boolean (value);
+        break;
+    default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    }
+}
+static void messaging_menu_message_class_init(MessagingMenuMessageClass *klass)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+    object_class->get_property = messaging_menu_message_get_property;
+    object_class->set_property = messaging_menu_message_set_property;
+
+    properties[PROP_ID] = g_param_spec_string ("id", "Id",
+                                               "Unique id of the message",
+                                               NULL,
+                                               (GParamFlags)(G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    properties[PROP_ICON] = g_param_spec_object ("icon", "Icon",
+                                                 "Icon of the message",
+                                                 G_TYPE_ICON,
+                                                 (GParamFlags)(G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    properties[PROP_TITLE] = g_param_spec_string ("title", "Title",
+                                                  "Title of the message",
+                                                  NULL,
+                                                  (GParamFlags)(G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    properties[PROP_SUBTITLE] = g_param_spec_string ("subtitle", "Subtitle",
+                                                     "Subtitle of the message",
+                                                     NULL,
+                                                     (GParamFlags)(G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    properties[PROP_BODY] = g_param_spec_string ("body", "Body",
+                                                 "First lines of the body of the message",
+                                                 NULL,
+                                                 (GParamFlags)(G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    properties[PROP_TIME] = g_param_spec_int64 ("time", "Time",
+                                                "Time the message was sent, in microseconds", 0, G_MAXINT64, 0,
+                                                (GParamFlags)(G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    properties[PROP_DRAWS_ATTENTION] = g_param_spec_boolean ("draws-attention", "Draws attention",
+                                                               "Whether the message should draw attention",
+                                                               TRUE,
+                                                               (GParamFlags)(G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+    g_object_class_install_properties (klass, NUM_PROPERTIES, properties);
+
+    g_signal_new ("activate",
+                  MESSAGING_MENU_TYPE_MESSAGE,
+                  (GSignalFlags)(G_SIGNAL_RUN_FIRST | G_SIGNAL_DETAILED),
+                  0,
+                  NULL, NULL,
+                  g_cclosure_marshal_generic,
+                  G_TYPE_NONE, 2,
+                  G_TYPE_STRING,
+                  G_TYPE_VARIANT);
+}
+
+static void messaging_menu_message_init(MessagingMenuMessage *self)
+{
+    self->draws_attention = TRUE;
+}
+
+MessagingMenuMessage *messaging_menu_message_new(const gchar *id, GIcon *icon, const gchar *title, const gchar *subtitle, const gchar *body, gint64 time)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    MessagingMenuMessage *message = (MessagingMenuMessage*) g_object_new(MESSAGING_MENU_TYPE_MESSAGE,
+                                                                         "id", id,
+                                                                         "icon", icon,
+                                                                         "title", title,
+                                                                         "subtitle", subtitle,
+                                                                         "body", body,
+                                                                         "time", time,
+                                                                         NULL);
+    Q_EMIT MessagingMenuMock::instance()->messageCreated(QString(message->id),
+                                                         QString(g_icon_to_string(message->icon)),
+                                                         QString(message->title),
+                                                         QString(message->subtitle),
+                                                         QString(message->body),
+                                                         QDateTime::fromMSecsSinceEpoch(time / 1000));
+
+    return message;
+}
+
+void messaging_menu_message_add_action(MessagingMenuMessage *msg, const gchar *id, const gchar *label, const GVariantType *parameter_type, GVariant *parameter_hint)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    Q_EMIT MessagingMenuMock::instance()->actionAdded(msg->id, id, label);
+}
+
+void messaging_menu_app_remove_message_by_id(MessagingMenuApp *app, const gchar *id)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    Q_EMIT MessagingMenuMock::instance()->messageRemoved(app->desktopId, id);
+}
+
+const gchar *messaging_menu_message_get_id(MessagingMenuMessage *msg)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    return msg->id;
+}
+
+void messaging_menu_app_append_message(MessagingMenuApp *app, MessagingMenuMessage *msg, const gchar *source_id, gboolean notify)
+{
+    qDebug() << __PRETTY_FUNCTION__;
+    Q_EMIT MessagingMenuMock::instance()->messageAdded(QString(app->desktopId), QString(msg->id), QString(source_id), (bool)notify);
+}
+
 
=== added file 'tests/indicator/messagingmenumock.h'
--- tests/indicator/messagingmenumock.h	1970-01-01 00:00:00 +0000
+++ tests/indicator/messagingmenumock.h	2015-06-08 18:29:15 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This file is part of telephony-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/>.
+ */
+
+#ifndef MESSAGINGMENUMOCK_H
+#define MESSAGINGMENUMOCK_H
+
+#include <QObject>
+
+class MessagingMenuMock : public QObject
+{
+    Q_OBJECT
+public:
+    static MessagingMenuMock *instance();
+
+
+Q_SIGNALS:
+    void appCreated(const QString &desktopId);
+    void appRegistered(const QString &desktopId);
+    void sourceAdded(const QString &app, const QString &id, const QString &icon, const QString &label);
+
+    void messageCreated(const QString &id,
+                        const QString &icon,
+                        const QString &title,
+                        const QString &subtitle,
+                        const QString &body,
+                        const QDateTime &time);
+    void messageAdded(const QString &app,
+                      const QString &messageId,
+                      const QString &sourceId,
+                      bool notify);
+    void messageRemoved(const QString &app,
+                        const QString &id);
+    void actionAdded(const QString &messageId,
+                     const QString &actionId,
+                     const QString &label);
+
+private:
+    explicit MessagingMenuMock(QObject *parent = 0);
+
+};
+
+#endif // MESSAGINGMENUMOCK_H
 
=== modified file 'tests/libtelephonyservice/CMakeLists.txt'
--- tests/libtelephonyservice/CMakeLists.txt	2015-05-07 16:44:43 +0000
+++ tests/libtelephonyservice/CMakeLists.txt	2015-06-08 18:29:15 +0000
@@ -5,6 +5,7 @@
     ${TP_QT5_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/tests/common
     ${CMAKE_BINARY_DIR}/tests/common
+    ${GSETTINGS_QT_INCLUDE_DIRS}
     )
 
 add_executable(GreeterContactsTestServerExe GreeterContactsTestServer.cpp)
@@ -13,6 +14,9 @@
 add_executable(ToneGeneratorMock ToneGeneratorMock.cpp)
 qt5_use_modules(ToneGeneratorMock Core DBus)
 
+add_executable(IndicatorMock IndicatorMock.cpp)
+qt5_use_modules(IndicatorMock Core DBus)
+
 generate_test(GreeterContactsTest USE_DBUS
               SOURCES GreeterContactsTest.cpp ${LIBTELEPHONYSERVICE_DIR}/greetercontacts.cpp
               QT5_MODULES Contacts Core DBus Test
@@ -29,6 +33,12 @@
               WAIT_FOR com.Nokia.Telephony.Tones)
 add_dependencies(ToneGeneratorTest ToneGeneratorMock)
 
+generate_test(CallNotificationTest USE_DBUS
+              SOURCES CallNotificationTest.cpp ${LIBTELEPHONYSERVICE_DIR}/callnotification.cpp
+              QT5_MODULES Core DBus Test
+              TASKS --task ${CMAKE_CURRENT_BINARY_DIR}/IndicatorMock --task-name indicator --ignore-return
+              WAIT_FOR com.canonical.TelephonyServiceIndicator)
+
 generate_test(ContactUtilsTest SOURCES ContactUtilsTest.cpp QT5_MODULES Contacts Core Test LIBRARIES telephonyservice USE_UI)
 generate_test(PhoneUtilsTest SOURCES PhoneUtilsTest.cpp LIBRARIES telephonyservice USE_UI)
 
 
=== added file 'tests/libtelephonyservice/CallNotificationTest.cpp'
--- tests/libtelephonyservice/CallNotificationTest.cpp	1970-01-01 00:00:00 +0000
+++ tests/libtelephonyservice/CallNotificationTest.cpp	2015-06-08 18:29:15 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This file is part of telephony-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 <QtCore/QObject>
+#include <QtTest/QtTest>
+#include <QDBusInterface>
+
+#include "callnotification.h"
+
+#define INDICATOR_DBUS_SERVICE_NAME "com.canonical.TelephonyServiceIndicator"
+#define INDICATOR_DBUS_OBJ_PATH "/com/canonical/TelephonyServiceIndicator"
+
+class CallNotificationTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void cleanupTestCase();
+    void testClearCallNotification();
+
+private:
+    QDBusInterface *mIndicatorInterface;
+};
+
+void CallNotificationTest::initTestCase()
+{
+    mIndicatorInterface = new QDBusInterface(INDICATOR_DBUS_SERVICE_NAME,
+                                             INDICATOR_DBUS_OBJ_PATH,
+                                             INDICATOR_DBUS_SERVICE_NAME,
+                                             QDBusConnection::sessionBus(),
+                                             this);
+}
+
+void CallNotificationTest::cleanupTestCase()
+{
+    mIndicatorInterface->deleteLater();
+}
+
+void CallNotificationTest::testClearCallNotification()
+{
+    QSignalSpy clearNotificationSpy(mIndicatorInterface, SIGNAL(ClearCallNotificationRequested(QString, QString)));
+    QString targetId("theTargetId");
+    QString accountId("theAccountId");
+    CallNotification::instance()->clearCallNotification(targetId, accountId);
+    QTRY_COMPARE(clearNotificationSpy.count(), 1);
+    QCOMPARE(clearNotificationSpy.first()[0].toString(), targetId);
+    QCOMPARE(clearNotificationSpy.first()[1].toString(), accountId);
+}
+
+QTEST_MAIN(CallNotificationTest)
+#include "CallNotificationTest.moc"
 
=== modified file 'tests/libtelephonyservice/ChatManagerTest.cpp'
--- tests/libtelephonyservice/ChatManagerTest.cpp	2015-05-07 16:44:43 +0000
+++ tests/libtelephonyservice/ChatManagerTest.cpp	2015-06-08 18:29:15 +0000
@@ -47,6 +47,8 @@
 void ChatManagerTest::initTestCase()
 {
     initialize();
+    // set to false so group chat messages are not sent as MMS
+    mPhoneSettings.set("mmsGroupChatEnabled", false);
     TelepathyHelper::instance()->registerChannelObserver();
 }
 
 
=== added file 'tests/libtelephonyservice/IndicatorMock.cpp'
--- tests/libtelephonyservice/IndicatorMock.cpp	1970-01-01 00:00:00 +0000
+++ tests/libtelephonyservice/IndicatorMock.cpp	2015-06-08 18:29:15 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This file is part of telephony-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 <QObject>
+#include <QCoreApplication>
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QDBusObjectPath>
+#include <QDebug>
+
+#define INDICATOR_DBUS_SERVICE_NAME "com.canonical.TelephonyServiceIndicator"
+#define INDICATOR_DBUS_OBJ_PATH "/com/canonical/TelephonyServiceIndicator"
+
+class IndicatorMock : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", INDICATOR_DBUS_SERVICE_NAME)
+
+public:
+    Q_SCRIPTABLE void ClearNotifications();
+    Q_SCRIPTABLE void ClearCallNotification(const QString &targetId, const QString &accountId);
+
+Q_SIGNALS:
+    Q_SCRIPTABLE void ClearNotificationsRequested();
+    Q_SCRIPTABLE void ClearCallNotificationRequested(const QString &targetId, const QString &accountId);
+};
+
+void IndicatorMock::ClearNotifications()
+{
+    Q_EMIT ClearNotificationsRequested();
+}
+
+void IndicatorMock::ClearCallNotification(const QString &targetId, const QString &accountId)
+{
+    Q_EMIT ClearCallNotificationRequested(targetId, accountId);
+}
+
+int main(int argc, char **argv)
+{
+    QCoreApplication a(argc, argv);
+
+    QDBusConnection connection = QDBusConnection::sessionBus();
+
+    IndicatorMock toneGen;
+    connection.registerObject(INDICATOR_DBUS_OBJ_PATH, &toneGen, QDBusConnection::ExportScriptableContents);
+    connection.registerService(INDICATOR_DBUS_SERVICE_NAME);
+
+    return a.exec();
+}
+
+#include "IndicatorMock.moc"
 
=== modified file 'tests/libtelephonyservice/TelepathyHelperTest.cpp'
--- tests/libtelephonyservice/TelepathyHelperTest.cpp	2015-05-08 21:57:06 +0000
+++ tests/libtelephonyservice/TelepathyHelperTest.cpp	2015-06-08 18:29:15 +0000
@@ -255,21 +255,21 @@
 
     // now set one of the accounts as offline and make sure it is captured
     mGenericController->SetOnline(false);
-    TRY_COMPARE(activeAccountsSpy.count(), 1);
+    TRY_VERIFY(activeAccountsSpy.count() >= 1);
     QTRY_COMPARE(TelepathyHelper::instance()->activeAccounts().count(), 1);
     QCOMPARE(TelepathyHelper::instance()->activeAccounts()[0]->accountId(), mPhoneTpAccount->uniqueIdentifier());
 
     // set the other account offline to make sure
     activeAccountsSpy.clear();
     mPhoneController->SetOnline(false);
-    TRY_COMPARE(activeAccountsSpy.count(), 1);
+    TRY_VERIFY(activeAccountsSpy.count() >= 1);
     QVERIFY(TelepathyHelper::instance()->activeAccounts().isEmpty());
 
     // and set both accounts online again
     activeAccountsSpy.clear();
     mGenericController->SetOnline(true);
     mPhoneController->SetOnline(true);
-    TRY_COMPARE(activeAccountsSpy.count(), 2);
+    TRY_VERIFY(activeAccountsSpy.count() >= 2);
     QCOMPARE(TelepathyHelper::instance()->activeAccounts().count(), 2);
 }