aboutsummaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/indicator-sound-test-base.cpp66
-rw-r--r--tests/integration/indicator-sound-test-base.h6
-rw-r--r--tests/integration/test-indicator.cpp25
3 files changed, 88 insertions, 9 deletions
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index 5005e2c..3b9c58d 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -821,3 +821,69 @@ bool IndicatorSoundTestBase::setVolumeUntilAccountsIsConnected(double volume)
}
return (signal_spy_volume_changed_->count() != 0);
}
+
+QVariantList IndicatorSoundTestBase::getActionValue(QString const &action)
+{
+ if (!menu_interface_)
+ {
+ menu_interface_.reset(new MenusInterface("com.canonical.indicator.sound",
+ "/com/canonical/indicator/sound",
+ dbusTestRunner.sessionConnection(), 0));
+ }
+ if (menu_interface_)
+ {
+ QDBusReply<DBusActionResult> resp = menu_interface_->call(QLatin1String("Describe"),
+ action);
+ if (!resp.isValid())
+ {
+ qWarning() << "IndicatorSoundTestBase::getActionValue(): D-Bus error: " << resp.error().message();
+ return QVariantList();
+ }
+ else
+ {
+ return resp.value().getValue();
+ }
+ }
+
+ return QVariantList();
+}
+
+qlonglong IndicatorSoundTestBase::getVolumeSyncValue(bool *isValid)
+{
+ qlonglong result = 0;
+
+ QVariantList varList = getActionValue("volume-sync");
+ if (varList.size() == 1)
+ {
+ result = varList.at(0).toULongLong(isValid);
+ }
+ else
+ {
+ if (isValid)
+ {
+ *isValid = false;
+ }
+ }
+
+ return result;
+}
+
+float IndicatorSoundTestBase::getVolumeValue(bool *isValid)
+{
+ float result = 0.0;
+
+ QVariantList varList = getActionValue("volume");
+ if (varList.size() == 1)
+ {
+ result = varList.at(0).toFloat(isValid);
+ }
+ else
+ {
+ if (isValid)
+ {
+ *isValid = false;
+ }
+ }
+
+ return result;
+}
diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h
index 41dd1c7..67f347f 100644
--- a/tests/integration/indicator-sound-test-base.h
+++ b/tests/integration/indicator-sound-test-base.h
@@ -134,6 +134,12 @@ protected:
bool setVolumeUntilAccountsIsConnected(double volume);
+ QVariantList getActionValue(QString const &action);
+
+ qlonglong getVolumeSyncValue(bool *isValid = nullptr);
+
+ float getVolumeValue(bool *isValid = nullptr);
+
QtDBusTest::DBusTestRunner dbusTestRunner;
QtDBusMock::DBusMock dbusMock;
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index 33e62b5..1f357d7 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -643,7 +643,7 @@ TEST_F(TestIndicator, DesktopChangeRoleVolume)
).match());
}
-TEST_F(TestIndicator, PhoneNotificationVolume)
+TEST_F(TestIndicator, DISABLED_PhoneNotificationVolume)
{
double INITIAL_VOLUME = 0.0;
@@ -709,7 +709,7 @@ TEST_F(TestIndicator, PhoneNotificationVolume)
checkVolumeNotification(0.5, "Speakers", false, notificationsSpy.at(1));
}
-TEST_F(TestIndicator, PhoneNotificationWarningVolume)
+TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolume)
{
double INITIAL_VOLUME = 0.0;
@@ -783,7 +783,10 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
int idNotification = getNotificationID(notificationsSpy.at(5));
ASSERT_NE(-1, idNotification);
- qWarning() << "XGM: id Notification: " << idNotification;
+ // check the sync value before cancelling the dialog
+ bool isValid;
+ qlonglong syncValueBeforeCancel = getVolumeSyncValue(&isValid);
+ EXPECT_TRUE(isValid);
// cancel the dialog
pressNotificationButton(idNotification, "cancel");
@@ -805,6 +808,11 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
)
).match());
+ // verify that the sync value is increased
+ qlonglong syncValueAfterCancel = getVolumeSyncValue(&isValid);
+ EXPECT_TRUE(isValid);
+ EXPECT_NE(syncValueBeforeCancel, syncValueAfterCancel);
+
// try again...
notificationsSpy.clear();
@@ -900,8 +908,7 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(3));
}
-
-TEST_F(TestIndicator, PhoneNotificationWarningVolumeAlertMode)
+TEST_F(TestIndicator, DISABLED_PhoneNotificationWarningVolumeAlertMode)
{
double INITIAL_VOLUME = 0.0;
@@ -958,22 +965,22 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolumeAlertMode)
notificationsSpy.clear();
}
-TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerWiredLabels)
+TEST_F(TestIndicator, DISABLED_PhoneNotificationHeadphoneSpeakerWiredLabels)
{
checkPortDevicesLabels(WIRED, WIRED);
}
-TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerBluetoothLabels)
+TEST_F(TestIndicator, DISABLED_PhoneNotificationHeadphoneSpeakerBluetoothLabels)
{
checkPortDevicesLabels(BLUETOOTH, BLUETOOTH);
}
-TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerUSBLabels)
+TEST_F(TestIndicator, DISABLED_PhoneNotificationHeadphoneSpeakerUSBLabels)
{
checkPortDevicesLabels(USB, USB);
}
-TEST_F(TestIndicator, PhoneNotificationHeadphoneSpeakerHDMILabels)
+TEST_F(TestIndicator, DISABLED_PhoneNotificationHeadphoneSpeakerHDMILabels)
{
checkPortDevicesLabels(HDMI, HDMI);
}