diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2014-06-26 22:13:13 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2014-06-26 22:13:13 -0500 |
commit | 8bb09ca0225886c18e351d3c6156521ed479edd1 (patch) | |
tree | cd5e30c6fc5531f0ad1efb711957a3d951e4a66a /tests/test-settings.cpp | |
parent | c5081444f4f493dc386012bcb99d2430fe26dc5a (diff) | |
download | ayatana-indicator-datetime-8bb09ca0225886c18e351d3c6156521ed479edd1.tar.gz ayatana-indicator-datetime-8bb09ca0225886c18e351d3c6156521ed479edd1.tar.bz2 ayatana-indicator-datetime-8bb09ca0225886c18e351d3c6156521ed479edd1.zip |
Design prefers to have a volume slider instead of presets, so remove the AlarmVolume enum and replace it with an int range.
Diffstat (limited to 'tests/test-settings.cpp')
-rw-r--r-- | tests/test-settings.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp index 2b500b2..e4aeef7 100644 --- a/tests/test-settings.cpp +++ b/tests/test-settings.cpp @@ -151,6 +151,7 @@ TEST_F(SettingsFixture, BoolProperties) TEST_F(SettingsFixture, IntProperties) { TestIntProperty(m_settings->alarm_duration, SETTINGS_ALARM_DURATION_S); + TestIntProperty(m_settings->alarm_volume, SETTINGS_ALARM_VOLUME_S); } TEST_F(SettingsFixture, StringProperties) @@ -181,31 +182,6 @@ TEST_F(SettingsFixture, TimeFormatMode) } } -TEST_F(SettingsFixture, AlarmVolume) -{ - const auto key = SETTINGS_ALARM_VOLUME_S; - const AlarmVolume volumes[] = { ALARM_VOLUME_VERY_QUIET, - ALARM_VOLUME_QUIET, - ALARM_VOLUME_NORMAL, - ALARM_VOLUME_LOUD, - ALARM_VOLUME_VERY_LOUD }; - - for(const auto& val : volumes) - { - g_settings_set_enum(m_gsettings, key, val); - EXPECT_EQ(val, m_settings->alarm_volume.get()); - EXPECT_EQ(val, g_settings_get_enum(m_gsettings, key)); - } - - for(const auto& val : volumes) - { - m_settings->alarm_volume.set(val); - EXPECT_EQ(val, m_settings->alarm_volume.get()); - EXPECT_EQ(val, g_settings_get_enum(m_gsettings, key)); - } -} - - namespace { std::vector<std::string> strv_to_vector(const gchar** strv) |