Merge lp:~charlesk/indicator-datetime/lp-1474078-notification-blacklist-apps into lp:indicator-datetime/15.10

[Charles Kerr]

Don't show calendar notifications if the're blacklisted in system settings

Add support for system-settings' blacklist of apps whose notifications should not be shown.

Original branch by David Barth's branch at <https://code.launchpad.net/~dbarth/indicator-datetime/mute-notifications/+merge/280708>. This branch moves the GSchema code into Settings, adds more tests, and stacks on top of <https://code.launchpad.net/~charlesk/indicator-datetime/unified-eds-code> so it should be dual landable

Code changes:
* in Settings, a new core::Property "muted_apps" listing blacklisted apps
* in LiveSettings, code to bind the com.ubuntu.notification.hub GSchema and muted_apps property together
* in Snap, code to skip calendar notifications if the calendar app is blacklisted
* in tests, refactor the Notification gtest fixture into a reusable header so that multiple test files can use it
* add new notification tests to check out what happens under different combinations of system settings, indicator settings, and appointment types

[David Barth (dbarth)]

Switching silo 003 to using that new MP. Thanks Charles !

On Wed, Feb 3, 2016 at 5:44 PM, Charles Kerr <email address hidden>
wrote:

> The proposal to merge
> lp:~charlesk/indicator-datetime/lp-1474078-notification-blacklist-apps into
> lp:indicator-datetime has been updated.
>
> Description changed to:
>
> Add support for system-settings' blacklist of apps whose notifications
> should not be shown.
>
> Original branch by David Barth's branch at <
> https://code.launchpad.net/~dbarth/indicator-datetime/mute-notifications/+merge/280708>.
> This branch moves the GSchema code into Settings, adds more tests, and
> stacks on top of <
> https://code.launchpad.net/~charlesk/indicator-datetime/unified-eds-code>
> so it should be dual landable
>
> Code changes:
> * in Settings, a new core::Property "muted_apps" listing blacklisted apps
> * in LiveSettings, code to bind the com.ubuntu.notification.hub GSchema
> and muted_apps property together
> * in Snap, code to skip calendar notifications if the calendar app is
> blacklisted
> * in tests, refactor the Notification gtest fixture into a reusable header
> so that multiple test files can use it
> * add new notification tests to check out what happens under different
> combinations of system settings, indicator settings, and appointment types
>
> For more details, see:
>
> https://code.launchpad.net/~charlesk/indicator-datetime/lp-1474078-notification-blacklist-apps/+merge/284927
> --
> Your team Indicator Applet Developers is requested to review the proposed
> merge of
> lp:~charlesk/indicator-datetime/lp-1474078-notification-blacklist-apps into
> lp:indicator-datetime.
>

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/353/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/43/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/353/rebuild

review: Approve (continuous-integration)

[Xavi Garcia (xavi-garcia-mena)]

Looks good to me.
I'm just curious about some sleeps in the tests... Are they really needed? could we "wait" in a different way that does not use sleep?

review: Needs Information

[Charles Kerr (charlesk)]

In the cases where we're testing that something happens, yes and I'll work today on fixing that.

There are a few edge cases where we're testing that something /doesn't/ happen, e.g. a combination of settings that causes a notification to be suppressed, and in those cases I think we need to keep the "wait" calls because there's no trigger when testing a negative.

[David Barth (dbarth)]

Tested in silo 003, +1 for me

review: Approve

[Charles Kerr (charlesk)]

Xavi, since the tests change further in my branch for bug #1440111, I've applied your suggested timing fixes in that branch, which is MPed in <https://code.launchpad.net/~charlesk/indicator-datetime/lp-1440111-friendlier-calendar-items/+merge/284956> and stacked on top of this branch in silo 19

=== modified file 'debian/control'
--- debian/control	2016-02-03 16:38:36 +0000
+++ debian/control	2016-02-03 16:38:36 +0000
@@ -14,6 +14,8 @@
                libedataserver1.2-dev (>= 3.5),
                liburl-dispatcher1-dev,
                libproperties-cpp-dev,
+# for com.ubuntu.notifications.hub schema to pick up blacklist of apps that can't show notifications
+               gsettings-ubuntu-schemas,
 # for the test harness:
                libgtest-dev,
                libdbustest1-dev,
@@ -39,6 +41,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
+         gsettings-ubuntu-schemas,
          systemd-services,
          systemd-shim,
 Recommends: indicator-applet | indicator-renderer,

=== modified file 'include/datetime/settings-live.h'
--- include/datetime/settings-live.h	2015-10-13 23:28:20 +0000
+++ include/datetime/settings-live.h	2016-02-03 16:38:36 +0000
@@ -38,8 +38,10 @@
     virtual ~LiveSettings();
 
 private:
-    static void on_changed(GSettings*, gchar*, gpointer);
-    void update_key(const std::string& key);
+    static void on_changed_ccid(GSettings*, gchar*, gpointer);
+    static void on_changed_cunh(GSettings*, gchar*, gpointer);
+    void update_key_ccid(const std::string& key);
+    void update_key_cunh(const std::string& key);
 
     void update_custom_time_format();
     void update_locations();
@@ -61,8 +63,10 @@
     void update_alarm_duration();
     void update_alarm_haptic();
     void update_snooze_duration();
+    void update_muted_apps();
 
     GSettings* m_settings;
+    GSettings* m_settings_cunh;
 
     // we've got a raw pointer here, so disable copying
     LiveSettings(const LiveSettings&) =delete;

=== modified file 'include/datetime/settings-shared.h'
--- include/datetime/settings-shared.h	2015-10-13 23:28:20 +0000
+++ include/datetime/settings-shared.h	2016-02-03 16:38:36 +0000
@@ -52,4 +52,7 @@
 #define SETTINGS_ALARM_HAPTIC_S         "alarm-haptic-feedback"
 #define SETTINGS_SNOOZE_DURATION_S      "snooze-duration-minutes"
 
+#define SETTINGS_CUNH_SCHEMA_ID         "com.ubuntu.notifications.hub"
+#define SETTINGS_CUNH_BLACKLIST_S       "blacklist"
+
 #endif // INDICATOR_DATETIME_SETTINGS_SHARED

=== modified file 'include/datetime/settings.h'
--- include/datetime/settings.h	2015-10-13 23:28:20 +0000
+++ include/datetime/settings.h	2016-02-03 16:38:36 +0000
@@ -62,6 +62,7 @@
     core::Property<unsigned int> alarm_volume;
     core::Property<unsigned int> alarm_duration;
     core::Property<unsigned int> snooze_duration;
+    core::Property<std::set<std::pair<std::string,std::string>>> muted_apps;
 };
 
 } // namespace datetime

=== modified file 'src/settings-live.cpp'
--- src/settings-live.cpp	2015-10-13 23:28:20 +0000
+++ src/settings-live.cpp	2016-02-03 16:38:36 +0000
@@ -29,13 +29,16 @@
 
 LiveSettings::~LiveSettings()
 {
+    g_clear_object(&m_settings_cunh);
     g_clear_object(&m_settings);
 }
 
 LiveSettings::LiveSettings():
-    m_settings(g_settings_new(SETTINGS_INTERFACE))
+    m_settings(g_settings_new(SETTINGS_INTERFACE)),
+    m_settings_cunh(g_settings_new(SETTINGS_CUNH_SCHEMA_ID))
 {
-    g_signal_connect (m_settings, "changed", G_CALLBACK(on_changed), this);
+    g_signal_connect (m_settings,      "changed", G_CALLBACK(on_changed_ccid), this);
+    g_signal_connect (m_settings_cunh, "changed", G_CALLBACK(on_changed_cunh), this);
 
     // init the Properties from the GSettings backend
     update_custom_time_format();
@@ -58,6 +61,7 @@
     update_alarm_duration();
     update_alarm_haptic();
     update_snooze_duration();
+    update_muted_apps();
 
     // now listen for clients to change the properties s.t. we can sync update GSettings
 
@@ -65,6 +69,17 @@
         g_settings_set_string(m_settings, SETTINGS_CUSTOM_TIME_FORMAT_S, value.c_str());
     });
 
