aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/integration/indicator-sound-test-base.cpp11
-rw-r--r--tests/integration/test-indicator.cpp73
2 files changed, 51 insertions, 33 deletions
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index dd5d4b5..5005e2c 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -743,6 +743,7 @@ void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort,
notificationsSpy.clear();
}
+ notificationsSpy.clear();
// activate the headphones
EXPECT_TRUE(activateHeadphones(true));
@@ -759,8 +760,9 @@ void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort,
}
else
{
- WAIT_FOR_SIGNALS(notificationsSpy, 1);
- checkVolumeNotification(INITIAL_VOLUME, headphonesString, false, notificationsSpy.at(0));
+ WAIT_FOR_SIGNALS(notificationsSpy, 2);
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(INITIAL_VOLUME, headphonesString, false, notificationsSpy.at(1));
notificationsSpy.clear();
}
@@ -784,8 +786,9 @@ void IndicatorSoundTestBase::checkPortDevicesLabels(DevicePortType speakerPort,
// deactivate the headphones
EXPECT_TRUE(activateHeadphones(false));
- WAIT_FOR_SIGNALS(notificationsSpy, 1);
- checkVolumeNotification(INITIAL_VOLUME, speakerString, false, notificationsSpy.at(0));
+ WAIT_FOR_SIGNALS(notificationsSpy, 2);
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(INITIAL_VOLUME, speakerString, false, notificationsSpy.at(1));
notificationsSpy.clear();
// check the label in the menu
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index d6f5c55..33e62b5 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -695,16 +695,18 @@ TEST_F(TestIndicator, PhoneNotificationVolume)
notificationsSpy.clear();
setActionValue("volume", QVariant::fromValue(0.0));
- WAIT_FOR_SIGNALS(notificationsSpy, 1)
+ WAIT_FOR_SIGNALS(notificationsSpy, 2)
- checkVolumeNotification(0.0, "Speakers", false, notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(0.0, "Speakers", false, notificationsSpy.at(1));
notificationsSpy.clear();
setActionValue("volume", QVariant::fromValue(0.5));
- WAIT_FOR_SIGNALS(notificationsSpy, 1)
+ WAIT_FOR_SIGNALS(notificationsSpy, 2)
- checkVolumeNotification(0.5, "Speakers", false, notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(0.5, "Speakers", false, notificationsSpy.at(1));
}
TEST_F(TestIndicator, PhoneNotificationWarningVolume)
@@ -747,34 +749,38 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
setActionValue("volume", QVariant::fromValue(0.3));
EXPECT_TRUE(waitVolumeChangedInIndicator());
- WAIT_FOR_SIGNALS(notificationsSpy, 1);
+ WAIT_FOR_SIGNALS(notificationsSpy, 2);
- checkVolumeNotification(0.3, "Headphones", false, notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(0.3, "Headphones", false, notificationsSpy.at(1));
notificationsSpy.clear();
// change volume to 0.5... no warning should be emitted
setActionValue("volume", QVariant::fromValue(0.5));
EXPECT_TRUE(waitVolumeChangedInIndicator());
- WAIT_FOR_SIGNALS(notificationsSpy, 1);
+ WAIT_FOR_SIGNALS(notificationsSpy, 2);
- checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(1));
notificationsSpy.clear();
// change volume to 1.0... warning should be emitted
setActionValue("volume", QVariant::fromValue(1.0));
EXPECT_TRUE(waitVolumeChangedInIndicator());
- WAIT_FOR_SIGNALS(notificationsSpy, 4);
+ WAIT_FOR_SIGNALS(notificationsSpy, 8);
// the notification is sent twice (TODO check why)
- checkCloseNotification(1, notificationsSpy.at(0));
- checkHighVolumeNotification(notificationsSpy.at(1));
- checkCloseNotification(1, notificationsSpy.at(2));
- checkHighVolumeNotification(notificationsSpy.at(3));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkCloseNotification(1, notificationsSpy.at(1));
+ checkHighVolumeNotification(notificationsSpy.at(2));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(3));
+ checkCloseNotification(1, notificationsSpy.at(4));
+ checkHighVolumeNotification(notificationsSpy.at(5));
// get the last notification ID
- int idNotification = getNotificationID(notificationsSpy.at(3));
+ int idNotification = getNotificationID(notificationsSpy.at(5));
ASSERT_NE(-1, idNotification);
qWarning() << "XGM: id Notification: " << idNotification;
@@ -807,10 +813,12 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
setActionValue("volume", QVariant::fromValue(1.0));
EXPECT_TRUE(waitVolumeChangedInIndicator());
- WAIT_FOR_SIGNALS(notificationsSpy, 2);
+ WAIT_FOR_SIGNALS(notificationsSpy, 6);
- checkHighVolumeNotification(notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
checkHighVolumeNotification(notificationsSpy.at(1));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(2));
+ checkHighVolumeNotification(notificationsSpy.at(3));
// get the last notification ID
idNotification = getNotificationID(notificationsSpy.at(1));
@@ -848,13 +856,15 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
setActionValue("volume", QVariant::fromValue(0.5));
EXPECT_TRUE(waitVolumeChangedInIndicator());
- WAIT_FOR_SIGNALS(notificationsSpy, 4);
+ WAIT_FOR_SIGNALS(notificationsSpy, 6);
// check the notification TODO check why the sound indicator sends it twice
- checkCloseNotification(idNotification, notificationsSpy.at(0));
- checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(1));
- checkCloseNotification(idNotification, notificationsSpy.at(2));
- checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(3));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkCloseNotification(idNotification, notificationsSpy.at(1));
+ checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(2));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(3));
+ checkCloseNotification(idNotification, notificationsSpy.at(4));
+ checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(5));
// check that the volume was applied
// and that we don't have the warning item
@@ -881,11 +891,13 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolume)
setActionValue("volume", QVariant::fromValue(1.0));
EXPECT_TRUE(waitVolumeChangedInIndicator());
- WAIT_FOR_SIGNALS(notificationsSpy, 2);
+ WAIT_FOR_SIGNALS(notificationsSpy, 4);
// check the notification TODO check why the sound indicator sends it twice
- checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(1));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(2));
+ checkVolumeNotification(1.0, "Headphones", true, notificationsSpy.at(3));
}
@@ -916,30 +928,33 @@ TEST_F(TestIndicator, PhoneNotificationWarningVolumeAlertMode)
// change volume to 0.0... no warning should be emitted
setActionValue("volume", QVariant::fromValue(0.0));
- WAIT_FOR_SIGNALS(notificationsSpy, 4);
+ WAIT_FOR_SIGNALS(notificationsSpy, 5);
// the first time we also have the calls to
// GetServerInformation and GetCapabilities
checkNotificationWithNoArgs("GetServerInformation", notificationsSpy.at(0));
checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(1));
checkVolumeNotification(0.0, "Headphones", false, notificationsSpy.at(2));
- checkVolumeNotification(0.0, "Headphones", false, notificationsSpy.at(3));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(3));
+ checkVolumeNotification(0.0, "Headphones", false, notificationsSpy.at(4));
notificationsSpy.clear();
// change volume to 0.5... no warning should be emitted
setActionValue("volume", QVariant::fromValue(0.5));
- WAIT_FOR_SIGNALS(notificationsSpy, 1);
+ WAIT_FOR_SIGNALS(notificationsSpy, 2);
- checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(0.5, "Headphones", false, notificationsSpy.at(1));
notificationsSpy.clear();
// change volume to 1.0... no warning should be emitted, we are in alert mode
setActionValue("volume", QVariant::fromValue(1.0));
- WAIT_FOR_SIGNALS(notificationsSpy, 1);
+ WAIT_FOR_SIGNALS(notificationsSpy, 2);
- checkVolumeNotification(1.0, "Headphones", false, notificationsSpy.at(0));
+ checkNotificationWithNoArgs("GetCapabilities", notificationsSpy.at(0));
+ checkVolumeNotification(1.0, "Headphones", false, notificationsSpy.at(1));
notificationsSpy.clear();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 06:34:29 +0000