diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 9 | ||||
| -rw-r--r-- | tests/notifications-test.cc | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index f1bc33a..b92cc9f 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2015 Canonical, Ltd. + * Copyright (C) 2021 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -13,7 +14,9 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see <http://www.gnu.org/licenses/>. * - * Author: Xavi Garcia <xavi.garcia.mena@canonical.com> + * Authors: + * Xavi Garcia <xavi.garcia.mena@canonical.com> + * Robert Tari <robert@tari.in> */ #include "indicator-sound-test-base.h" @@ -642,12 +645,12 @@ void IndicatorSoundTestBase::checkVolumeNotification(double volume, QString cons ASSERT_TRUE(qDBusArgumentToMap(args.at(6), hints)); ASSERT_TRUE(hints.contains("value")); ASSERT_TRUE(hints.contains("x-ayatana-non-shaped-icon")); - ASSERT_TRUE(hints.contains("x-canonical-value-bar-tint")); + ASSERT_TRUE(hints.contains("x-ayatana-value-bar-tint")); ASSERT_TRUE(hints.contains("x-canonical-private-synchronous")); EXPECT_EQ(volume*100, hints["value"]); EXPECT_EQ(true, hints["x-ayatana-non-shaped-icon"]); - EXPECT_EQ(isLoud, hints["x-canonical-value-bar-tint"]); + EXPECT_EQ(isLoud, hints["x-ayatana-value-bar-tint"]); EXPECT_EQ(true, hints["x-canonical-private-synchronous"]); } diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc index 1e48f52..47f4c47 100644 --- a/tests/notifications-test.cc +++ b/tests/notifications-test.cc @@ -1,5 +1,6 @@ /* * Copyright © 2015-2016 Canonical Ltd. + * Copyright © 2021 Robert Tari * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +17,7 @@ * Authors: * Ted Gould <ted@canonical.com> * Charles Kerr <charles.kerr@canonical.com> + * Robert Tari <robert@tari.in> */ #include <algorithm> @@ -425,7 +427,7 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) { ASSERT_EQ(1, notev.size()); EXPECT_EQ("Volume", notev[0].summary); EXPECT_EQ("Speakers", notev[0].body); - EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-canonical-value-bar-tint"]); + EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-ayatana-value-bar-tint"]); /* Set high volume with volume change */ notifications->clearNotifications(); @@ -436,7 +438,7 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) { ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */ EXPECT_EQ("Volume", notev[0].summary); EXPECT_EQ("Speakers", notev[0].body); - EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]); + EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-ayatana-value-bar-tint"]); /* Move it back */ volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), false); @@ -452,7 +454,7 @@ TEST_F(NotificationsTest, DISABLED_HighVolume) { ASSERT_EQ(1, notev.size()); EXPECT_EQ("Volume", notev[0].summary); EXPECT_EQ("Speakers", notev[0].body); - EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]); + EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-ayatana-value-bar-tint"]); } TEST_F(NotificationsTest, DISABLED_MenuHide) { |