+    muted_apps.changed().connect([this](const std::set<std::pair<std::string,std::string>>& value){
+        GVariantBuilder builder;
+        g_variant_builder_init(&builder, G_VARIANT_TYPE("a(ss)"));
+        for(const auto& app : value){
+            const auto& pkgname {app.first};
+            const auto& appname {app.second};
+            g_variant_builder_add(&builder, "(ss)", pkgname.c_str(), appname.c_str());
+        }
+        g_settings_set_value(m_settings_cunh, SETTINGS_CUNH_BLACKLIST_S, g_variant_builder_end(&builder));
+    });
+
     locations.changed().connect([this](const std::vector<std::string>& value){
         const int n = value.size();
         gchar** strv = g_new0(gchar*, n+1);
@@ -168,6 +183,24 @@
     locations.set(l);
 }
 
+void LiveSettings::update_muted_apps()
+{
+    std::set<std::pair<std::string,std::string>> apps;
+
+    auto blacklist = g_settings_get_value(m_settings_cunh, SETTINGS_CUNH_BLACKLIST_S);
+    GVariantIter* iter {nullptr};
+    g_variant_get (blacklist, "a(ss)", &iter);
+    gchar* pkgname;
+    gchar* appname;
+    while (g_variant_iter_loop (iter, "(ss)", &pkgname, &appname)) {
+        apps.insert(std::make_pair(pkgname,appname));
+    }
+    g_variant_iter_free (iter);
+    g_clear_pointer(&blacklist, g_variant_unref);
+
+    muted_apps.set(apps);
+}
+
 void LiveSettings::update_show_calendar()
 {
     const auto val = g_settings_get_boolean(m_settings, SETTINGS_SHOW_CALENDAR_S);
@@ -275,14 +308,31 @@
 ****
 ***/
 
-void LiveSettings::on_changed(GSettings* /*settings*/,
-                              gchar*       key,
-                              gpointer     gself)
-{
-    static_cast<LiveSettings*>(gself)->update_key(key);
-}
-
-void LiveSettings::update_key(const std::string& key)
+void LiveSettings::on_changed_cunh(GSettings* /*settings*/,
+                                   gchar*       key,
+                                   gpointer     gself)
+{
+    static_cast<LiveSettings*>(gself)->update_key_cunh(key);
+}
+
+void LiveSettings::update_key_cunh(const std::string& key)
+{
+    if (key == SETTINGS_CUNH_BLACKLIST_S)
+        update_muted_apps();
+}
+
+/***
+****
+***/
+
+void LiveSettings::on_changed_ccid(GSettings* /*settings*/,
+                                   gchar*       key,
+                                   gpointer     gself)
+{
+    static_cast<LiveSettings*>(gself)->update_key_ccid(key);
+}
+
+void LiveSettings::update_key_ccid(const std::string& key)
 {
     if (key == SETTINGS_SHOW_CLOCK_S)
         update_show_clock();

=== modified file 'src/snap.cpp'
--- src/snap.cpp	2015-10-13 23:28:20 +0000
+++ src/snap.cpp	2016-02-03 16:38:36 +0000
@@ -85,6 +85,12 @@
                     appointment_func snooze,
                     appointment_func ok)
     {
+        // If calendar notifications are muted, don't show them
+        if (!appointment.is_ubuntu_alarm() && calendar_events_are_muted()) {
+            g_debug("Skipping muted calendar event '%s' notification", appointment.summary.c_str());
+            return;
+        }
+
         /* Alarms and calendar events are treated differently.
            Alarms should require manual intervention to dismiss.
            Calendar events are less urgent and shouldn't require manual
@@ -160,6 +166,17 @@
 
 private:
 
+    bool calendar_events_are_muted() const
+    {
+        for(const auto& app : m_settings->muted_apps.get()) {
+            if (app.first == "com.ubuntu.calendar") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     static void on_sound_proxy_ready(GObject* /*source_object*/, GAsyncResult* res, gpointer gself)
     {
         GError * error;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-10-13 14:56:26 +0000
+++ tests/CMakeLists.txt	2016-02-03 16:38:36 +0000
@@ -47,7 +47,8 @@
   target_link_libraries (${TEST_NAME} indicatordatetimeservice gtest ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
 endfunction()
 add_test_by_name(test-datetime)
-add_test_by_name(test-snap)
+add_test_by_name(test-sound)
+add_test_by_name(test-notification)
 add_test_by_name(test-actions)
 add_test_by_name(test-alarm-queue)
 add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true)

=== added file 'tests/notification-fixture.h'
--- tests/notification-fixture.h	1970-01-01 00:00:00 +0000
+++ tests/notification-fixture.h	2016-02-03 16:38:36 +0000
@@ -0,0 +1,382 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#pragma once
+
+#include "glib-fixture.h"
+
+#include <datetime/appointment.h>
+#include <datetime/dbus-shared.h>
+#include <datetime/settings.h>
+#include <datetime/snap.h>
+
+#include <notifications/dbus-shared.h>
+#include <notifications/notifications.h>
+
+#include <libdbustest/dbus-test.h>
+
+#include <unistd.h> // getuid()
+#include <sys/types.h> // getuid()
+
+/***
+****
+***/
+
+//using namespace unity::indicator::datetime;
+
+class NotificationFixture: public GlibFixture
+{
+private:
+
+  typedef GlibFixture super;
+
+  static constexpr char const * NOTIFY_BUSNAME   {"org.freedesktop.Notifications"};
+  static constexpr char const * NOTIFY_INTERFACE {"org.freedesktop.Notifications"};
+  static constexpr char const * NOTIFY_PATH      {"/org/freedesktop/Notifications"};
+
+  //namespace uin = unity::indicator::notifications;
+
+  //using namespace unity::indicator::datetime;
+
+protected:
+
+  static constexpr char const * HAPTIC_METHOD_VIBRATE_PATTERN {"VibratePattern"};
+
+  static constexpr int SCREEN_COOKIE {8675309};
+  static constexpr char const * SCREEN_METHOD_KEEP_DISPLAY_ON {"keepDisplayOn"}; 
+  static constexpr char const * SCREEN_METHOD_REMOVE_DISPLAY_ON_REQUEST {"removeDisplayOnRequest"};
+
+  static constexpr int POWERD_SYS_STATE_ACTIVE = 1;
+  static constexpr char const * POWERD_COOKIE {"567-48-8307"};
+  static constexpr char const * POWERD_METHOD_REQUEST_SYS_STATE {"requestSysState"};
+  static constexpr char const * POWERD_METHOD_CLEAR_SYS_STATE {"clearSysState"};
+
+  static constexpr int FIRST_NOTIFY_ID {1000};
+
+  static constexpr int NOTIFICATION_CLOSED_EXPIRED   {1};
+  static constexpr int NOTIFICATION_CLOSED_DISMISSED {2};
+  static constexpr int NOTIFICATION_CLOSED_API       {3};
+  static constexpr int NOTIFICATION_CLOSED_UNDEFINED {4};
+
+  static constexpr char const * METHOD_CLOSE {"CloseNotification"};
+  static constexpr char const * METHOD_GET_CAPS {"GetCapabilities"};
+  static constexpr char const * METHOD_GET_INFO {"GetServerInformation"};
+  static constexpr char const * METHOD_NOTIFY {"Notify"};
+
+  static constexpr char const * SIGNAL_CLOSED {"NotificationClosed"};
+
+  static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"};
+
+  static constexpr char const * AS_BUSNAME            {"org.freedesktop.Accounts"};
+  static constexpr char const * AS_INTERFACE          {"com.ubuntu.touch.AccountsService.Sound"};
+  static constexpr char const * PROP_OTHER_VIBRATIONS {"OtherVibrate"};
+  static constexpr char const * PROP_SILENT_MODE      {"SilentMode"};
+
+  unity::indicator::datetime::Appointment appt;
+  unity::indicator::datetime::Appointment ualarm;
+  GDBusConnection * system_bus = nullptr;
+  GDBusConnection * session_bus = nullptr;
+  DbusTestService * service = nullptr;
+  DbusTestDbusMock * as_mock = nullptr;
+  DbusTestDbusMock * notify_mock = nullptr;
+  DbusTestDbusMock * powerd_mock = nullptr;
+  DbusTestDbusMock * screen_mock = nullptr;
+  DbusTestDbusMock * haptic_mock = nullptr;
+  DbusTestDbusMockObject * as_obj = nullptr;
+  DbusTestDbusMockObject * notify_obj = nullptr;
+  DbusTestDbusMockObject * powerd_obj = nullptr;
+  DbusTestDbusMockObject * screen_obj = nullptr;
+  DbusTestDbusMockObject * haptic_obj = nullptr;
+
+  void SetUp() override
+  {
+    GError * error = nullptr;
+    char * str = nullptr;
+
+    super::SetUp();
+
+    // init an Appointment
+    appt.color = "green";
+    appt.summary = "Christmas";
+    appt.uid = "D4B57D50247291478ED31DED17FF0A9838DED402";
+    appt.type = unity::indicator::datetime::Appointment::EVENT;
+    const auto christmas = unity::indicator::datetime::DateTime::Local(2015,12,25,0,0,0);
+    appt.begin = christmas.start_of_day();
+    appt.end = christmas.end_of_day();
+    appt.alarms.push_back(unity::indicator::datetime::Alarm{"Ho Ho Ho!", "", appt.begin});
+
+    // init an Ubuntu Alarm
+    ualarm.color = "red";
+    ualarm.summary = "Wakeup";
+    ualarm.uid = "E4B57D50247291478ED31DED17FF0A9838DED403";
+    ualarm.type = unity::indicator::datetime::Appointment::UBUNTU_ALARM;
+    const auto tomorrow = unity::indicator::datetime::DateTime::NowLocal().add_days(1);
+    ualarm.begin = tomorrow;
+    ualarm.end = tomorrow;
+    ualarm.alarms.push_back(unity::indicator::datetime::Alarm{"It's Tomorrow!", "", appt.begin});
+
+    service = dbus_test_service_new(nullptr);
+
+    ///
+    ///  Add the AccountsService mock
+    ///
+
+    as_mock = dbus_test_dbus_mock_new(AS_BUSNAME);
+    auto as_path = g_strdup_printf("/org/freedesktop/Accounts/User%lu", (gulong)getuid());
+    as_obj = dbus_test_dbus_mock_get_object(as_mock,
+                                            as_path,
+                                            AS_INTERFACE,
+                                            &error);
+    g_free(as_path);
+    g_assert_no_error(error);
+
+    // PROP_SILENT_MODE
+    dbus_test_dbus_mock_object_add_property(as_mock,
+                                            as_obj,
+                                            PROP_SILENT_MODE,
+                                            G_VARIANT_TYPE_BOOLEAN,
+                                            g_variant_new_boolean(false),
+                                            &error);
+    g_assert_no_error(error);
+
+    // PROP_OTHER_VIBRATIONS
+    dbus_test_dbus_mock_object_add_property(as_mock,
+                                            as_obj,
+                                            PROP_OTHER_VIBRATIONS,
+                                            G_VARIANT_TYPE_BOOLEAN,
+                                            g_variant_new_boolean(true),
+                                            &error);
+    g_assert_no_error(error);
+    dbus_test_service_add_task(service, DBUS_TEST_TASK(as_mock));
+
+    ///
+    ///  Add the Notifications mock
+    ///
+
+    notify_mock = dbus_test_dbus_mock_new(NOTIFY_BUSNAME);
+    notify_obj = dbus_test_dbus_mock_get_object(notify_mock,
+                                                NOTIFY_PATH,
+                                                NOTIFY_INTERFACE,
+                                                &error);
+    g_assert_no_error(error);
+   
+    // METHOD_GET_INFO 
+    str = g_strdup("ret = ('mock-notify', 'test vendor', '1.0', '1.1')");
+    dbus_test_dbus_mock_object_add_method(notify_mock,
+                                          notify_obj,
+                                          METHOD_GET_INFO,
+                                          nullptr,
+                                          G_VARIANT_TYPE("(ssss)"),
+                                          str,
+                                          &error);
+    g_assert_no_error (error);
+    g_free (str);
+
+    // METHOD_NOTIFY
+    str = g_strdup_printf("try:\n"
+                          "  self.NextNotifyId\n"
+                          "except AttributeError:\n"
+                          "  self.NextNotifyId = %d\n"
+                          "ret = self.NextNotifyId\n"
+                          "self.NextNotifyId += 1\n",
+                          FIRST_NOTIFY_ID);
+    dbus_test_dbus_mock_object_add_method(notify_mock,
+                                          notify_obj,
+                                          METHOD_NOTIFY,
+                                          G_VARIANT_TYPE("(susssasa{sv}i)"),
+                                          G_VARIANT_TYPE_UINT32,
+                                          str,
+                                          &error);
+    g_assert_no_error (error);
+    g_free (str);
+
+    // METHOD_CLOSE 
+    str = g_strdup_printf("self.EmitSignal('%s', '%s', 'uu', [ args[0], %d ])",
+                          NOTIFY_INTERFACE,
+                          SIGNAL_CLOSED,
+                          NOTIFICATION_CLOSED_API);
+    dbus_test_dbus_mock_object_add_method(notify_mock,
+                                          notify_obj,
+                                          METHOD_CLOSE,
+                                          G_VARIANT_TYPE("(u)"),
+                                          nullptr,
+                                          str,
+                                          &error);
+    g_assert_no_error (error);
+    g_free (str);
+
+    dbus_test_service_add_task(service, DBUS_TEST_TASK(notify_mock));
+
+    ///
+    ///  Add the powerd mock
+    ///
+
+    powerd_mock = dbus_test_dbus_mock_new(BUS_POWERD_NAME);
+    powerd_obj = dbus_test_dbus_mock_get_object(powerd_mock,
+                                                BUS_POWERD_PATH,
+                                                BUS_POWERD_INTERFACE,
+                                                &error);
+    g_assert_no_error(error);
+   
+    str = g_strdup_printf ("ret = '%s'", POWERD_COOKIE); 
+    dbus_test_dbus_mock_object_add_method(powerd_mock,
+                                          powerd_obj,
+                                          POWERD_METHOD_REQUEST_SYS_STATE,
+                                          G_VARIANT_TYPE("(si)"),
+                                          G_VARIANT_TYPE("(s)"),
+                                          str,
+                                          &error);
+    g_assert_no_error (error);
+    g_free (str);
+
+    dbus_test_dbus_mock_object_add_method(powerd_mock,
+                                          powerd_obj,
+                                          POWERD_METHOD_CLEAR_SYS_STATE,
+                                          G_VARIANT_TYPE("(s)"),
+                                          nullptr,
+                                          "",
+                                          &error);
+    g_assert_no_error (error);
+
+    dbus_test_service_add_task(service, DBUS_TEST_TASK(powerd_mock));
+
+    ///
+    ///  Add the Screen mock
+    ///
+
+    screen_mock = dbus_test_dbus_mock_new(BUS_SCREEN_NAME);
+    screen_obj = dbus_test_dbus_mock_get_object(screen_mock,
+                                                BUS_SCREEN_PATH,
+                                                BUS_SCREEN_INTERFACE,
+                                                &error);
+    g_assert_no_error(error);
+   
+    str = g_strdup_printf ("ret = %d", SCREEN_COOKIE); 
+    dbus_test_dbus_mock_object_add_method(screen_mock,
+                                          screen_obj,
+                                          SCREEN_METHOD_KEEP_DISPLAY_ON,
+                                          nullptr,
+                                          G_VARIANT_TYPE("(i)"),
+                                          str,
+                                          &error);
+    g_assert_no_error (error);
+    g_free (str);
+
+    dbus_test_dbus_mock_object_add_method(screen_mock,
+                                          screen_obj,
+                                          SCREEN_METHOD_REMOVE_DISPLAY_ON_REQUEST,
+                                          G_VARIANT_TYPE("(i)"),
+                                          nullptr,
+                                          "",
+                                          &error);
+    g_assert_no_error (error);
+    dbus_test_service_add_task(service, DBUS_TEST_TASK(screen_mock));
+
+    ///
+    ///  Add the haptic mock
+    ///
+
+    haptic_mock = dbus_test_dbus_mock_new(BUS_HAPTIC_NAME);
+    haptic_obj = dbus_test_dbus_mock_get_object(haptic_mock,
+                                                BUS_HAPTIC_PATH,
+                                                BUS_HAPTIC_INTERFACE,
+                                                &error);
+   
+    dbus_test_dbus_mock_object_add_method(haptic_mock,
+                                          haptic_obj,
+                                          HAPTIC_METHOD_VIBRATE_PATTERN,
+                                          G_VARIANT_TYPE("(auu)"),
+                                          nullptr,
+                                          "",
+                                          &error);
+    g_assert_no_error (error);
+    dbus_test_service_add_task(service, DBUS_TEST_TASK(haptic_mock));
+
+
+    // start 'em up.
+    // make the system bus work off the mock bus too, since that's
+    // where the upower and screen are on the system bus...
+
+    dbus_test_service_start_tasks(service);
+    g_setenv("DBUS_SYSTEM_BUS_ADDRESS", g_getenv("DBUS_SESSION_BUS_ADDRESS"), TRUE);
+
+    session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
+    ASSERT_NE(nullptr, session_bus);
+    g_dbus_connection_set_exit_on_close(session_bus, false);
+    g_object_add_weak_pointer(G_OBJECT(session_bus), (gpointer *)&session_bus);
+
+    system_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, nullptr);
+    ASSERT_NE(nullptr, system_bus);
+    g_dbus_connection_set_exit_on_close(system_bus, FALSE);
+    g_object_add_weak_pointer(G_OBJECT(system_bus), (gpointer *)&system_bus);
+  }
+
+  void TearDown() override
+  {
+    g_clear_object(&haptic_mock);
+    g_clear_object(&screen_mock);
+    g_clear_object(&powerd_mock);
+    g_clear_object(&notify_mock);
+    g_clear_object(&as_mock);
+    g_clear_object(&service);
+    g_object_unref(session_bus);
+    g_object_unref(system_bus);
+
+    // wait a little while for the scaffolding to shut down,
+    // but don't block on it forever...
+    unsigned int cleartry = 0;
+    while (((system_bus != nullptr) || (session_bus != nullptr)) && (cleartry < 50))
+      {
+        g_usleep(100000);
+        while (g_main_pending())
+          g_main_iteration(true);
+        cleartry++;
+      }
+
+    super::TearDown();
+  }
+
+  void make_interactive()
+  {
+    // GetCapabilities returns an array containing 'actions',
+    // so our snap decision will be interactive.
+    // For this test, it means we should get a timeout Notify Hint
+    // that matches duration_minutes
+    GError * error = nullptr;
+    dbus_test_dbus_mock_object_add_method(notify_mock,
+                                          notify_obj,
+                                          METHOD_GET_CAPS,
+                                          nullptr,
+                                          G_VARIANT_TYPE_STRING_ARRAY,
+                                          "ret = ['actions', 'body']",
+                                          &error);
+    g_assert_no_error (error);
+  }
+
+  std::shared_ptr<unity::indicator::datetime::Snap>
+  create_snap(const std::shared_ptr<unity::indicator::notifications::Engine>& ne,
+              const std::shared_ptr<unity::indicator::notifications::SoundBuilder>& sb,
+              const std::shared_ptr<unity::indicator::datetime::Settings>& settings)
+  {
+    auto snap = std::make_shared<unity::indicator::datetime::Snap>(ne, sb, settings);
+    wait_msec(100); // wait a moment for the Snap to finish its async dbus bootstrapping
+    return snap;
+  }
+};
+

=== added file 'tests/test-notification.cpp'
--- tests/test-notification.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-notification.cpp	2016-02-03 16:38:36 +0000
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#include <datetime/appointment.h>
+#include <datetime/settings.h>
+#include <datetime/snap.h>
+
+#include "notification-fixture.h"
+
+/***
+****
+***/
+
+using namespace unity::indicator::datetime;
+
+namespace
+{
+  static constexpr char const * APP_NAME {"indicator-datetime-service"};
+
+  gboolean quit_idle (gpointer gloop)
+  {
+    g_main_loop_quit(static_cast<GMainLoop*>(gloop));
+    return G_SOURCE_REMOVE;
+  };
+}
+
+/***
+****
+***/
+
+TEST_F(NotificationFixture,Notification)
+{
+  // Feed different combinations of system settings,
+  // indicator-datetime settings, and event types,
+  // then see if notifications and haptic feedback behave as expected.
+
+  auto settings = std::make_shared<Settings>();
+  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
+  auto sb = std::make_shared<unity::indicator::notifications::DefaultSoundBuilder>();
+  auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
+
+  // combinatorial factor #1: event type
+  struct {
+    Appointment appt;
+    bool expected_notify_called;
+    bool expected_vibrate_called;
+  } test_appts[] = {
+    { appt, true, true },
+    { ualarm, true, true }
+  };
+
+  // combinatorial factor #2: indicator-datetime's haptic mode
+  struct {
+    const char* haptic_mode;
+    bool expected_notify_called;
+    bool expected_vibrate_called;
+  } test_haptics[] = {
+    { "none", true, false },
+    { "pulse", true, true }
+  };
+
+  // combinatorial factor #3: system settings' "other vibrations" enabled
+  struct {
+    bool other_vibrations;
+    bool expected_notify_called;
+    bool expected_vibrate_called;
+  } test_other_vibrations[] = {
+    { true, true, true },
+    { false, true, false }
+  };
+
+  // combinatorial factor #4: system settings' notifications app blacklist
+  const std::set<std::pair<std::string,std::string>> blacklist_calendar { std::make_pair(std::string{"com.ubuntu.calendar"}, std::string{"calendar-app"}) };
+  const std::set<std::pair<std::string,std::string>> blacklist_empty;
+  struct {
+    std::set<std::pair<std::string,std::string>> muted_apps; // apps that should not trigger notifications
+    bool expected_notify_called; // do we expect the notification tho show?
+    bool expected_vibrate_called; // do we expect the phone to vibrate?
+  } test_muted_apps[] = {
+    { blacklist_calendar, false, false },
+    { blacklist_empty, true, true }
+  };
+
+  for (const auto& test_appt : test_appts)
+  {
+  for (const auto& test_haptic : test_haptics)
+  {
+  for (const auto& test_vibes : test_other_vibrations)
+  {
+  for (const auto& test_muted : test_muted_apps)
+  {
+    auto snap = create_snap(ne, sb, settings);
+
+    const bool expected_notify_called = test_appt.expected_notify_called
+                                     && test_vibes.expected_notify_called
+                                     && test_muted.expected_notify_called
+                                     && test_haptic.expected_notify_called;
+
+    const bool expected_vibrate_called = test_appt.expected_vibrate_called
+                                      && test_vibes.expected_vibrate_called
+                                      && test_muted.expected_vibrate_called
+                                      && test_haptic.expected_vibrate_called;
+
+    // clear out any previous iterations' noise
+    GError * error = nullptr;
+    dbus_test_dbus_mock_object_clear_method_calls(haptic_mock, haptic_obj, &error);
+    g_assert_no_error(error);
+    dbus_test_dbus_mock_object_clear_method_calls(notify_mock, notify_obj, &error);
+    g_assert_no_error(error);
+
+    // set the properties to match the test case
+    settings->muted_apps.set(test_muted.muted_apps);
+    settings->alarm_haptic.set(test_haptic.haptic_mode);
+    dbus_test_dbus_mock_object_update_property(as_mock,
+                                               as_obj,
+                                               PROP_OTHER_VIBRATIONS,
+                                               g_variant_new_boolean(test_vibes.other_vibrations),
+                                               &error);
+    g_assert_no_error(error);
+    wait_msec(100);
+
+    // run the test
+    (*snap)(appt, appt.alarms.front(), func, func);
+    wait_msec(100);
+
+    // test that the notification was as expected
+    const bool notify_called = dbus_test_dbus_mock_object_check_method_call(notify_mock,
+                                                                            notify_obj,
+                                                                            METHOD_NOTIFY,
+                                                                            nullptr,
+                                                                            &error);
+    g_assert_no_error(error);
+    EXPECT_EQ(expected_notify_called, notify_called);
+
+    // test that the vibration was as expected
+    const bool vibrate_called = dbus_test_dbus_mock_object_check_method_call(haptic_mock,
+                                                                             haptic_obj,
+                                                                             HAPTIC_METHOD_VIBRATE_PATTERN,
+                                                                             nullptr,
+                                                                             &error);
+    g_assert_no_error(error);
+    EXPECT_EQ(expected_vibrate_called, vibrate_called);
+  }
+  }
+  }
+  }
+}
+

=== modified file 'tests/test-settings.cpp'
--- tests/test-settings.cpp	2015-10-13 23:28:20 +0000
+++ tests/test-settings.cpp	2016-02-03 16:38:36 +0000
@@ -38,18 +38,22 @@
     std::shared_ptr<LiveSettings> m_live;
     std::shared_ptr<Settings> m_settings;
     GSettings * m_gsettings;
+    GSettings * m_gsettings_cunh;
 
     void SetUp() override
     {
         super::SetUp();
 
         m_gsettings = g_settings_new(SETTINGS_INTERFACE);
+        m_gsettings_cunh = g_settings_new(SETTINGS_CUNH_SCHEMA_ID);
+
         m_live.reset(new LiveSettings);
         m_settings = std::dynamic_pointer_cast<Settings>(m_live);
     }
 
     void TearDown() override
     {
+        g_clear_object(&m_gsettings_cunh);
         g_clear_object(&m_gsettings);
         m_settings.reset();
         m_live.reset();
@@ -222,3 +226,39 @@
     g_strfreev(tmp);
     EXPECT_EQ(bv, vtmp);
 }
+
+TEST_F(SettingsFixture, MutedApps)
+{
+    const auto key = SETTINGS_CUNH_BLACKLIST_S;
+
+    struct {
+        std::string pkgname;
+        std::string appname;
+    } apps[] = {
+        { "", "ubuntu-system-settings" },
+        { "com.ubuntu.calendar", "calendar" },
+        { "com.ubuntu.developer.webapps.webapp-facebook", "webapp-facebook" },
+        { "com.ubuntu.reminders", "reminders" }
+    };
+    std::set<std::pair<std::string,std::string>> apps_set;
+    for (const auto& app : apps)
+        apps_set.insert(std::make_pair(app.pkgname, app.appname));
+
+    // test that changing Settings is reflected in the schema
+    m_settings->muted_apps.set(apps_set);
+    auto v = g_settings_get_value(m_gsettings_cunh, key);
+    auto str = g_variant_print(v, true);
+    EXPECT_STREQ("[('', 'ubuntu-system-settings'), ('com.ubuntu.calendar', 'calendar'), ('com.ubuntu.developer.webapps.webapp-facebook', 'webapp-facebook'), ('com.ubuntu.reminders', 'reminders')]", str);
+    g_clear_pointer(&str, g_free);
+
+    // test that clearing the schema clears the settings
+    g_settings_reset(m_gsettings_cunh, key);
+    EXPECT_EQ(0, m_settings->muted_apps.get().size());
+
+    // test thst setting the schema updates the settings
+    g_settings_set_value(m_gsettings_cunh, key, v);
+    EXPECT_EQ(apps_set, m_settings->muted_apps.get());
+
+    // cleanup
+    g_clear_pointer(&v, g_variant_unref);
+}

=== modified file 'tests/test-snap.cpp'
--- tests/test-snap.cpp	2015-10-14 03:32:39 +0000
+++ tests/test-snap.cpp	2016-02-03 16:38:36 +0000
@@ -25,19 +25,12 @@
 #include <notifications/dbus-shared.h>
 #include <notifications/notifications.h>
 
-#include <libdbustest/dbus-test.h>
-
-#include <glib.h>
-
-#include <unistd.h> // getuid()
-#include <sys/types.h> // getuid()
+#include "notification-fixture.h"
 
 using namespace unity::indicator::datetime;
 
 namespace uin = unity::indicator::notifications;
 
-#include "glib-fixture.h"
-
 /***
 ****
 ***/
@@ -49,341 +42,6 @@
 
 using namespace unity::indicator::datetime;
 
-class SnapFixture: public GlibFixture
-{
-private:
-
-  typedef GlibFixture super;
-
-  static constexpr char const * NOTIFY_BUSNAME   {"org.freedesktop.Notifications"};
-  static constexpr char const * NOTIFY_INTERFACE {"org.freedesktop.Notifications"};
-  static constexpr char const * NOTIFY_PATH      {"/org/freedesktop/Notifications"};
-
-protected:
-
-  static constexpr char const * HAPTIC_METHOD_VIBRATE_PATTERN {"VibratePattern"};
-
-  static constexpr int SCREEN_COOKIE {8675309};
-  static constexpr char const * SCREEN_METHOD_KEEP_DISPLAY_ON {"keepDisplayOn"}; 
-  static constexpr char const * SCREEN_METHOD_REMOVE_DISPLAY_ON_REQUEST {"removeDisplayOnRequest"};
-
-  static constexpr int POWERD_SYS_STATE_ACTIVE = 1;
-  static constexpr char const * POWERD_COOKIE {"567-48-8307"};
-  static constexpr char const * POWERD_METHOD_REQUEST_SYS_STATE {"requestSysState"};
-  static constexpr char const * POWERD_METHOD_CLEAR_SYS_STATE {"clearSysState"};
-
-  static constexpr int FIRST_NOTIFY_ID {1000};
-
-  static constexpr int NOTIFICATION_CLOSED_EXPIRED   {1};
-  static constexpr int NOTIFICATION_CLOSED_DISMISSED {2};
-  static constexpr int NOTIFICATION_CLOSED_API       {3};
-  static constexpr int NOTIFICATION_CLOSED_UNDEFINED {4};
-
-  static constexpr char const * METHOD_CLOSE {"CloseNotification"};
-  static constexpr char const * METHOD_GET_CAPS {"GetCapabilities"};
-  static constexpr char const * METHOD_GET_INFO {"GetServerInformation"};
-  static constexpr char const * METHOD_NOTIFY {"Notify"};
-
-  static constexpr char const * SIGNAL_CLOSED {"NotificationClosed"};
-
-  static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"};
-
-  static constexpr char const * AS_BUSNAME            {"org.freedesktop.Accounts"};
-  static constexpr char const * AS_INTERFACE          {"com.ubuntu.touch.AccountsService.Sound"};
-  static constexpr char const * PROP_OTHER_VIBRATIONS {"OtherVibrate"};
-  static constexpr char const * PROP_SILENT_MODE      {"SilentMode"};
-
-  Appointment appt;
-  Appointment ualarm;
-  GDBusConnection * system_bus = nullptr;
-  GDBusConnection * session_bus = nullptr;
-  DbusTestService * service = nullptr;
-  DbusTestDbusMock * as_mock = nullptr;
-  DbusTestDbusMock * notify_mock = nullptr;
-  DbusTestDbusMock * powerd_mock = nullptr;
-  DbusTestDbusMock * screen_mock = nullptr;
-  DbusTestDbusMock * haptic_mock = nullptr;
-  DbusTestDbusMockObject * as_obj = nullptr;
-  DbusTestDbusMockObject * notify_obj = nullptr;
-  DbusTestDbusMockObject * powerd_obj = nullptr;
-  DbusTestDbusMockObject * screen_obj = nullptr;
-  DbusTestDbusMockObject * haptic_obj = nullptr;
-
-  void SetUp() override
-  {
-    GError * error = nullptr;
-    char * str = nullptr;
-
-    super::SetUp();
-
-    // init an Appointment
-    appt.color = "green";
-    appt.summary = "Christmas";
-    appt.uid = "D4B57D50247291478ED31DED17FF0A9838DED402";
-    appt.type = Appointment::EVENT;
-    const auto christmas = DateTime::Local(2015,12,25,0,0,0);
-    appt.begin = christmas.start_of_day();
-    appt.end = christmas.end_of_day();
-    appt.alarms.push_back(Alarm{"Ho Ho Ho!", "", appt.begin});
-
-    // init an Ubuntu Alarm
-    ualarm.color = "red";
-    ualarm.summary = "Wakeup";
-    ualarm.uid = "E4B57D50247291478ED31DED17FF0A9838DED403";
-    ualarm.type = Appointment::UBUNTU_ALARM;
-    const auto tomorrow = DateTime::NowLocal().add_days(1);
-    ualarm.begin = tomorrow;
-    ualarm.end = tomorrow;
-    ualarm.alarms.push_back(Alarm{"It's Tomorrow!", "", appt.begin});
-
-    service = dbus_test_service_new(nullptr);
-
-    ///
-    ///  Add the AccountsService mock
-    ///
-
-    as_mock = dbus_test_dbus_mock_new(AS_BUSNAME);
-    auto as_path = g_strdup_printf("/org/freedesktop/Accounts/User%lu", (gulong)getuid());
-    as_obj = dbus_test_dbus_mock_get_object(as_mock,
-                                            as_path,
-                                            AS_INTERFACE,
-                                            &error);
-    g_free(as_path);
-    g_assert_no_error(error);
-
-    // PROP_SILENT_MODE
-    dbus_test_dbus_mock_object_add_property(as_mock,
-                                            as_obj,
-                                            PROP_SILENT_MODE,
-                                            G_VARIANT_TYPE_BOOLEAN,
-                                            g_variant_new_boolean(false),
-                                            &error);
-    g_assert_no_error(error);
-
-    // PROP_OTHER_VIBRATIONS
-    dbus_test_dbus_mock_object_add_property(as_mock,
-                                            as_obj,
-                                            PROP_OTHER_VIBRATIONS,
-                                            G_VARIANT_TYPE_BOOLEAN,
-                                            g_variant_new_boolean(true),
-                                            &error);
-    g_assert_no_error(error);
-    dbus_test_service_add_task(service, DBUS_TEST_TASK(as_mock));
-
-    ///
-    ///  Add the Notifications mock
-    ///
-
-    notify_mock = dbus_test_dbus_mock_new(NOTIFY_BUSNAME);
-    notify_obj = dbus_test_dbus_mock_get_object(notify_mock,
-                                                NOTIFY_PATH,
-                                                NOTIFY_INTERFACE,
-                                                &error);
-    g_assert_no_error(error);
-   
-    // METHOD_GET_INFO 
-    str = g_strdup("ret = ('mock-notify', 'test vendor', '1.0', '1.1')");
-    dbus_test_dbus_mock_object_add_method(notify_mock,
-                                          notify_obj,
-                                          METHOD_GET_INFO,
-                                          nullptr,
-                                          G_VARIANT_TYPE("(ssss)"),
-                                          str,
-                                          &error);
-    g_assert_no_error (error);
-    g_free (str);
-
-    // METHOD_NOTIFY
-    str = g_strdup_printf("try:\n"
-                          "  self.NextNotifyId\n"
-                          "except AttributeError:\n"
-                          "  self.NextNotifyId = %d\n"
-                          "ret = self.NextNotifyId\n"
-                          "self.NextNotifyId += 1\n",
-                          FIRST_NOTIFY_ID);
-    dbus_test_dbus_mock_object_add_method(notify_mock,
-                                          notify_obj,
-                                          METHOD_NOTIFY,
-                                          G_VARIANT_TYPE("(susssasa{sv}i)"),
-                                          G_VARIANT_TYPE_UINT32,
-                                          str,
-                                          &error);
-    g_assert_no_error (error);
-    g_free (str);
-
-    // METHOD_CLOSE 
-    str = g_strdup_printf("self.EmitSignal('%s', '%s', 'uu', [ args[0], %d ])",
-                          NOTIFY_INTERFACE,
-                          SIGNAL_CLOSED,
-                          NOTIFICATION_CLOSED_API);
-    dbus_test_dbus_mock_object_add_method(notify_mock,
-                                          notify_obj,
-                                          METHOD_CLOSE,
-                                          G_VARIANT_TYPE("(u)"),
-                                          nullptr,
-                                          str,
-                                          &error);
-    g_assert_no_error (error);
-    g_free (str);
-
-    dbus_test_service_add_task(service, DBUS_TEST_TASK(notify_mock));
-
-    ///
-    ///  Add the powerd mock
-    ///
-
-    powerd_mock = dbus_test_dbus_mock_new(BUS_POWERD_NAME);
-    powerd_obj = dbus_test_dbus_mock_get_object(powerd_mock,
-                                                BUS_POWERD_PATH,
-                                                BUS_POWERD_INTERFACE,
-                                                &error);
-    g_assert_no_error(error);
-   
-    str = g_strdup_printf ("ret = '%s'", POWERD_COOKIE); 
-    dbus_test_dbus_mock_object_add_method(powerd_mock,
-                                          powerd_obj,
-                                          POWERD_METHOD_REQUEST_SYS_STATE,
-                                          G_VARIANT_TYPE("(si)"),
-                                          G_VARIANT_TYPE("(s)"),
-                                          str,
-                                          &error);
-    g_assert_no_error (error);
-    g_free (str);
-
-    dbus_test_dbus_mock_object_add_method(powerd_mock,
-                                          powerd_obj,
-                                          POWERD_METHOD_CLEAR_SYS_STATE,
-                                          G_VARIANT_TYPE("(s)"),
-                                          nullptr,
-                                          "",
-                                          &error);
-    g_assert_no_error (error);
-
-    dbus_test_service_add_task(service, DBUS_TEST_TASK(powerd_mock));
-
-    ///
-    ///  Add the Screen mock
-    ///
-
-    screen_mock = dbus_test_dbus_mock_new(BUS_SCREEN_NAME);
-    screen_obj = dbus_test_dbus_mock_get_object(screen_mock,
-                                                BUS_SCREEN_PATH,
-                                                BUS_SCREEN_INTERFACE,
-                                                &error);
-    g_assert_no_error(error);
-   
-    str = g_strdup_printf ("ret = %d", SCREEN_COOKIE); 
-    dbus_test_dbus_mock_object_add_method(screen_mock,
-                                          screen_obj,
-                                          SCREEN_METHOD_KEEP_DISPLAY_ON,
-                                          nullptr,
-                                          G_VARIANT_TYPE("(i)"),
-                                          str,
-                                          &error);
-    g_assert_no_error (error);
-    g_free (str);
-
-    dbus_test_dbus_mock_object_add_method(screen_mock,
-                                          screen_obj,
-                                          SCREEN_METHOD_REMOVE_DISPLAY_ON_REQUEST,
-                                          G_VARIANT_TYPE("(i)"),
-                                          nullptr,
-                                          "",
-                                          &error);
-    g_assert_no_error (error);
-    dbus_test_service_add_task(service, DBUS_TEST_TASK(screen_mock));
-
-    ///
-    ///  Add the haptic mock
-    ///
-
-    haptic_mock = dbus_test_dbus_mock_new(BUS_HAPTIC_NAME);
-    haptic_obj = dbus_test_dbus_mock_get_object(haptic_mock,
-                                                BUS_HAPTIC_PATH,
-                                                BUS_HAPTIC_INTERFACE,
-                                                &error);
-   
-    dbus_test_dbus_mock_object_add_method(haptic_mock,
-                                          haptic_obj,
-                                          HAPTIC_METHOD_VIBRATE_PATTERN,
-                                          G_VARIANT_TYPE("(auu)"),
-                                          nullptr,
-                                          "",
-                                          &error);
-    g_assert_no_error (error);
-    dbus_test_service_add_task(service, DBUS_TEST_TASK(haptic_mock));
-
-
-    // start 'em up.
-    // make the system bus work off the mock bus too, since that's
-    // where the upower and screen are on the system bus...
-
-    dbus_test_service_start_tasks(service);
-    g_setenv("DBUS_SYSTEM_BUS_ADDRESS", g_getenv("DBUS_SESSION_BUS_ADDRESS"), TRUE);
-
-    session_bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
-    ASSERT_NE(nullptr, session_bus);
-    g_dbus_connection_set_exit_on_close(session_bus, false);
-    g_object_add_weak_pointer(G_OBJECT(session_bus), (gpointer *)&session_bus);
-
-    system_bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, nullptr, nullptr);
-    ASSERT_NE(nullptr, system_bus);
-    g_dbus_connection_set_exit_on_close(system_bus, FALSE);
-    g_object_add_weak_pointer(G_OBJECT(system_bus), (gpointer *)&system_bus);
-  }
-
-  void TearDown() override
-  {
-    g_clear_object(&haptic_mock);
-    g_clear_object(&screen_mock);
-    g_clear_object(&powerd_mock);
-    g_clear_object(&notify_mock);
-    g_clear_object(&as_mock);
-    g_clear_object(&service);
-    g_object_unref(session_bus);
-    g_object_unref(system_bus);
-
-    // wait a little while for the scaffolding to shut down,
-    // but don't block on it forever...
-    unsigned int cleartry = 0;
-    while (((system_bus != nullptr) || (session_bus != nullptr)) && (cleartry < 50))
-      {
-        g_usleep(100000);
-        while (g_main_pending())
-          g_main_iteration(true);
-        cleartry++;
-      }
-
-    super::TearDown();
-  }
-
-  void make_interactive()
-  {
-    // GetCapabilities returns an array containing 'actions',
-    // so our snap decision will be interactive.
-    // For this test, it means we should get a timeout Notify Hint
-    // that matches duration_minutes
-    GError * error = nullptr;
-    dbus_test_dbus_mock_object_add_method(notify_mock,
-                                          notify_obj,
-                                          METHOD_GET_CAPS,
-                                          nullptr,
-                                          G_VARIANT_TYPE_STRING_ARRAY,
-                                          "ret = ['actions', 'body']",
-                                          &error);
-    g_assert_no_error (error);
-  }
-
-  std::shared_ptr<Snap> create_snap(const std::shared_ptr<uin::Engine>& ne,
-                                    const std::shared_ptr<uin::SoundBuilder>& sb,
-                                    const std::shared_ptr<Settings>& settings)
-  {
-    auto snap = std::make_shared<Snap>(ne, sb, settings);
-    wait_msec(100); // wait a moment for the Snap to finish its async dbus bootstrapping
-    return snap;
-  }
-};
-
 /***
 ****
 ***/
@@ -397,7 +55,7 @@
   };
 }
 
