Adds an action to signal the UI to sync the current volume when we are waiting for the user to confirm or reject the high volume notification. Fixes: #1512798, #1520548

Approved by: PS Jenkins bot, Charles Kerr, Nick Dedekind

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);
 }