aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorcharles kerr <charlesk@canonical.com>2015-12-31 11:11:46 -0600
committercharles kerr <charlesk@canonical.com>2015-12-31 11:11:46 -0600
commitd122698e9d07abdb18564852171a8488511f43a0 (patch)
tree30589b0c1b1fff4fcf24ea4ebf458c3df4ab920f /tests
parent3216d99edcec8a8cfe4533983af4a26f2bb9fa36 (diff)
downloadayatana-indicator-sound-d122698e9d07abdb18564852171a8488511f43a0.tar.gz
ayatana-indicator-sound-d122698e9d07abdb18564852171a8488511f43a0.tar.bz2
ayatana-indicator-sound-d122698e9d07abdb18564852171a8488511f43a0.zip
rename VolumeWarning.high_volume_approved as VolumeWarning.approved
After being moved into a class named "VolumeWarning", the high_volume_ prefix was redunant.
Diffstat (limited to 'tests')
-rw-r--r--tests/notifications-test.cc2
-rw-r--r--tests/volume-warning-mock.vala4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc
index 7f8d49a..0206e2b 100644
--- a/tests/notifications-test.cc
+++ b/tests/notifications-test.cc
@@ -520,7 +520,7 @@ TEST_F(NotificationsTest, WarningRequiresHeadphones) {
const pa_volume_t volume = 100;
options_mock_mock_set_loud_volume(OPTIONS_MOCK(options.get()), volume);
options_mock_mock_set_loud_warning_enabled(OPTIONS_MOCK(options.get()), true);
- volume_warning_mock_set_high_volume_approved(VOLUME_WARNING_MOCK(volumeWarning.get()), false);
+ volume_warning_mock_set_approved(VOLUME_WARNING_MOCK(volumeWarning.get()), false);
volume_warning_mock_set_multimedia_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), volume);
volume_warning_mock_set_multimedia_active(VOLUME_WARNING_MOCK(volumeWarning.get()), true);
diff --git a/tests/volume-warning-mock.vala b/tests/volume-warning-mock.vala
index 0dcae50..f69688f 100644
--- a/tests/volume-warning-mock.vala
+++ b/tests/volume-warning-mock.vala
@@ -34,7 +34,7 @@ public class VolumeWarningMock : VolumeWarning
public void set_multimedia_volume(PulseAudio.Volume val) { multimedia_volume = val; }
- public void set_high_volume_approved(bool val) { high_volume_approved = val; }
+ public void set_approved(bool val) { approved = val; }
- public bool is_high_volume_approved() { return high_volume_approved; }
+ public bool is_approved() { return approved; }
}