-TEST_F(SnapFixture, InteractiveDuration)
+TEST_F(NotificationFixture, InteractiveDuration)
 {
   static constexpr int duration_minutes = 120;
   auto settings = std::make_shared<Settings>();
@@ -450,7 +108,7 @@
 ****
 ***/
 
-TEST_F(SnapFixture, InhibitSleep)
+TEST_F(NotificationFixture, InhibitSleep)
 {
   auto settings = std::make_shared<Settings>();
   auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
@@ -506,7 +164,7 @@
 ****
 ***/
 
-TEST_F(SnapFixture, ForceScreen)
+TEST_F(NotificationFixture, ForceScreen)
 {
   auto settings = std::make_shared<Settings>();
   auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
@@ -548,59 +206,6 @@
 ****
 ***/
 
-TEST_F(SnapFixture,Vibrate)
-{
-  auto settings = std::make_shared<Settings>();
-  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
-  auto sb = std::make_shared<unity::indicator::notifications::DefaultSoundBuilder>();
-  auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
-  GError * error = nullptr;
-
-  struct {
-      bool other_vibrations; // the com.ubuntu.touch.AccountsService.Sound "other vibrations" setting
-      const char* haptic_mode;  // supported values: "none", "pulse"
-      bool expected_vibrate_called; // do we expect the phone to vibrate?
-  } test_cases[] = {
-      { false, "none",  false },
-      { true,  "none",  false },
-      { false, "pulse", false },
-      { true,  "pulse", true  }
-  };
-
-  auto snap = create_snap(ne, sb, settings);
-
-  for(const auto& test_case : test_cases)
-  {
-    // clear out any previous iterations' noise
-    dbus_test_dbus_mock_object_clear_method_calls(haptic_mock, haptic_obj, &error);
-
-    // set the properties to match the test case
-    settings->alarm_haptic.set(test_case.haptic_mode);
-    dbus_test_dbus_mock_object_update_property(as_mock,
-                                               as_obj,
-                                               PROP_OTHER_VIBRATIONS,
-                                               g_variant_new_boolean(test_case.other_vibrations),
-                                               &error);
-    g_assert_no_error(error);
-    wait_msec(100);
-
-    // run the test
-    (*snap)(appt, appt.alarms.front(), func, func);
-    wait_msec(100);
-    const bool vibrate_called = dbus_test_dbus_mock_object_check_method_call(haptic_mock,
-                                                                             haptic_obj,
-                                                                             HAPTIC_METHOD_VIBRATE_PATTERN,
-                                                                             nullptr,
-                                                                             &error);
-    g_assert_no_error(error);
-    EXPECT_EQ(test_case.expected_vibrate_called, vibrate_called);
-  }
-}
-
-/***
-****
-***/
-
 /**
  * A DefaultSoundBuilder wrapper which remembers the parameters of the last sound created.
  */
@@ -641,10 +246,10 @@
   return uri;
 }
 
-TEST_F(SnapFixture,DefaultSounds)
+TEST_F(NotificationFixture,DefaultSounds)
 {
   auto settings = std::make_shared<Settings>();
-  auto ne = std::make_shared<uin::Engine>(APP_NAME);
+  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
   auto sb = std::make_shared<TestSoundBuilder>();
   auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
 
@@ -667,3 +272,125 @@
     EXPECT_EQ(test_case.expected_role, sb->role());
   }
 }
+
+/***
+****
+***/
+
+TEST_F(NotificationFixture,Notification)
+{
+  // Feed different combinations of system settings,
+  // indicator-datetime settings, and event types,
+  // then see if notifications and haptic feedback behave as expected.
+
+  auto settings = std::make_shared<Settings>();
+  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
+  auto sb = std::make_shared<unity::indicator::notifications::DefaultSoundBuilder>();
+  auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
+
+  // combinatorial factor #1: event type
+  struct {
+    Appointment appt;
+    bool expected_notify_called;
+    bool expected_vibrate_called;
+  } test_appts[] = {
+    { appt, true, true },
+    { ualarm, true, true }
+  };
+
+  // combinatorial factor #2: indicator-datetime's haptic mode
+  struct {
+    const char* haptic_mode;
+    bool expected_notify_called;
+    bool expected_vibrate_called;
+  } test_haptics[] = {
+    { "none", true, false },
+    { "pulse", true, true }
+  };
+
+  // combinatorial factor #3: system settings' "other vibrations" enabled
+  struct {
+    bool other_vibrations;
+    bool expected_notify_called;
+    bool expected_vibrate_called;
+  } test_other_vibrations[] = {
+    { true, true, true },
+    { false, true, false }
+  };
+
+  // combinatorial factor #4: system settings' notifications app blacklist
+  const std::set<std::pair<std::string,std::string>> blacklist_calendar { std::make_pair(std::string{"com.ubuntu.calendar"}, std::string{"calendar-app"}) };
+  const std::set<std::pair<std::string,std::string>> blacklist_empty;
+  struct {
+    std::set<std::pair<std::string,std::string>> muted_apps; // apps that should not trigger notifications
+    bool expected_notify_called; // do we expect the notification tho show?
+    bool expected_vibrate_called; // do we expect the phone to vibrate?
+  } test_muted_apps[] = {
+    { blacklist_calendar, false, false },
+    { blacklist_empty, true, true }
+  };
+
+  for (const auto& test_appt : test_appts)
+  {
+  for (const auto& test_haptic : test_haptics)
+  {
+  for (const auto& test_vibes : test_other_vibrations)
+  {
+  for (const auto& test_muted : test_muted_apps)
+  {
+  auto snap = create_snap(ne, sb, settings);
+
+    const bool expected_notify_called = test_appt.expected_notify_called
+                                     && test_vibes.expected_notify_called
+                                     && test_muted.expected_notify_called
+                                     && test_haptic.expected_notify_called;
+
+    const bool expected_vibrate_called = test_appt.expected_vibrate_called
+                                      && test_vibes.expected_vibrate_called
+                                      && test_muted.expected_vibrate_called
+                                      && test_haptic.expected_vibrate_called;
+
+    // clear out any previous iterations' noise
+    GError * error = nullptr;
+    dbus_test_dbus_mock_object_clear_method_calls(haptic_mock, haptic_obj, &error);
+    g_assert_no_error(error);
+    dbus_test_dbus_mock_object_clear_method_calls(notify_mock, notify_obj, &error);
+    g_assert_no_error(error);
+
+    // set the properties to match the test case
+    settings->muted_apps.set(test_muted.muted_apps);
+    settings->alarm_haptic.set(test_haptic.haptic_mode);
+    dbus_test_dbus_mock_object_update_property(as_mock,
+                                               as_obj,
+                                               PROP_OTHER_VIBRATIONS,
+                                               g_variant_new_boolean(test_vibes.other_vibrations),
+                                               &error);
+    g_assert_no_error(error);
+    wait_msec(100);
+
+    // run the test
+    (*snap)(appt, appt.alarms.front(), func, func);
+    wait_msec(100);
+
+    // test that the notification was as expected
+    const bool notify_called = dbus_test_dbus_mock_object_check_method_call(notify_mock,
+                                                                            notify_obj,
+                                                                            METHOD_NOTIFY,
+                                                                            nullptr,
+                                                                            &error);
+    g_assert_no_error(error);
+    EXPECT_EQ(expected_notify_called, notify_called);
+
+    // test that the vibration was as expected
+    const bool vibrate_called = dbus_test_dbus_mock_object_check_method_call(haptic_mock,
+                                                                             haptic_obj,
+                                                                             HAPTIC_METHOD_VIBRATE_PATTERN,
+                                                                             nullptr,
+                                                                             &error);
+    g_assert_no_error(error);
+    EXPECT_EQ(expected_vibrate_called, vibrate_called);
+  }
+  }
+  }
+  }
+}

=== added file 'tests/test-sound.cpp'
--- tests/test-sound.cpp	1970-01-01 00:00:00 +0000
+++ tests/test-sound.cpp	2016-02-03 16:38:36 +0000
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2014-2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#include <datetime/appointment.h>
+#include <datetime/settings.h>
+#include <datetime/snap.h>
+
+#include "notification-fixture.h"
+
+using namespace unity::indicator::datetime;
+
+namespace uin = unity::indicator::notifications;
+
+/***
+****
+***/
+
+namespace
+{
+  static constexpr char const * APP_NAME {"indicator-datetime-service"};
+}
+
+
+namespace
+{
+  gboolean quit_idle (gpointer gloop)
+  {
+    g_main_loop_quit(static_cast<GMainLoop*>(gloop));
+    return G_SOURCE_REMOVE;
+  };
+}
+
+/***
+****
+***/
+
+TEST_F(NotificationFixture, InteractiveDuration)
+{
+  static constexpr int duration_minutes = 120;
+  auto settings = std::make_shared<Settings>();
+  settings->alarm_duration.set(duration_minutes);
+  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
+  auto sb = std::make_shared<unity::indicator::notifications::DefaultSoundBuilder>();
+  auto snap = create_snap(ne, sb, settings);
+
+  make_interactive();
+
+  // call the Snap Decision
+  auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
+  (*snap)(appt, appt.alarms.front(), func, func);
+
+  // confirm that Notify got called once
+  guint len = 0;
+  GError * error = nullptr;
+  const auto calls = dbus_test_dbus_mock_object_get_method_calls (notify_mock,
+                                                                  notify_obj,
+                                                                  METHOD_NOTIFY,
+                                                                  &len,
+                                                                  &error);
+  g_assert_no_error(error);
+  ASSERT_EQ(1, len);
+
+  // confirm that the app_name passed to Notify was APP_NAME
+  const auto& params = calls[0].params;
+  ASSERT_EQ(8, g_variant_n_children(params));
+  const char * str = nullptr;
+  g_variant_get_child (params, 0, "&s", &str);
+  ASSERT_STREQ(APP_NAME, str);
+
+  // confirm that the icon passed to Notify was "alarm-clock"
+  g_variant_get_child (params, 2, "&s", &str);
+  ASSERT_STREQ("alarm-clock", str);
+
+  // confirm that the hints passed to Notify included a timeout matching duration_minutes
+  int32_t i32;
+  bool b;
+  auto hints = g_variant_get_child_value (params, 6);
+  b = g_variant_lookup (hints, HINT_TIMEOUT, "i", &i32);
+  EXPECT_TRUE(b);
+  const auto duration = std::chrono::minutes(duration_minutes);
+  EXPECT_EQ(std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(), i32);
+  g_variant_unref(hints);
+  ne.reset();
+}
+
+/***
+****
+***/
+
+TEST_F(NotificationFixture, InhibitSleep)
+{
+  auto settings = std::make_shared<Settings>();
+  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
+  auto sb = std::make_shared<unity::indicator::notifications::DefaultSoundBuilder>();
+  auto snap = create_snap(ne, sb, settings);
+
+  make_interactive();
+
+  // invoke the notification
+  auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
+  (*snap)(appt, appt.alarms.front(), func, func);
+
+  wait_msec(1000);
+
+  // confirm that sleep got inhibited
+  GError * error = nullptr;
+  EXPECT_TRUE (dbus_test_dbus_mock_object_check_method_call (powerd_mock,
+                                                             powerd_obj,
+                                                             POWERD_METHOD_REQUEST_SYS_STATE,
+                                                             g_variant_new("(si)", APP_NAME, POWERD_SYS_STATE_ACTIVE),
+                                                             &error));
+
+  // confirm that the screen got forced on
+  EXPECT_TRUE (dbus_test_dbus_mock_object_check_method_call (screen_mock,
+                                                             screen_obj,
+                                                             SCREEN_METHOD_KEEP_DISPLAY_ON,
+                                                             nullptr,
+                                                             &error));
+
+  // force-close the snap
+  wait_msec(100);
+  snap.reset();
+  wait_msec(100);
+
+  // confirm that sleep got uninhibted
+  EXPECT_TRUE (dbus_test_dbus_mock_object_check_method_call (powerd_mock,
+                                                             powerd_obj,
+                                                             POWERD_METHOD_CLEAR_SYS_STATE,
+                                                             g_variant_new("(s)", POWERD_COOKIE),
+                                                             &error));
+
+  // confirm that the screen's no longer forced on
+  EXPECT_TRUE (dbus_test_dbus_mock_object_check_method_call (screen_mock,
+                                                             screen_obj,
+                                                             SCREEN_METHOD_REMOVE_DISPLAY_ON_REQUEST,
+                                                             g_variant_new("(i)", SCREEN_COOKIE),
+                                                             &error));
+
+  g_assert_no_error (error);
+}
+
+/***
+****
+***/
+
+TEST_F(NotificationFixture, ForceScreen)
+{
+  auto settings = std::make_shared<Settings>();
+  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
+  auto sb = std::make_shared<unity::indicator::notifications::DefaultSoundBuilder>();
+  auto snap = create_snap(ne, sb, settings);
+
+  make_interactive();
+
+  // invoke the notification
+  auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
+  (*snap)(appt, appt.alarms.front(), func, func);
+
+  wait_msec(1000);
+
+  // confirm that sleep got inhibited
+  GError * error = nullptr;
+  EXPECT_TRUE (dbus_test_dbus_mock_object_check_method_call (powerd_mock,
+                                                             powerd_obj,
+                                                             POWERD_METHOD_REQUEST_SYS_STATE,
+                                                             g_variant_new("(si)", APP_NAME, POWERD_SYS_STATE_ACTIVE),
+                                                             &error));
+  g_assert_no_error(error);
+
+  // force-close the snap
+  wait_msec(100);
+  snap.reset();
+  wait_msec(100);
+
+  // confirm that sleep got uninhibted
+  EXPECT_TRUE (dbus_test_dbus_mock_object_check_method_call (powerd_mock,
+                                                             powerd_obj,
+                                                             POWERD_METHOD_CLEAR_SYS_STATE,
+                                                             g_variant_new("(s)", POWERD_COOKIE),
+                                                             &error));
+  g_assert_no_error(error);
+}
+
+/***
+****
+***/
+
+/**
+ * A DefaultSoundBuilder wrapper which remembers the parameters of the last sound created.
+ */
+class TestSoundBuilder: public uin::SoundBuilder
+{
+public:
+    TestSoundBuilder() =default;
+    ~TestSoundBuilder() =default;
+
+    virtual std::shared_ptr<uin::Sound> create(const std::string& role, const std::string& uri, unsigned int volume, bool loop) override {
+        m_role = role;
+        m_uri = uri;
+        m_volume = volume;
+        m_loop = loop;
+        return m_impl.create(role, uri, volume, loop);
+    }
+
+    const std::string& role() { return m_role; }
+    const std::string& uri() { return m_uri; }
+    unsigned int volume() { return m_volume; }
+    bool loop() { return m_loop; }
+
+private:
+    std::string m_role;
+    std::string m_uri;
+    unsigned int m_volume;
+    bool m_loop;
+    uin::DefaultSoundBuilder m_impl;
+};
+
+std::string path_to_uri(const std::string& path)
+{
+  auto file = g_file_new_for_path(path.c_str());
+  auto uri_cstr = g_file_get_uri(file);
+  std::string uri = uri_cstr;
+  g_free(uri_cstr);
+  g_clear_pointer(&file, g_object_unref);
+  return uri;
+}
+
+TEST_F(NotificationFixture,DefaultSounds)
+{
+  auto settings = std::make_shared<Settings>();
+  auto ne = std::make_shared<unity::indicator::notifications::Engine>(APP_NAME);
+  auto sb = std::make_shared<TestSoundBuilder>();
+  auto func = [this](const Appointment&, const Alarm&){g_idle_add(quit_idle, loop);};
+
+  const struct {
+      Appointment appointment;
+      std::string expected_role;
+      std::string expected_uri;
+  } test_cases[] = {
+      { ualarm, "alarm", path_to_uri(ALARM_DEFAULT_SOUND) },
+      { appt,   "alert", path_to_uri(CALENDAR_DEFAULT_SOUND) }
+  };
+
+  auto snap = create_snap(ne, sb, settings);
+
+  for(const auto& test_case : test_cases)
+  {
+    (*snap)(test_case.appointment, test_case.appointment.alarms.front(), func, func);
+    wait_msec(100);
+    EXPECT_EQ(test_case.expected_uri, sb->uri());
+    EXPECT_EQ(test_case.expected_role, sb->role());
+  }
+}