← Back to branch summary

~mitya57/indicator-sound/lp1502480

« back to all changes in this revision

Viewing changes to tests/integration/indicator-sound-test-base.cpp

  • Committer: CI Train Bot
  • Author(s): Xavi Garcia Mena
  • Date: 2016-03-07 10:13:38 UTC
  • mfrom: (529.1.8 last-runnin-player-charles)
  • Revision ID: ci-train-bot@canonical.com-20160307101338-x2wynmsb4sch7jag
This branch sets the last running player using accounts service instead of gsettings.
It also includes a new class AccountsServiceAccess, to centralize all accesses to account service properties.
Approved by: PS Jenkins bot, Charles Kerr

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration/indicator-sound-test-base.cpp
448
448
    return true;
449
449
}
450
450
 
 
451
QVariant IndicatorSoundTestBase::waitPropertyChanged(QSignalSpy *signalSpy, QString property)
 
452
{
 
453
    QVariant ret_val;
 
454
    if (signalSpy)
 
455
    {
 
456
        signalSpy->wait();
 
457
        if (signalSpy->count())
 
458
        {
 
459
            QList<QVariant> arguments = signalSpy->takeLast();
 
460
            if (arguments.size() == 3 && static_cast<QMetaType::Type>(arguments.at(1).type()) == QMetaType::QVariantMap)
 
461
            {
 
462
                QMap<QString, QVariant> map = arguments.at(1).toMap();
 
463
                QMap<QString, QVariant>::iterator iter = map.find(property);
 
464
                if (iter != map.end())
 
465
                {
 
466
                    return iter.value();
 
467
                }
 
468
            }
 
469
        }
 
470
    }
 
471
    return ret_val;
 
472
}
451
473
bool IndicatorSoundTestBase::waitVolumeChangedInIndicator()
452
474
{
453
 
    if (signal_spy_volume_changed_)
454
 
    {
455
 
        return signal_spy_volume_changed_->wait();
456
 
    }
457
 
    return false;
 
475
    QVariant val = waitPropertyChanged(signal_spy_volume_changed_.get(), "Volume");
 
476
    return !val.isNull();
 
477
}
 
478
 
 
479
QVariant IndicatorSoundTestBase::waitLastRunningPlayerChanged()
 
480
{
 
481
    return waitPropertyChanged(signal_spy_volume_changed_.get(), "LastRunningPlayer");
458
482
}
459
483
 
460
484
void IndicatorSoundTestBase::initializeAccountsInterface()