aboutsummaryrefslogtreecommitdiff
path: root/tests/integration/test-indicator.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2016-01-05 13:13:41 -0600
committerCharles Kerr <charles.kerr@canonical.com>2016-01-05 13:13:41 -0600
commit7dcc73303a60aba6c636408fa22ccaed07baf64c (patch)
treeb0b4a1fa061be766576e663ac67c63fd2b445563 /tests/integration/test-indicator.cpp
parent3c528a11f39af91d2856aeac606fdaf8a6c6b673 (diff)
parent6f4f8c2b9caee08499a3a9ee3fd434c2b6a0f3ca (diff)
downloadayatana-indicator-sound-7dcc73303a60aba6c636408fa22ccaed07baf64c.tar.gz
ayatana-indicator-sound-7dcc73303a60aba6c636408fa22ccaed07baf64c.tar.bz2
ayatana-indicator-sound-7dcc73303a60aba6c636408fa22ccaed07baf64c.zip
adding lp:~xavi-garcia-mena/indicator-sound/action-sync-volume
Diffstat (limited to 'tests/integration/test-indicator.cpp')
-rw-r--r--tests/integration/test-indicator.cpp25
1 files changed, 16 insertions, 9 deletions
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);
}