aboutsummaryrefslogtreecommitdiff
path: root/tests/test-settings.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-06-27 09:46:21 -0500
committerCharles Kerr <charles.kerr@canonical.com>2014-06-27 09:46:21 -0500
commiteebf8f911cedf5124ada2f91576f821da6f421b0 (patch)
tree446610632a4c784cc5f8cae8d588818c8da84f55 /tests/test-settings.cpp
parenta872431f78e5518419c6af5e365db972f362ba9a (diff)
downloadayatana-indicator-datetime-eebf8f911cedf5124ada2f91576f821da6f421b0.tar.gz
ayatana-indicator-datetime-eebf8f911cedf5124ada2f91576f821da6f421b0.tar.bz2
ayatana-indicator-datetime-eebf8f911cedf5124ada2f91576f821da6f421b0.zip
use unsigned ints for the alarm volume, duration properties
Diffstat (limited to 'tests/test-settings.cpp')
-rw-r--r--tests/test-settings.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp
index e4aeef7..44a0252 100644
--- a/tests/test-settings.cpp
+++ b/tests/test-settings.cpp
@@ -101,26 +101,26 @@ protected:
g_clear_pointer(&tmp, g_free);
}
- void TestIntProperty(core::Property<int>& property, const gchar* key)
+ void TestUIntProperty(core::Property<unsigned int>& property, const gchar* key)
{
- EXPECT_EQ(g_settings_get_int(m_gsettings, key), property.get());
+ EXPECT_EQ(g_settings_get_uint(m_gsettings, key), property.get());
- int expected_values[] = { 1, 2, 3 };
+ unsigned int expected_values[] = { 1, 2, 3 };
// modify GSettings and confirm that the new value is propagated
- for(const int& expected_value : expected_values)
+ for(const auto& expected_value : expected_values)
{
- g_settings_set_int(m_gsettings, key, expected_value);
+ g_settings_set_uint(m_gsettings, key, expected_value);
EXPECT_EQ(expected_value, property.get());
- EXPECT_EQ(expected_value, g_settings_get_int(m_gsettings, key));
+ EXPECT_EQ(expected_value, g_settings_get_uint(m_gsettings, key));
}
// modify the property and confirm that the new value is propagated
- for(const int& expected_value : expected_values)
+ for(const auto& expected_value : expected_values)
{
property.set(expected_value);
EXPECT_EQ(expected_value, property.get());
- EXPECT_EQ(expected_value, g_settings_get_int(m_gsettings, key));
+ EXPECT_EQ(expected_value, g_settings_get_uint(m_gsettings, key));
}
}
};
@@ -148,10 +148,10 @@ TEST_F(SettingsFixture, BoolProperties)
TestBoolProperty(m_settings->show_year, SETTINGS_SHOW_YEAR_S);
}
-TEST_F(SettingsFixture, IntProperties)
+TEST_F(SettingsFixture, UIntProperties)
{
- TestIntProperty(m_settings->alarm_duration, SETTINGS_ALARM_DURATION_S);
- TestIntProperty(m_settings->alarm_volume, SETTINGS_ALARM_VOLUME_S);
+ TestUIntProperty(m_settings->alarm_duration, SETTINGS_ALARM_DURATION_S);
+ TestUIntProperty(m_settings->alarm_volume, SETTINGS_ALARM_VOLUME_S);
}
TEST_F(SettingsFixture, StringProperties)