From 2203d0b2031b7dc99fe7381a9efac431bc3ad410 Mon Sep 17 00:00:00 2001
From: Arthur Mello <arthur.mello@canonical.com>
Date: Fri, 24 Jun 2016 11:45:30 -0300
Subject: Do not fail tests if schema is not installed

---
 src/settings-live.cpp   | 12 +++++++++---
 tests/test-settings.cpp | 10 +++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/settings-live.cpp b/src/settings-live.cpp
index 39d8e18..17c0ef7 100644
--- a/src/settings-live.cpp
+++ b/src/settings-live.cpp
@@ -38,14 +38,20 @@ LiveSettings::~LiveSettings()
     g_clear_object(&m_settings);
 }
 
-LiveSettings::LiveSettings(): m_settings(g_settings_new(SETTINGS_INTERFACE))
+LiveSettings::LiveSettings(): m_settings(g_settings_new(SETTINGS_INTERFACE)), m_gsettings_cal_notification(NULL)
 {
     g_signal_connect (m_settings,      "changed", G_CALLBACK(on_changed_ccid), this);
 
     if (ayatana_common_utils_is_lomiri())
     {
-        m_settings_cal_notification = g_settings_new_with_path(SETTINGS_NOTIFY_SCHEMA_ID, SETTINGS_NOTIFY_CALENDAR_PATH);
-        g_signal_connect (m_settings_cal_notification, "changed", G_CALLBACK(on_changed_cal_notification), this);
+        GSettingsSchemaSource *source = g_settings_schema_source_get_default();
+        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 (m_gsettings_cal_notification) {
+            g_signal_connect (m_settings_cal_notification, "changed", G_CALLBACK(on_changed_cal_notification), this);
+        }
     }
 
     // init the Properties from the GSettings backend
diff --git a/tests/test-settings.cpp b/tests/test-settings.cpp
index d0ee369..104750a 100644
--- a/tests/test-settings.cpp
+++ b/tests/test-settings.cpp
@@ -44,6 +44,7 @@ protected:
     std::shared_ptr<Settings> m_settings;
     GSettings * m_gsettings;
     GSettings * m_gsettings_cal_notification;
+    GSettingsSchemaSource *source = g_settings_schema_source_get_default();
 
     void SetUp() override
     {
@@ -53,7 +54,10 @@ protected:
 
         if (ayatana_common_utils_is_lomiri())
         {
-            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);
+            }
         }
 
         m_live.reset(new LiveSettings);
@@ -237,6 +241,10 @@ 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);
-- 
cgit v1.2.3