Fix settings test check so we do not fail if GSettings schema is missing

2 files changed, 30 insertions, 38 deletions

diff --git a/src/settings-live.cpp b/src/settings-live.cpp
index d1ea91b..8060a08 100644
--- a/src/settings-live.cpp
+++ b/src/settings-live.cpp
@@ -305,7 +305,7 @@ void LiveSettings::update_snooze_duration()
 
 void LiveSettings::update_cal_notification_enabled()
 {
-    if (m_settings_cal_notification) {
+    if (m_settings_cal_notification != NULL) {
         cal_notification_enabled.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_ENABLED_KEY));
     } else {
         cal_notification_enabled.set(true);
@@ -314,7 +314,7 @@ void LiveSettings::update_cal_notification_enabled()
 
 void LiveSettings::update_cal_notification_sounds()
 {
-    if (m_settings_cal_notification) {
+    if (m_settings_cal_notification != NULL) {
         cal_notification_sounds.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_SOUNDS_KEY));
     } else {
         cal_notification_sounds.set(true);
@@ -323,7 +323,7 @@ void LiveSettings::update_cal_notification_sounds()
 
 void LiveSettings::update_cal_notification_vibrations()
 {
-    if (m_settings_cal_notification) {
+    if (m_settings_cal_notification != NULL) {
         cal_notification_vibrations.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_VIBRATIONS_KEY));
     } else {
         cal_notification_vibrations.set(true);
@@ -332,7 +332,7 @@ void LiveSettings::update_cal_notification_vibrations()
 
 void LiveSettings::update_cal_notification_bubbles()
 {
-    if (m_settings_cal_notification) {
+    if (m_settings_cal_notification != NULL) {
         cal_notification_bubbles.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_BUBBLES_KEY));
     } else {
         cal_notification_bubbles.set(true);
@@ -341,7 +341,7 @@ void LiveSettings::update_cal_notification_bubbles()
 
 void LiveSettings::update_cal_notification_list()
 {
-    if (m_settings_cal_notification) {
+    if (m_settings_cal_notification != NULL) {
         cal_notification_list.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_LIST_KEY));
     } else {
         cal_notification_list.set(true);
diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp
index e8af7a0..f81a929 100644
--- a/tests/test-settings.cpp
+++ b/tests/test-settings.cpp
@@ -44,26 +44,30 @@ protected:
     std::shared_ptr<Settings> m_settings;
     GSettings * m_gsettings;
     GSettings * m_gsettings_cal_notification;
-    GSettingsSchemaSource *source = g_settings_schema_source_get_default();
+    GSettingsSchemaSource * source;
 
     void SetUp() override
     {
         super::SetUp();
 
+        source = g_settings_schema_source_get_default();
+
         if (g_settings_schema_source_lookup(source, SETTINGS_INTERFACE, true)) {
             m_gsettings = g_settings_new(SETTINGS_INTERFACE);
+        } else {
+            m_gsettings = NULL;
         }
 
-        if (ayatana_common_utils_is_lomiri())
-        {
-
-            if (g_settings_schema_source_lookup(source, SETTINGS_NOTIFY_SCHEMA_ID, true)) {
-                 m_gsettings_cal_notification = g_settings_new_with_path(SETTINGS_NOTIFY_SCHEMA_ID, SETTINGS_NOTIFY_CALENDAR_PATH);
-            }
+        if (g_settings_schema_source_lookup(source, SETTINGS_NOTIFY_SCHEMA_ID, true)) {
+            m_gsettings_cal_notification = g_settings_new_with_path(SETTINGS_NOTIFY_SCHEMA_ID, SETTINGS_NOTIFY_CALENDAR_PATH);
+        } else {
+            m_gsettings_cal_notification = NULL;
         }
 
-        m_live.reset(new LiveSettings);
-        m_settings = std::dynamic_pointer_cast<Settings>(m_live);
+        if (m_gsettings != NULL) { 
+            m_live.reset(new LiveSettings);
+            m_settings = std::dynamic_pointer_cast<Settings>(m_live);
+        } 
     }
 
     void TearDown() override
@@ -78,6 +82,10 @@ protected:
 
     void TestBoolProperty(GSettings* gsettings, core::Property<bool>& property, const gchar* key)
     {
+        if (gsettings == NULL) {
+            return;
+        }
+
         EXPECT_EQ(g_settings_get_boolean(gsettings, key), property.get());
         g_settings_set_boolean(gsettings, key, false);
         EXPECT_FALSE(property.get());
@@ -92,6 +100,10 @@ protected:
 
     void TestStringProperty(GSettings* gsettings, core::Property<std::string>& property, const gchar* key)
     {
+        if (gsettings == NULL) {
+            return;
+        }
+
         gchar* tmp;
         std::string str;
 
@@ -122,6 +134,10 @@ protected:
 
     void TestUIntProperty(GSettings* gsettings, core::Property<unsigned int>& property, const gchar* key)
     {
+        if (gsettings == NULL) {
+            return;
+        }
+
         EXPECT_EQ(g_settings_get_uint(gsettings, key), property.get());
 
         unsigned int expected_values[] = { 1, 2, 3 };
@@ -155,10 +171,6 @@ TEST_F(SettingsFixture, HelloWorld)
 
 TEST_F(SettingsFixture, BoolProperties)
 {
-    if (!m_gsettings) {
-        return;
-    }
-
     TestBoolProperty(m_gsettings, m_settings->show_seconds, SETTINGS_SHOW_SECONDS_S);
     TestBoolProperty(m_gsettings, m_settings->show_calendar, SETTINGS_SHOW_CALENDAR_S);
     TestBoolProperty(m_gsettings, m_settings->show_date, SETTINGS_SHOW_DATE_S);
@@ -172,10 +184,6 @@ TEST_F(SettingsFixture, BoolProperties)
 
 TEST_F(SettingsFixture, UIntProperties)
 {
-    if (!m_gsettings) {
-        return;
-    }
-
     TestUIntProperty(m_gsettings, m_settings->alarm_duration, SETTINGS_ALARM_DURATION_S);
     TestUIntProperty(m_gsettings, m_settings->alarm_volume, SETTINGS_ALARM_VOLUME_S);
     TestUIntProperty(m_gsettings, m_settings->snooze_duration, SETTINGS_SNOOZE_DURATION_S);
@@ -183,10 +191,6 @@ TEST_F(SettingsFixture, UIntProperties)
 
 TEST_F(SettingsFixture, StringProperties)
 {
-    if (!m_gsettings) {
-        return;
-    }
-
     TestStringProperty(m_gsettings, m_settings->custom_time_format, SETTINGS_CUSTOM_TIME_FORMAT_S);
     TestStringProperty(m_gsettings, m_settings->timezone_name, SETTINGS_TIMEZONE_NAME_S);
     TestStringProperty(m_gsettings, m_settings->alarm_sound, SETTINGS_ALARM_SOUND_S);
@@ -196,10 +200,6 @@ TEST_F(SettingsFixture, StringProperties)
 
 TEST_F(SettingsFixture, TimeFormatMode)
 {
-    if (!m_gsettings) {
-        return;
-    }
-
     const auto key = SETTINGS_TIME_FORMAT_S;
     const TimeFormatMode modes[] = { TIME_FORMAT_MODE_LOCALE_DEFAULT,
                                      TIME_FORMAT_MODE_12_HOUR,
@@ -232,10 +232,6 @@ namespace
 
 TEST_F(SettingsFixture, Locations)
 {
-    if (!m_gsettings) {
-        return;
-    }
-
     const auto key = SETTINGS_LOCATIONS_S;
 
     const gchar* astrv[] = {"America/Los_Angeles Oakland", "America/Chicago Oklahoma City", "Europe/London London", nullptr};
@@ -263,10 +259,6 @@ TEST_F(SettingsFixture, Locations)
 
 TEST_F(SettingsFixture, MutedApps)
 {
-    if (!m_gsettings_cal_notification) {
-        return;
-    }
-
     TestBoolProperty(m_gsettings_cal_notification, m_settings->cal_notification_enabled, SETTINGS_NOTIFY_ENABLED_KEY);
     TestBoolProperty(m_gsettings_cal_notification, m_settings->cal_notification_sounds, SETTINGS_NOTIFY_SOUNDS_KEY);
     TestBoolProperty(m_gsettings_cal_notification, m_settings->cal_notification_vibrations, SETTINGS_NOTIFY_VIBRATIONS_KEY);