← Back to branch summary

~ubuntu-branches/ubuntu/trusty/sflphone/trusty

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (4.3.4 sid)
  • Revision ID: package-import@ubuntu.com-20140128182336-jrsv0k9u6cawc068
Tags: 1.3.0-1
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/call_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"
24
 
#include "../src/lib/accountlist.h"
 
21
#include "../src/lib/dbus/configurationmanager.h"
 
22
#include "../src/lib/dbus/callmanager.h"
 
23
#include "../src/lib/dbus/instancemanager.h"
 
24
#include "../src/lib/accountlistmodel.h"
25
25
#include "../src/lib/callmodel.h"
26
26
 
27
27
callModel<>* m_pModel = new CallModel<>();
40
40
{
41
41
   QMap<Account*,bool> saveState;
42
42
   //Disable all accounts
43
 
   for (int i=0;i<AccountList::getInstance()->size();i++) {
44
 
      saveState[(*AccountList::getInstance())[i]] = (*AccountList::getInstance())[i]->isAccountEnabled();
45
 
      qDebug() << "Disabling" << (*AccountList::getInstance())[i]->getAccountId();
46
 
      (*AccountList::getInstance())[i]->setAccountEnabled(false);
47
 
      (*AccountList::getInstance())[i]->save();
 
43
   for (int i=0;i<AccountListModel::instance()->size();i++) {
 
44
      saveState[(*AccountListModel::instance())[i]] = (*AccountListModel::instance())[i]->isAccountEnabled();
 
45
      qDebug() << "Disabling" << (*AccountListModel::instance())[i]->accountId();
 
46
      (*AccountListModel::instance())[i]->setAccountEnabled(false);
 
47
      (*AccountListModel::instance())[i]->save();
48
48
   }
49
49
 
50
 
    Call* call = m_pModel->addDialingCall("test call", AccountList::getCurrentAccount());
 
50
    Call* call = m_pModel->addDialingCall("test call", AccountListModel::currentAccount());
51
51
    QCOMPARE( call, (Call*)nullptr );
52
52
 
53
53
   //Restore state
54
 
   for (int i=0;i<AccountList::getInstance()->size();i++) {
55
 
      (*AccountList::getInstance())[i]->setAccountEnabled(saveState[(*AccountList::getInstance())[i]]);
56
 
      (*AccountList::getInstance())[i]->save();
 
54
   for (int i=0;i<AccountListModel::instance()->size();i++) {
 
55
      (*AccountListModel::instance())[i]->setAccountEnabled(saveState[(*AccountListModel::instance())[i]]);
 
56
      (*AccountListModel::instance())[i]->save();
57
57
   }
58
58
}
59
59