aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharles kerr <charlesk@canonical.com>2015-12-30 16:25:20 -0600
committercharles kerr <charlesk@canonical.com>2015-12-30 16:25:20 -0600
commitbf558d1150e8ed346c659056ad4c18cbc26b8daa (patch)
tree421c9b01c90d0d592a2e7264ddc1859114cb202c
parent3336fad9c2162a415dfc5baf8becfe6c2de6bc60 (diff)
downloadayatana-indicator-sound-bf558d1150e8ed346c659056ad4c18cbc26b8daa.tar.gz
ayatana-indicator-sound-bf558d1150e8ed346c659056ad4c18cbc26b8daa.tar.bz2
ayatana-indicator-sound-bf558d1150e8ed346c659056ad4c18cbc26b8daa.zip
fix and re-enable NotificationsTest::ExtendendVolumeNotification
-rw-r--r--tests/notifications-test.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc
index 855b2c1..f7f4876 100644
--- a/tests/notifications-test.cc
+++ b/tests/notifications-test.cc
@@ -443,7 +443,7 @@ TEST_F(NotificationsTest, MenuHide) {
EXPECT_EQ(1, notev.size());
}
-TEST_F(NotificationsTest, DISABLED_ExtendendVolumeNotification) {
+TEST_F(NotificationsTest, ExtendendVolumeNotification) {
auto options = optionsMock();
auto volumeControl = volumeControlMock(options);
auto volumeWarning = volumeWarningMock(options);
@@ -463,7 +463,8 @@ TEST_F(NotificationsTest, DISABLED_ExtendendVolumeNotification) {
/* Allow an amplified volume */
notifications->clearNotifications();
- //indicator_sound_service_set_allow_amplified_volume(soundService.get(), TRUE);
+ volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALARM);
+ options_mock_mock_set_max_volume(OPTIONS_MOCK(options.get()), 1.5);
loop(50);
notev = notifications->getNotifications();
ASSERT_EQ(1, notev.size());
@@ -479,7 +480,7 @@ TEST_F(NotificationsTest, DISABLED_ExtendendVolumeNotification) {
/* Put back */
notifications->clearNotifications();
- //indicator_sound_service_set_allow_amplified_volume(soundService.get(), FALSE);
+ options_mock_mock_set_max_volume(OPTIONS_MOCK(options.get()), 1.0);
loop(50);
notev = notifications->getNotifications();
ASSERT_EQ(1, notev.size());