aboutsummaryrefslogtreecommitdiff
path: root/tests/notifications-test.cc
diff options
context:
space:
mode:
authorcharles kerr <charlesk@canonical.com>2015-12-20 15:42:57 -0600
committercharles kerr <charlesk@canonical.com>2015-12-20 15:42:57 -0600
commit60cd7ac64849bfc21be1a85063f5730ad22f9d72 (patch)
tree33adcf048e6be17c500c2fef2ca8ac4aa37245e8 /tests/notifications-test.cc
parent2fedb182f5321d381821178ce10dd395113ab11b (diff)
downloadayatana-indicator-sound-60cd7ac64849bfc21be1a85063f5730ad22f9d72.tar.gz
ayatana-indicator-sound-60cd7ac64849bfc21be1a85063f5730ad22f9d72.tar.bz2
ayatana-indicator-sound-60cd7ac64849bfc21be1a85063f5730ad22f9d72.zip
always keep volume-control's 'stream' property updated
Diffstat (limited to 'tests/notifications-test.cc')
-rw-r--r--tests/notifications-test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc
index 19aeac1..855b2c1 100644
--- a/tests/notifications-test.cc
+++ b/tests/notifications-test.cc
@@ -257,7 +257,7 @@ TEST_F(NotificationsTest, StreamChanges) {
/* Change Streams, no volume change */
notifications->clearNotifications();
- volume_control_mock_set_mock_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), "alarm");
+ volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALARM);
setMockVolume(volumeControl, 0.5, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
loop(50);
notev = notifications->getNotifications();
@@ -265,7 +265,7 @@ TEST_F(NotificationsTest, StreamChanges) {
/* Change Streams, volume change */
notifications->clearNotifications();
- volume_control_mock_set_mock_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), "alert");
+ volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALERT);
setMockVolume(volumeControl, 0.6, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
loop(50);
notev = notifications->getNotifications();
@@ -273,7 +273,7 @@ TEST_F(NotificationsTest, StreamChanges) {
/* Change Streams, no volume change, volume up */
notifications->clearNotifications();
- volume_control_mock_set_mock_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), "multimedia");
+ volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_MULTIMEDIA);
setMockVolume(volumeControl, 0.6, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
loop(50);
setMockVolume(volumeControl, 0.65);