diff options
author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
---|---|---|
committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
commit | 4dbdcf30a0ed10019d3350293c4ac52040393640 (patch) | |
tree | fa01e697dee299506a91d1d9f41c2a61f429fcc9 /tests/notifications-test.cc | |
parent | 6ee23e401d3847e609f1ef50e1736f69e6253608 (diff) | |
parent | 86c449a7125f3ff90dcac353c8a4ad5a8c2cc46e (diff) | |
download | ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.gz ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.bz2 ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.zip |
Fixed conflict. Updated changelog to be in sync with trunk
Diffstat (limited to 'tests/notifications-test.cc')
-rw-r--r-- | tests/notifications-test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc index 8d5617d..a096bb8 100644 --- a/tests/notifications-test.cc +++ b/tests/notifications-test.cc @@ -345,7 +345,7 @@ TEST_F(NotificationsTest, HighVolume) { auto notev = notifications->getNotifications(); ASSERT_EQ(1, notev.size()); EXPECT_EQ("Volume", notev[0].summary); - EXPECT_EQ("", notev[0].body); + EXPECT_EQ("Speakers", notev[0].body); EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-canonical-value-bar-tint"]); /* Set high volume with volume change */ |