Changed last running player to user Accounts service

2 files changed, 34 insertions, 3 deletions

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<QVariant> arguments = signal_spy_volume_changed_->takeFirst();
+            if (arguments.size() == 3 && static_cast<QMetaType::Type>(arguments.at(1).type()) == QMetaType::QVariantMap)
+            {
+                QVariantMap map = arguments.at(1).toMap();
+                QMapIterator<QString, QVariant> 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;