aboutsummaryrefslogtreecommitdiff
path: root/tests/integration/indicator-sound-test-base.cpp
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-30 15:57:46 +0100
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-10-30 15:57:46 +0100
commit8ecf050fcb5bb4247256c1f6705b759edf7e73cf (patch)
treefd9fc4c48ff1ba2d61c44d5b43ad5dade042d4d5 /tests/integration/indicator-sound-test-base.cpp
parent80dd6f2e9697d8b6b462157c548d986586310838 (diff)
downloadayatana-indicator-sound-8ecf050fcb5bb4247256c1f6705b759edf7e73cf.tar.gz
ayatana-indicator-sound-8ecf050fcb5bb4247256c1f6705b759edf7e73cf.tar.bz2
ayatana-indicator-sound-8ecf050fcb5bb4247256c1f6705b759edf7e73cf.zip
Integration tests updated
Diffstat (limited to 'tests/integration/indicator-sound-test-base.cpp')
-rw-r--r--tests/integration/indicator-sound-test-base.cpp11
1 files changed, 7 insertions, 4 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