From bf558d1150e8ed346c659056ad4c18cbc26b8daa Mon Sep 17 00:00:00 2001
From: charles kerr <charlesk@canonical.com>
Date: Wed, 30 Dec 2015 16:25:20 -0600
Subject: fix and re-enable NotificationsTest::ExtendendVolumeNotification

---
 tests/notifications-test.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'tests')

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());
-- 
cgit v1.2.3