← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/test/dbus_test.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/test/dbus_test.cpp
1
1
/******************************************************************************
2
 
 *   Copyright (C) 2012-2013 by Savoir-Faire Linux                            *
 
2
 *   Copyright (C) 2012-2014 by Savoir-Faire Linux                            *
3
3
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>   *
4
4
 *                                                                            *
5
5
 *   This library is free software; you can redistribute it and/or            *
18
18
#include <QtCore/QString>
19
19
#include <QtTest/QtTest>
20
20
 
21
 
#include "../src/lib/configurationmanager_interface_singleton.h"
22
 
#include "../src/lib/callmanager_interface_singleton.h"
23
 
#include "../src/lib/instance_interface_singleton.h"
 
21
#include "../src/lib/dbus/configurationmanager.h"
 
22
#include "../src/lib/dbus/callmanager.h"
 
23
#include "../src/lib/dbus/instancemanager.h"
24
24
 
25
25
class DBusTests: public QObject
26
26
{
33
33
 
34
34
void DBusTests::testConfigurationManagerConnection()
35
35
{
36
 
   ConfigurationManagerInterface& configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 
36
   ConfigurationManagerInterface& configurationManager = DBus::ConfigurationManager::instance();
37
37
   QDBusReply<QStringList> audioPlugins = configurationManager.getAudioPluginList();
38
38
   QCOMPARE( audioPlugins.isValid(), true );
39
39
}
40
40
 
41
41
void DBusTests::testCallManagerConnection()
42
42
{
43
 
   CallManagerInterface& callManager = CallManagerInterfaceSingleton::getInstance();
 
43
   CallManagerInterface& callManager = DBus::CallManager::instance();
44
44
   QDBusReply<QStringList> callList = callManager.getCallList();
45
45
   QCOMPARE( callList.isValid(), true );
46
46
}
47
47
 
48
48
void DBusTests::testInstanceManagerConnection()
49
49
{
50
 
   InstanceInterface& instance = InstanceInterfaceSingleton::getInstance();
 
50
   InstanceInterface& instance = DBus::InstanceManager::instance();
51
51
   QDBusReply<void> ret = instance.Register(getpid(), "unitTest");
52
52
   instance.Unregister(getpid());
53
53
   QCOMPARE( ret.isValid(), true );