From ba4e4b3973a00902ff0f3d9eb4650f5f61e76c78 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Mon, 22 Feb 2016 19:50:55 +0100 Subject: Changed last running player to user Accounts service --- tests/integration/indicator-sound-test-base.cpp | 33 ++++++++++++++++++++++--- tests/integration/indicator-sound-test-base.h | 4 +++ 2 files changed, 34 insertions(+), 3 deletions(-) (limited to 'tests/integration') diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index f61857e..8242fb6 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -448,13 +448,40 @@ bool IndicatorSoundTestBase::initializeMenuChangedSignal() return true; } -bool IndicatorSoundTestBase::waitVolumeChangedInIndicator() +QVariant IndicatorSoundTestBase::waitPropertyChanged(QString property) { + QVariant ret_val; if (signal_spy_volume_changed_) { - return signal_spy_volume_changed_->wait(); + signal_spy_volume_changed_->wait(); + if (signal_spy_volume_changed_->count()) + { + QList arguments = signal_spy_volume_changed_->takeFirst(); + if (arguments.size() == 3 && static_cast(arguments.at(1).type()) == QMetaType::QVariantMap) + { + QVariantMap map = arguments.at(1).toMap(); + QMapIterator iter(map); + while (iter.hasNext()) { + iter.next(); + if (iter.key() == property) + { + return iter.value(); + } + } + } + } } - return false; + return ret_val; +} +bool IndicatorSoundTestBase::waitVolumeChangedInIndicator() +{ + QVariant val = waitPropertyChanged("Volume"); + return !val.isNull(); +} + +QVariant IndicatorSoundTestBase::waitLastRunningPlayerChanged() +{ + return waitPropertyChanged("LastRunningPlayer"); } void IndicatorSoundTestBase::initializeAccountsInterface() diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h index 969fd69..ecdbd7d 100644 --- a/tests/integration/indicator-sound-test-base.h +++ b/tests/integration/indicator-sound-test-base.h @@ -144,6 +144,10 @@ protected: float getVolumeValue(bool *isValid = nullptr); + QVariant waitPropertyChanged(QString property); + + QVariant waitLastRunningPlayerChanged(); + QtDBusTest::DBusTestRunner dbusTestRunner; QtDBusMock::DBusMock dbusMock; -- cgit v1.2.3