This branch sets the last running player using accounts service instead of gsettings.

It also includes a new class AccountsServiceAccess, to centralize all accesses to account service properties.
Approved by: PS Jenkins bot, Charles Kerr

9 files changed, 750 insertions, 634 deletions

diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp
index f61857e..cf60868 100644
--- a/tests/integration/indicator-sound-test-base.cpp
+++ b/tests/integration/indicator-sound-test-base.cpp
@@ -448,13 +448,37 @@ bool IndicatorSoundTestBase::initializeMenuChangedSignal()
     return true;
 }
 
-bool IndicatorSoundTestBase::waitVolumeChangedInIndicator()
+QVariant IndicatorSoundTestBase::waitPropertyChanged(QSignalSpy *signalSpy, QString property)
 {
-    if (signal_spy_volume_changed_)
+    QVariant ret_val;
+    if (signalSpy)
     {
-        return signal_spy_volume_changed_->wait();
+        signalSpy->wait();
+        if (signalSpy->count())
+        {
+            QList<QVariant> arguments = signalSpy->takeLast();
+            if (arguments.size() == 3 && static_cast<QMetaType::Type>(arguments.at(1).type()) == QMetaType::QVariantMap)
+            {
+                QMap<QString, QVariant> map = arguments.at(1).toMap();
+                QMap<QString, QVariant>::iterator iter = map.find(property);
+                if (iter != map.end())
+                {
+                    return iter.value();
+                }
+            }
+        }
     }
-    return false;
+    return ret_val;
+}
+bool IndicatorSoundTestBase::waitVolumeChangedInIndicator()
+{
+    QVariant val = waitPropertyChanged(signal_spy_volume_changed_.get(), "Volume");
+    return !val.isNull();
+}
+
+QVariant IndicatorSoundTestBase::waitLastRunningPlayerChanged()
+{
+    return waitPropertyChanged(signal_spy_volume_changed_.get(), "LastRunningPlayer");
 }
 
 void IndicatorSoundTestBase::initializeAccountsInterface()
diff --git a/tests/integration/indicator-sound-test-base.h b/tests/integration/indicator-sound-test-base.h
index 969fd69..5c36031 100644
--- a/tests/integration/indicator-sound-test-base.h
+++ b/tests/integration/indicator-sound-test-base.h
@@ -144,6 +144,10 @@ protected:
 
     float getVolumeValue(bool *isValid = nullptr);
 
+    static QVariant waitPropertyChanged(QSignalSpy * signalSpy, QString property);
+
+    QVariant waitLastRunningPlayerChanged();
+
     QtDBusTest::DBusTestRunner dbusTestRunner;
 
     QtDBusMock::DBusMock dbusMock;
diff --git a/tests/integration/test-indicator.cpp b/tests/integration/test-indicator.cpp
index 33a27af..bc426aa 100644
--- a/tests/integration/test-indicator.cpp
+++ b/tests/integration/test-indicator.cpp
@@ -394,9 +394,7 @@ TEST_F(TestIndicator, DesktopAddMprisPlayer)
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
-                        .string_attribute("x-canonical-previous-action","indicator.previous.testplayer1.desktop")
                         .string_attribute("x-canonical-play-action","indicator.play.testplayer1.desktop")
-                        .string_attribute("x-canonical-next-action","indicator.next.testplayer1.desktop")
                         .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
                     )
                 )
@@ -925,9 +923,7 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                         .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
                     )
                     .item(mh::MenuItemMatcher()
-                        .string_attribute("x-canonical-previous-action","indicator.previous.testplayer3.desktop")
                         .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
-                        .string_attribute("x-canonical-next-action","indicator.next.testplayer3.desktop")
                         .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
                     )
                 )
@@ -935,6 +931,67 @@ TEST_F(TestIndicator, DesktopMprisPlayersPlaybackControls)
                             .label("Sound Settings…")
              )
         ).match());
+
+    // check that the last running player is the one we expect
+    QVariant lastPlayerRunning = waitLastRunningPlayerChanged();
+    EXPECT_TRUE(lastPlayerRunning.type() == QVariant::String);
+    EXPECT_EQ(lastPlayerRunning.toString(), "testplayer3.desktop");
+
+    // restart the indicator to simulate a new user session
+    ASSERT_NO_THROW(startIndicator());
+
+    // check that player 3 is the only one with playback controls
+    // as it was the last one being stopped
+    EXPECT_MATCHRESULT(mh::MenuMatcher(desktopParameters())
+        .item(mh::MenuItemMatcher()
+            .action("indicator.root")
+            .string_attribute("x-canonical-type", "com.canonical.indicator.root")
+            .string_attribute("x-canonical-secondary-action", "indicator.mute")
+            .mode(mh::MenuItemMatcher::Mode::all)
+            .submenu()
+            .item(mh::MenuItemMatcher()
+                .section()
+                .item(mh::MenuItemMatcher().checkbox()
+                    .label("Mute")
+                )
+                .item(volumeSlider(INITIAL_VOLUME, "Volume"))
+            )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer3.desktop")
+                        .label("TestPlayer3")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+                    .item(mh::MenuItemMatcher()
+                        .string_attribute("x-canonical-play-action","indicator.play.testplayer3.desktop")
+                        .string_attribute("x-canonical-type","com.canonical.unity.playback-item")
+                    )
+                )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer1.desktop")
+                        .label("TestPlayer1")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+            )
+            .item(mh::MenuItemMatcher()
+                    .section()
+                    .item(mh::MenuItemMatcher()
+                        .action("indicator.testplayer2.desktop")
+                        .label("TestPlayer2")
+                        .themed_icon("icon", {"testplayer"})
+                        .string_attribute("x-canonical-type", "com.canonical.unity.media-player")
+                    )
+                )
+            .item(mh::MenuItemMatcher()
+                            .label("Sound Settings…")
+             )
+        ).match());
+
 }
 
 TEST_F(TestIndicator, DesktopMprisPlayerButtonsState)
diff --git a/tests/notifications-test.cc b/tests/notifications-test.cc
index 6f523f1..fb55f6a 100644
--- a/tests/notifications-test.cc
+++ b/tests/notifications-test.cc
@@ -36,592 +36,602 @@ extern "C" {
 
 class NotificationsTest : public ::testing::Test
 {
-	protected:
-		DbusTestService * service = NULL;
-
-		GDBusConnection * session = NULL;
-		std::shared_ptr<NotificationsMock> notifications;
-
-		virtual void SetUp() {
-			g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
-			g_setenv("GSETTINGS_BACKEND", "memory", TRUE);
-
-			service = dbus_test_service_new(NULL);
-			dbus_test_service_set_bus(service, DBUS_TEST_SERVICE_BUS_SESSION);
-
-			/* Useful for debugging test failures, not needed all the time (until it fails) */
-			#if 0
-			auto bustle = std::shared_ptr<DbusTestTask>([]() {
-				DbusTestTask * bustle = DBUS_TEST_TASK(dbus_test_bustle_new("notifications-test.bustle"));
-				dbus_test_task_set_name(bustle, "Bustle");
-				dbus_test_task_set_bus(bustle, DBUS_TEST_SERVICE_BUS_SESSION);
-				return bustle;
-			}(), [](DbusTestTask * bustle) {
-				g_clear_object(&bustle);
-			});
-			dbus_test_service_add_task(service, bustle.get());
-			#endif
-
-			notifications = std::make_shared<NotificationsMock>();
-
-			dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
-			dbus_test_service_start_tasks(service);
-
-			session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-			ASSERT_NE(nullptr, session);
-			g_dbus_connection_set_exit_on_close(session, FALSE);
-			g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session);
-
-			/* This is done in main.c */
-			notify_init("indicator-sound");
-		}
-
-		virtual void TearDown() {
-			if (notify_is_initted())
-				notify_uninit();
-
-			notifications.reset();
-			g_clear_object(&service);
-
-			g_object_unref(session);
-
-			unsigned int cleartry = 0;
-			while (session != NULL && cleartry < 100) {
-				loop(100);
-				cleartry++;
-			}
-
-			ASSERT_EQ(nullptr, session);
-		}
-
-		static gboolean timeout_cb (gpointer user_data) {
-			GMainLoop * loop = static_cast<GMainLoop *>(user_data);
-			g_main_loop_quit(loop);
-			return G_SOURCE_REMOVE;
-		}
-
-		void loop (unsigned int ms) {
-			GMainLoop * loop = g_main_loop_new(NULL, FALSE);
-			g_timeout_add(ms, timeout_cb, loop);
-			g_main_loop_run(loop);
-			g_main_loop_unref(loop);
-		}
-
-		void loop_until(const std::function<bool()>& test, unsigned int max_ms=50, unsigned int test_interval_ms=10) {
-
-			// g_timeout's callback only allows a single pointer,
-			// so use a temporary stack struct to wedge everything into one pointer
-			struct CallbackData {
-				const std::function<bool()>& test;
-				const gint64 deadline;
-				GMainLoop* loop = g_main_loop_new(nullptr, false);
-				CallbackData (const std::function<bool()>& f, unsigned int max_ms):
-					test{f},
-					deadline{g_get_monotonic_time() + (max_ms*1000)} {}
-				~CallbackData() {g_main_loop_unref(loop);}
-			} data(test, max_ms);
-
-			// tell the timer to stop looping on success or deadline
-			auto timerfunc = [](gpointer gdata) -> gboolean {
-				auto& data = *static_cast<CallbackData*>(gdata);
-				if (!data.test() && (g_get_monotonic_time() < data.deadline))
-					return G_SOURCE_CONTINUE;
-				g_main_loop_quit(data.loop);
-				return G_SOURCE_REMOVE;
-			};
-
-			// start looping
-			g_timeout_add (std::min(max_ms, test_interval_ms), timerfunc, &data);
-			g_main_loop_run(data.loop);
-		}
-
-		void loop_until_notifications(unsigned int max_seconds=1) {
-			auto test = [this]{ return !notifications->getNotifications().empty(); };
-			loop_until(test, max_seconds);
-		}
-
-		static int unref_idle (gpointer user_data) {
-			g_variant_unref(static_cast<GVariant *>(user_data));
-			return G_SOURCE_REMOVE;
-		}
-
-		std::shared_ptr<MediaPlayerList> playerListMock () {
-			auto playerList = std::shared_ptr<MediaPlayerList>(
-				MEDIA_PLAYER_LIST(media_player_list_mock_new()),
-				[](MediaPlayerList * list) {
-					g_clear_object(&list);
-				});
-			return playerList;
-		}
-
-		std::shared_ptr<IndicatorSoundOptions> optionsMock () {
-			auto options = std::shared_ptr<IndicatorSoundOptions>(
-				INDICATOR_SOUND_OPTIONS(options_mock_new()),
-				[](IndicatorSoundOptions * options){
-					g_clear_object(&options);
-				});
-			return options;
-		}
-
-		std::shared_ptr<VolumeControl> volumeControlMock (const std::shared_ptr<IndicatorSoundOptions>& optionsMock) {
-			auto volumeControl = std::shared_ptr<VolumeControl>(
-				VOLUME_CONTROL(volume_control_mock_new(optionsMock.get())),
-				[](VolumeControl * control){
-					g_clear_object(&control);
-				});
-			return volumeControl;
-		}
-
-		std::shared_ptr<VolumeWarning> volumeWarningMock (const std::shared_ptr<IndicatorSoundOptions>& optionsMock) {
-			auto volumeWarning = std::shared_ptr<VolumeWarning>(
-				VOLUME_WARNING(volume_warning_mock_new(optionsMock.get())),
-				[](VolumeWarning * warning){
-					g_clear_object(&warning);
-				});
-			return volumeWarning;
-		}
-
-		std::shared_ptr<IndicatorSoundService> standardService (
-				const std::shared_ptr<VolumeControl>& volumeControl,
-				const std::shared_ptr<MediaPlayerList>& playerList,
-				const std::shared_ptr<IndicatorSoundOptions>& options,
-				const std::shared_ptr<VolumeWarning>& warning) {
-			auto soundService = std::shared_ptr<IndicatorSoundService>(
-				indicator_sound_service_new(playerList.get(), volumeControl.get(), nullptr, options.get(), warning.get()),
-				[](IndicatorSoundService * service){
-					g_clear_object(&service);
-				});
-
-			return soundService;
-		}
-
-		void setMockVolume (std::shared_ptr<VolumeControl> volumeControl, double volume, VolumeControlVolumeReasons reason = VOLUME_CONTROL_VOLUME_REASONS_USER_KEYPRESS) {
-			VolumeControlVolume * vol = volume_control_volume_new();
-			vol->volume = volume;
-			vol->reason = reason;
-
-			volume_control_set_volume(volumeControl.get(), vol);
-			g_object_unref(vol);
-		}
-
-		void setIndicatorShown (bool shown) {
-			auto bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
-
-			g_dbus_connection_call(bus,
-				g_dbus_connection_get_unique_name(bus),
-				"/com/canonical/indicator/sound",
-				"org.gtk.Actions",
-				"SetState",
-				g_variant_new("(sva{sv})", "indicator-shown", g_variant_new_boolean(shown), nullptr),
-				nullptr,
-				G_DBUS_CALL_FLAGS_NONE,
-				-1,
-				nullptr,
-				nullptr,
-				nullptr);
-
-			g_clear_object(&bus);
-		}
+    protected:
+        DbusTestService * service = NULL;
+
+        GDBusConnection * session = NULL;
+        std::shared_ptr<NotificationsMock> notifications;
+
+        virtual void SetUp() {
+            g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
+            g_setenv("GSETTINGS_BACKEND", "memory", TRUE);
+
+            service = dbus_test_service_new(NULL);
+            dbus_test_service_set_bus(service, DBUS_TEST_SERVICE_BUS_SESSION);
+
+            /* Useful for debugging test failures, not needed all the time (until it fails) */
+            #if 0
+            auto bustle = std::shared_ptr<DbusTestTask>([]() {
+                DbusTestTask * bustle = DBUS_TEST_TASK(dbus_test_bustle_new("notifications-test.bustle"));
+                dbus_test_task_set_name(bustle, "Bustle");
+                dbus_test_task_set_bus(bustle, DBUS_TEST_SERVICE_BUS_SESSION);
+                return bustle;
+            }(), [](DbusTestTask * bustle) {
+                g_clear_object(&bustle);
+            });
+            dbus_test_service_add_task(service, bustle.get());
+            #endif
+
+            notifications = std::make_shared<NotificationsMock>();
+
+            dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
+            dbus_test_service_start_tasks(service);
+
+            session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+            ASSERT_NE(nullptr, session);
+            g_dbus_connection_set_exit_on_close(session, FALSE);
+            g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session);
+
+            /* This is done in main.c */
+            notify_init("indicator-sound");
+        }
+
+        virtual void TearDown() {
+            if (notify_is_initted())
+                notify_uninit();
+
+            notifications.reset();
+            g_clear_object(&service);
+
+            g_object_unref(session);
+
+            unsigned int cleartry = 0;
+            while (session != NULL && cleartry < 100) {
+                loop(100);
+                cleartry++;
+            }
+
+            ASSERT_EQ(nullptr, session);
+        }
+
+        static gboolean timeout_cb (gpointer user_data) {
+            GMainLoop * loop = static_cast<GMainLoop *>(user_data);
+            g_main_loop_quit(loop);
+            return G_SOURCE_REMOVE;
+        }
+
+        void loop (unsigned int ms) {
+            GMainLoop * loop = g_main_loop_new(NULL, FALSE);
+            g_timeout_add(ms, timeout_cb, loop);
+            g_main_loop_run(loop);
+            g_main_loop_unref(loop);
+        }
+
+        void loop_until(const std::function<bool()>& test, unsigned int max_ms=50, unsigned int test_interval_ms=10) {
+
+            // g_timeout's callback only allows a single pointer,
+            // so use a temporary stack struct to wedge everything into one pointer
+            struct CallbackData {
+                const std::function<bool()>& test;
+                const gint64 deadline;
+                GMainLoop* loop = g_main_loop_new(nullptr, false);
+                CallbackData (const std::function<bool()>& f, unsigned int max_ms):
+                    test{f},
+                    deadline{g_get_monotonic_time() + (max_ms*1000)} {}
+                ~CallbackData() {g_main_loop_unref(loop);}
+            } data(test, max_ms);
+
+            // tell the timer to stop looping on success or deadline
+            auto timerfunc = [](gpointer gdata) -> gboolean {
+                auto& data = *static_cast<CallbackData*>(gdata);
+                if (!data.test() && (g_get_monotonic_time() < data.deadline))
+                    return G_SOURCE_CONTINUE;
+                g_main_loop_quit(data.loop);
+                return G_SOURCE_REMOVE;
+            };
+
+            // start looping
+            g_timeout_add (std::min(max_ms, test_interval_ms), timerfunc, &data);
+            g_main_loop_run(data.loop);
+        }
+
+        void loop_until_notifications(unsigned int max_seconds=1) {
+            auto test = [this]{ return !notifications->getNotifications().empty(); };
+            loop_until(test, max_seconds);
+        }
+
+        static int unref_idle (gpointer user_data) {
+            g_variant_unref(static_cast<GVariant *>(user_data));
+            return G_SOURCE_REMOVE;
+        }
+
+        std::shared_ptr<MediaPlayerList> playerListMock () {
+            auto playerList = std::shared_ptr<MediaPlayerList>(
+                MEDIA_PLAYER_LIST(media_player_list_mock_new()),
+                [](MediaPlayerList * list) {
+                    g_clear_object(&list);
+                });
+            return playerList;
+        }
+
+        std::shared_ptr<IndicatorSoundOptions> optionsMock () {
+            auto options = std::shared_ptr<IndicatorSoundOptions>(
+                INDICATOR_SOUND_OPTIONS(options_mock_new()),
+                [](IndicatorSoundOptions * options){
+                    g_clear_object(&options);
+                });
+            return options;
+        }
+
+        std::shared_ptr<VolumeControl> volumeControlMock (const std::shared_ptr<IndicatorSoundOptions>& optionsMock) {
+            auto volumeControl = std::shared_ptr<VolumeControl>(
+                VOLUME_CONTROL(volume_control_mock_new(optionsMock.get())),
+                [](VolumeControl * control){
+                    g_clear_object(&control);
+                });
+            return volumeControl;
+        }
+
+        std::shared_ptr<VolumeWarning> volumeWarningMock (const std::shared_ptr<IndicatorSoundOptions>& optionsMock) {
+            auto volumeWarning = std::shared_ptr<VolumeWarning>(
+                VOLUME_WARNING(volume_warning_mock_new(optionsMock.get())),
+                [](VolumeWarning * warning){
+                    g_clear_object(&warning);
+                });
+            return volumeWarning;
+        }
+
+        std::shared_ptr<IndicatorSoundService> standardService (
+                const std::shared_ptr<VolumeControl>& volumeControl,
+                const std::shared_ptr<MediaPlayerList>& playerList,
+                const std::shared_ptr<IndicatorSoundOptions>& options,
+                const std::shared_ptr<VolumeWarning>& warning,
+                const std::shared_ptr<AccountsServiceAccess>& accounts_service_access) {
+            auto soundService = std::shared_ptr<IndicatorSoundService>(
+                indicator_sound_service_new(playerList.get(), volumeControl.get(), nullptr, options.get(), warning.get(), accounts_service_access.get()),
+                [](IndicatorSoundService * service){
+                    g_clear_object(&service);
+                });
+
+            return soundService;
+        }
+
+        void setMockVolume (std::shared_ptr<VolumeControl> volumeControl, double volume, VolumeControlVolumeReasons reason = VOLUME_CONTROL_VOLUME_REASONS_USER_KEYPRESS) {
+            VolumeControlVolume * vol = volume_control_volume_new();
+            vol->volume = volume;
+            vol->reason = reason;
+
+            volume_control_set_volume(volumeControl.get(), vol);
+            g_object_unref(vol);
+        }
+
+        void setIndicatorShown (bool shown) {
+            auto bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
+
+            g_dbus_connection_call(bus,
+                g_dbus_connection_get_unique_name(bus),
+                "/com/canonical/indicator/sound",
+                "org.gtk.Actions",
+                "SetState",
+                g_variant_new("(sva{sv})", "indicator-shown", g_variant_new_boolean(shown), nullptr),
+                nullptr,
+                G_DBUS_CALL_FLAGS_NONE,
+                -1,
+                nullptr,
+                nullptr,
+                nullptr);
+
+            g_clear_object(&bus);
+        }
 
 };
 
 TEST_F(NotificationsTest, BasicObject) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
 
-	/* Give some time settle */
-	loop(50);
+    /* Give some time settle */
+    loop(50);
 
-	/* Auto free */
+    /* Auto free */
 }
 
 TEST_F(NotificationsTest, VolumeChanges) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-	/* Set a volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.50);
-	loop(50);
-	auto notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_EQ("indicator-sound", notev[0].app_name);
-	EXPECT_EQ("Volume", notev[0].summary);
-	EXPECT_EQ(0, notev[0].actions.size());
-	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
-	EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]);
-
-	/* Set a different volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.60);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_GVARIANT_EQ("@i 60", notev[0].hints["value"]);
-
-	/* Have pulse set a volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.70, VOLUME_CONTROL_VOLUME_REASONS_PULSE_CHANGE);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(0, notev.size());
-
-	/* Have AS set the volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.80, VOLUME_CONTROL_VOLUME_REASONS_ACCOUNTS_SERVICE_SET);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(0, notev.size());
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+    /* Set a volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.50);
+    loop(50);
+    auto notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_EQ("indicator-sound", notev[0].app_name);
+    EXPECT_EQ("Volume", notev[0].summary);
+    EXPECT_EQ(0, notev[0].actions.size());
+    EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
+    EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]);
+
+    /* Set a different volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.60);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_GVARIANT_EQ("@i 60", notev[0].hints["value"]);
+
+    /* Have pulse set a volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.70, VOLUME_CONTROL_VOLUME_REASONS_PULSE_CHANGE);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(0, notev.size());
+
+    /* Have AS set the volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.80, VOLUME_CONTROL_VOLUME_REASONS_ACCOUNTS_SERVICE_SET);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(0, notev.size());
 }
 
 TEST_F(NotificationsTest, StreamChanges) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-	/* Set a volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.5);
-	loop(50);
-	auto notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-
-	/* Change Streams, no volume change */
-	notifications->clearNotifications();
-	volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALARM);
-	setMockVolume(volumeControl, 0.5, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
-	loop(50);
-	notev = notifications->getNotifications();
-	EXPECT_EQ(0, notev.size());
-
-	/* Change Streams, volume change */
-	notifications->clearNotifications();
-	volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALERT);
-	setMockVolume(volumeControl, 0.6, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
-	loop(50);
-	notev = notifications->getNotifications();
-	EXPECT_EQ(0, notev.size());
-
-	/* Change Streams, no volume change, volume up */
-	notifications->clearNotifications();
-	volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_MULTIMEDIA);
-	setMockVolume(volumeControl, 0.6, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
-	loop(50);
-	setMockVolume(volumeControl, 0.65);
-	notev = notifications->getNotifications();
-	EXPECT_EQ(1, notev.size());
-	EXPECT_GVARIANT_EQ("@i 65", notev[0].hints["value"]);
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+    /* Set a volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.5);
+    loop(50);
+    auto notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+
+    /* Change Streams, no volume change */
+    notifications->clearNotifications();
+    volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALARM);
+    setMockVolume(volumeControl, 0.5, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
+    loop(50);
+    notev = notifications->getNotifications();
+    EXPECT_EQ(0, notev.size());
+
+    /* Change Streams, volume change */
+    notifications->clearNotifications();
+    volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALERT);
+    setMockVolume(volumeControl, 0.6, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
+    loop(50);
+    notev = notifications->getNotifications();
+    EXPECT_EQ(0, notev.size());
+
+    /* Change Streams, no volume change, volume up */
+    notifications->clearNotifications();
+    volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_MULTIMEDIA);
+    setMockVolume(volumeControl, 0.6, VOLUME_CONTROL_VOLUME_REASONS_VOLUME_STREAM_CHANGE);
+    loop(50);
+    setMockVolume(volumeControl, 0.65);
+    notev = notifications->getNotifications();
+    EXPECT_EQ(1, notev.size());
+    EXPECT_GVARIANT_EQ("@i 65", notev[0].hints["value"]);
 }
 
 TEST_F(NotificationsTest, IconTesting) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-	/* Set an initial volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.5);
-	loop(50);
-	auto notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-
-	/* Generate a set of notifications */
-	notifications->clearNotifications();
-	for (float i = 0.0; i < 1.01; i += 0.1) {
-		setMockVolume(volumeControl, i);
-	}
-
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(11, notev.size());
-
-	EXPECT_EQ("audio-volume-muted",  notev[0].app_icon);
-	EXPECT_EQ("audio-volume-low",    notev[1].app_icon);
-	EXPECT_EQ("audio-volume-low",    notev[2].app_icon);
-	EXPECT_EQ("audio-volume-medium", notev[3].app_icon);
-	EXPECT_EQ("audio-volume-medium", notev[4].app_icon);
-	EXPECT_EQ("audio-volume-medium", notev[5].app_icon);
-	EXPECT_EQ("audio-volume-medium", notev[6].app_icon);
-	EXPECT_EQ("audio-volume-high",   notev[7].app_icon);
-	EXPECT_EQ("audio-volume-high",   notev[8].app_icon);
-	EXPECT_EQ("audio-volume-high",   notev[9].app_icon);
-	EXPECT_EQ("audio-volume-high",   notev[10].app_icon);
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+    /* Set an initial volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.5);
+    loop(50);
+    auto notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+
+    /* Generate a set of notifications */
+    notifications->clearNotifications();
+    for (float i = 0.0; i < 1.01; i += 0.1) {
+        setMockVolume(volumeControl, i);
+    }
+
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(11, notev.size());
+
+    EXPECT_EQ("audio-volume-muted",  notev[0].app_icon);
+    EXPECT_EQ("audio-volume-low",    notev[1].app_icon);
+    EXPECT_EQ("audio-volume-low",    notev[2].app_icon);
+    EXPECT_EQ("audio-volume-medium", notev[3].app_icon);
+    EXPECT_EQ("audio-volume-medium", notev[4].app_icon);
+    EXPECT_EQ("audio-volume-medium", notev[5].app_icon);
+    EXPECT_EQ("audio-volume-medium", notev[6].app_icon);
+    EXPECT_EQ("audio-volume-high",   notev[7].app_icon);
+    EXPECT_EQ("audio-volume-high",   notev[8].app_icon);
+    EXPECT_EQ("audio-volume-high",   notev[9].app_icon);
+    EXPECT_EQ("audio-volume-high",   notev[10].app_icon);
 }
 
 TEST_F(NotificationsTest, ServerRestart) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-	/* Set a volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.50);
-	loop(50);
-	auto notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-
-	/* Restart server without sync notifications */
-	notifications->clearNotifications();
-	dbus_test_service_remove_task(service, (DbusTestTask*)*notifications);
-	notifications.reset();
-
-	loop(50);
-
-	notifications = std::make_shared<NotificationsMock>(std::vector<std::string>({"body", "body-markup", "icon-static"}));
-	dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
-	dbus_test_task_run((DbusTestTask*)*notifications);
-
-	/* Change the volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.60);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(0, notev.size());
-
-	/* Put a good server back */
-	dbus_test_service_remove_task(service, (DbusTestTask*)*notifications);
-	notifications.reset();
-
-	loop(50);
-
-	notifications = std::make_shared<NotificationsMock>();
-	dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
-	dbus_test_task_run((DbusTestTask*)*notifications);
-
-	/* Change the volume again */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.70);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+    /* Set a volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.50);
+    loop(50);
+    auto notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+
+    /* Restart server without sync notifications */
+    notifications->clearNotifications();
+    dbus_test_service_remove_task(service, (DbusTestTask*)*notifications);
+    notifications.reset();
+
+    loop(50);
+
+    notifications = std::make_shared<NotificationsMock>(std::vector<std::string>({"body", "body-markup", "icon-static"}));
+    dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
+    dbus_test_task_run((DbusTestTask*)*notifications);
+
+    /* Change the volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.60);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(0, notev.size());
+
+    /* Put a good server back */
+    dbus_test_service_remove_task(service, (DbusTestTask*)*notifications);
+    notifications.reset();
+
+    loop(50);
+
+    notifications = std::make_shared<NotificationsMock>();
+    dbus_test_service_add_task(service, (DbusTestTask*)*notifications);
+    dbus_test_task_run((DbusTestTask*)*notifications);
+
+    /* Change the volume again */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.70);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
 }
 
 TEST_F(NotificationsTest, HighVolume) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-	/* Set a volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.50);
-	loop(50);
-	auto notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_EQ("Volume", notev[0].summary);
-	EXPECT_EQ("Speakers", notev[0].body);
-	EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-canonical-value-bar-tint"]);
-
-	/* Set high volume with volume change */
-	notifications->clearNotifications();
-	volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), true);
-	setMockVolume(volumeControl, 0.90);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */
-	EXPECT_EQ("Volume", notev[0].summary);
-	EXPECT_EQ("Speakers", notev[0].body);
-	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
-
-	/* Move it back */
-	volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), false);
-	setMockVolume(volumeControl, 0.50);
-	loop(50);
-
-	/* Set high volume without level change */
-	/* NOTE: This can happen if headphones are plugged in */
-	notifications->clearNotifications();
-	volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), true);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_EQ("Volume", notev[0].summary);
-	EXPECT_EQ("Speakers", notev[0].body);
-	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+    /* Set a volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.50);
+    loop(50);
+    auto notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_EQ("Volume", notev[0].summary);
+    EXPECT_EQ("Speakers", notev[0].body);
+    EXPECT_GVARIANT_EQ("@s 'false'", notev[0].hints["x-canonical-value-bar-tint"]);
+
+    /* Set high volume with volume change */
+    notifications->clearNotifications();
+    volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), true);
+    setMockVolume(volumeControl, 0.90);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_LT(0, notev.size()); /* This passes with one or two since it would just be an update to the first if a second was sent */
+    EXPECT_EQ("Volume", notev[0].summary);
+    EXPECT_EQ("Speakers", notev[0].body);
+    EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
+
+    /* Move it back */
+    volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), false);
+    setMockVolume(volumeControl, 0.50);
+    loop(50);
+
+    /* Set high volume without level change */
+    /* NOTE: This can happen if headphones are plugged in */
+    notifications->clearNotifications();
+    volume_warning_mock_set_high_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), true);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_EQ("Volume", notev[0].summary);
+    EXPECT_EQ("Speakers", notev[0].body);
+    EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-value-bar-tint"]);
 }
 
 TEST_F(NotificationsTest, MenuHide) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-	/* Set a volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.50);
-	loop(50);
-	auto notev = notifications->getNotifications();
-	EXPECT_EQ(1, notev.size());
-
-	/* Set the indicator to shown, and set a new volume */
-	notifications->clearNotifications();
-	setIndicatorShown(true);
-	loop(50);
-	setMockVolume(volumeControl, 0.60);
-	loop(50);
-	notev = notifications->getNotifications();
-	EXPECT_EQ(0, notev.size());
-
-	/* Set the indicator to hidden, and set a new volume */
-	notifications->clearNotifications();
-	setIndicatorShown(false);
-	loop(50);
-	setMockVolume(volumeControl, 0.70);
-	loop(50);
-	notev = notifications->getNotifications();
-	EXPECT_EQ(1, notev.size());
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+    /* Set a volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.50);
+    loop(50);
+    auto notev = notifications->getNotifications();
+    EXPECT_EQ(1, notev.size());
+
+    /* Set the indicator to shown, and set a new volume */
+    notifications->clearNotifications();
+    setIndicatorShown(true);
+    loop(50);
+    setMockVolume(volumeControl, 0.60);
+    loop(50);
+    notev = notifications->getNotifications();
+    EXPECT_EQ(0, notev.size());
+
+    /* Set the indicator to hidden, and set a new volume */
+    notifications->clearNotifications();
+    setIndicatorShown(false);
+    loop(50);
+    setMockVolume(volumeControl, 0.70);
+    loop(50);
+    notev = notifications->getNotifications();
+    EXPECT_EQ(1, notev.size());
 }
 
 TEST_F(NotificationsTest, ExtendendVolumeNotification) {
-	auto options = optionsMock();
-	auto volumeControl = volumeControlMock(options);
-	auto volumeWarning = volumeWarningMock(options);
-	auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-	/* Set a volume */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 0.50);
-	loop(50);
-	auto notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_EQ("indicator-sound", notev[0].app_name);
-	EXPECT_EQ("Volume", notev[0].summary);
-	EXPECT_EQ(0, notev[0].actions.size());
-	EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
-	EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]);
-
-	/* Allow an amplified volume */
-	notifications->clearNotifications();
-	volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALARM);
-	options_mock_mock_set_max_volume(OPTIONS_MOCK(options.get()), 1.5);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_GVARIANT_EQ("@i 33", notev[0].hints["value"]);
-
-	/* Set to 'over max' */
-	notifications->clearNotifications();
-	setMockVolume(volumeControl, 1.525);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_GVARIANT_EQ("@i 100", notev[0].hints["value"]);
-
-	/* Put back */
-	notifications->clearNotifications();
-	options_mock_mock_set_max_volume(OPTIONS_MOCK(options.get()), 1.0);
-	loop(50);
-	notev = notifications->getNotifications();
-	ASSERT_EQ(1, notev.size());
-	EXPECT_GVARIANT_EQ("@i 100", notev[0].hints["value"]);
+    auto options = optionsMock();
+    auto volumeControl = volumeControlMock(options);
+    auto volumeWarning = volumeWarningMock(options);
+    auto accountsService = std::make_shared<AccountsServiceAccess>();
+    auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+    /* Set a volume */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 0.50);
+    loop(50);
+    auto notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_EQ("indicator-sound", notev[0].app_name);
+    EXPECT_EQ("Volume", notev[0].summary);
+    EXPECT_EQ(0, notev[0].actions.size());
+    EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
+    EXPECT_GVARIANT_EQ("@i 50", notev[0].hints["value"]);
+
+    /* Allow an amplified volume */
+    notifications->clearNotifications();
+    volume_control_mock_mock_set_active_stream(VOLUME_CONTROL_MOCK(volumeControl.get()), VOLUME_CONTROL_STREAM_ALARM);
+    options_mock_mock_set_max_volume(OPTIONS_MOCK(options.get()), 1.5);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_GVARIANT_EQ("@i 33", notev[0].hints["value"]);
+
+    /* Set to 'over max' */
+    notifications->clearNotifications();
+    setMockVolume(volumeControl, 1.525);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_GVARIANT_EQ("@i 100", notev[0].hints["value"]);
+
+    /* Put back */
+    notifications->clearNotifications();
+    options_mock_mock_set_max_volume(OPTIONS_MOCK(options.get()), 1.0);
+    loop(50);
+    notev = notifications->getNotifications();
+    ASSERT_EQ(1, notev.size());
+    EXPECT_GVARIANT_EQ("@i 100", notev[0].hints["value"]);
 }
 
 TEST_F(NotificationsTest, TriggerWarning) {
 
-	// Tests all the conditions needed to trigger a volume warning.
-	// There are many possible combinations, so this test is slow. :P
-
-	const struct {
-		bool expected;
-		VolumeControlActiveOutput output;
-	} test_outputs[] = {
-		{ false, VOLUME_CONTROL_ACTIVE_OUTPUT_SPEAKERS },
-		{ true,  VOLUME_CONTROL_ACTIVE_OUTPUT_HEADPHONES },
-		{ true,  VOLUME_CONTROL_ACTIVE_OUTPUT_BLUETOOTH_HEADPHONES },
-		{ false, VOLUME_CONTROL_ACTIVE_OUTPUT_BLUETOOTH_SPEAKER },
-		{ false, VOLUME_CONTROL_ACTIVE_OUTPUT_USB_SPEAKER },
-		{ true,  VOLUME_CONTROL_ACTIVE_OUTPUT_USB_HEADPHONES },
-		{ false, VOLUME_CONTROL_ACTIVE_OUTPUT_HDMI_SPEAKER },
-		{ true,  VOLUME_CONTROL_ACTIVE_OUTPUT_HDMI_HEADPHONES },
-		{ false, VOLUME_CONTROL_ACTIVE_OUTPUT_CALL_MODE }
-	};
-
-	const struct {
-		bool expected;
-		pa_volume_t volume;
-		pa_volume_t loud_volume;
-	} test_volumes[] = {
-		{ false,   50, 100 },
-		{ false,   99, 100 },
-		{ true,   100, 100 },
-		{ true,   101, 100 }
-	};
-
-	const struct {
-		bool expected;
-		bool approved;
-	} test_approved[] = {
-		{ true,  false },
-		{ false, true }
-	};
-
-	const struct {
-		bool expected;
-		bool warnings_enabled;
-	} test_warnings_enabled[] = {
-		{ true,  true },
-		{ false, false }
-	};
-
-	const struct {
-		bool expected;
-		bool multimedia_active;
-	} test_multimedia_active[] = {
-		{ true,  true },
-		{ false, false }
-	};
-
-	for (const auto& outputs : test_outputs) {
-	for (const auto& volumes : test_volumes) {
-	for (const auto& approved : test_approved) {
-	for (const auto& warnings_enabled : test_warnings_enabled) {
-	for (const auto& multimedia_active : test_multimedia_active) {
-
-		notifications->clearNotifications();
-
-		// instantiate the test subjects
-		auto options = optionsMock();
-		auto volumeControl = volumeControlMock(options);
-		auto volumeWarning = volumeWarningMock(options);
-		auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning);
-
-		// run the test
-		options_mock_mock_set_loud_volume(OPTIONS_MOCK(options.get()), volumes.loud_volume);
-		options_mock_mock_set_loud_warning_enabled(OPTIONS_MOCK(options.get()), warnings_enabled.warnings_enabled);
-		volume_warning_mock_set_approved(VOLUME_WARNING_MOCK(volumeWarning.get()), approved.approved);
-		volume_warning_mock_set_multimedia_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), volumes.volume);
-		volume_warning_mock_set_multimedia_active(VOLUME_WARNING_MOCK(volumeWarning.get()), multimedia_active.multimedia_active);
-		volume_control_mock_mock_set_active_output(VOLUME_CONTROL_MOCK(volumeControl.get()), outputs.output);
-
-		loop_until_notifications();
-
-		// check the result
-		auto notev = notifications->getNotifications();
-		const bool warning_expected = outputs.expected && volumes.expected && approved.expected && warnings_enabled.expected && multimedia_active.expected;
-		if (warning_expected) {
-			EXPECT_TRUE(volume_warning_get_active(volumeWarning.get()));
-			ASSERT_EQ(1, notev.size());
-			EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-snap-decisions"]);
-			EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-private-synchronous"]);
-		}
-		else {
-			EXPECT_FALSE(volume_warning_get_active(volumeWarning.get()));
-			ASSERT_EQ(1, notev.size());
-			EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-snap-decisions"]);
-			EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
-		}
-
-	} // multimedia_active
-	} // warnings_enabled
-	} // approved
-	} // volumes
-	} // outputs
+    // Tests all the conditions needed to trigger a volume warning.
+    // There are many possible combinations, so this test is slow. :P
+
+    const struct {
+        bool expected;
+        VolumeControlActiveOutput output;
+    } test_outputs[] = {
+        { false, VOLUME_CONTROL_ACTIVE_OUTPUT_SPEAKERS },
+        { true,  VOLUME_CONTROL_ACTIVE_OUTPUT_HEADPHONES },
+        { true,  VOLUME_CONTROL_ACTIVE_OUTPUT_BLUETOOTH_HEADPHONES },
+        { false, VOLUME_CONTROL_ACTIVE_OUTPUT_BLUETOOTH_SPEAKER },
+        { false, VOLUME_CONTROL_ACTIVE_OUTPUT_USB_SPEAKER },
+        { true,  VOLUME_CONTROL_ACTIVE_OUTPUT_USB_HEADPHONES },
+        { false, VOLUME_CONTROL_ACTIVE_OUTPUT_HDMI_SPEAKER },
+        { true,  VOLUME_CONTROL_ACTIVE_OUTPUT_HDMI_HEADPHONES },
+        { false, VOLUME_CONTROL_ACTIVE_OUTPUT_CALL_MODE }
+    };
+
+    const struct {
+        bool expected;
+        pa_volume_t volume;
+        pa_volume_t loud_volume;
+    } test_volumes[] = {
+        { false,   50, 100 },
+        { false,   99, 100 },
+        { true,   100, 100 },
+        { true,   101, 100 }
+    };
+
+    const struct {
+        bool expected;
+        bool approved;
+    } test_approved[] = {
+        { true,  false },
+        { false, true }
+    };
+
+    const struct {
+        bool expected;
+        bool warnings_enabled;
+    } test_warnings_enabled[] = {
+        { true,  true },
+        { false, false }
+    };
+
+    const struct {
+        bool expected;
+        bool multimedia_active;
+    } test_multimedia_active[] = {
+        { true,  true },
+        { false, false }
+    };
+
+    for (const auto& outputs : test_outputs) {
+    for (const auto& volumes : test_volumes) {
+    for (const auto& approved : test_approved) {
+    for (const auto& warnings_enabled : test_warnings_enabled) {
+    for (const auto& multimedia_active : test_multimedia_active) {
+
+        notifications->clearNotifications();
+
+        // instantiate the test subjects
+        auto options = optionsMock();
+        auto volumeControl = volumeControlMock(options);
+        auto volumeWarning = volumeWarningMock(options);
+        auto accountsService = std::make_shared<AccountsServiceAccess>();
+        auto soundService = standardService(volumeControl, playerListMock(), options, volumeWarning, accountsService);
+
+        // run the test
+        options_mock_mock_set_loud_volume(OPTIONS_MOCK(options.get()), volumes.loud_volume);
+        options_mock_mock_set_loud_warning_enabled(OPTIONS_MOCK(options.get()), warnings_enabled.warnings_enabled);
+        volume_warning_mock_set_approved(VOLUME_WARNING_MOCK(volumeWarning.get()), approved.approved);
+        volume_warning_mock_set_multimedia_volume(VOLUME_WARNING_MOCK(volumeWarning.get()), volumes.volume);
+        volume_warning_mock_set_multimedia_active(VOLUME_WARNING_MOCK(volumeWarning.get()), multimedia_active.multimedia_active);
+        volume_control_mock_mock_set_active_output(VOLUME_CONTROL_MOCK(volumeControl.get()), outputs.output);
+
+        loop_until_notifications();
+
+        // check the result
+        auto notev = notifications->getNotifications();
+        const bool warning_expected = outputs.expected && volumes.expected && approved.expected && warnings_enabled.expected && multimedia_active.expected;
+        if (warning_expected) {
+            EXPECT_TRUE(volume_warning_get_active(volumeWarning.get()));
+            ASSERT_EQ(1, notev.size());
+            EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-snap-decisions"]);
+            EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-private-synchronous"]);
+        }
+        else {
+            EXPECT_FALSE(volume_warning_get_active(volumeWarning.get()));
+            ASSERT_EQ(1, notev.size());
+            EXPECT_GVARIANT_EQ(nullptr, notev[0].hints["x-canonical-snap-decisions"]);
+            EXPECT_GVARIANT_EQ("@s 'true'", notev[0].hints["x-canonical-private-synchronous"]);
+        }
+
+    } // multimedia_active
+    } // warnings_enabled
+    } // approved
+    } // volumes
+    } // outputs
 }
 
diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
index 37de377..b0e4862 100644
--- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
+++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.cpp
@@ -46,3 +46,18 @@ void AccountsServiceSoundMock::setVolume(double volume)
                                     "Volume",
                                     property("Volume"));
 }
+
+QString AccountsServiceSoundMock::lastRunningPlayer() const
+{
+    return lastRunningPlayer_;
+}
+
+void AccountsServiceSoundMock::setLastRunningPlayer(QString const & lastRunningPlayer)
+{
+    lastRunningPlayer_ = lastRunningPlayer;
+    notifier_.notifyPropertyChanged(QDBusConnection::systemBus(),
+                                    ACCOUNTS_SOUND_INTERFACE,
+                                    USER_PATH,
+                                    "LastRunningPlayer",
+                                    property("LastRunningPlayer"));
+}
diff --git a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
index bb3dbe8..fd5104e 100644
--- a/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
+++ b/tests/service-mocks/accounts-mock/AccountsServiceSoundMock.h
@@ -37,10 +37,13 @@ class AccountsServiceSoundMock : public QObject, protected QDBusContext
 {
     Q_OBJECT
     Q_PROPERTY(double Volume READ volume WRITE setVolume)
+    Q_PROPERTY(QString LastRunningPlayer READ lastRunningPlayer WRITE setLastRunningPlayer)
 
 public Q_SLOTS:
     double volume() const;
     void setVolume(double volume);
+    QString lastRunningPlayer() const;
+    void setLastRunningPlayer(QString const & lastRunningPlayer);
 
 public:
     AccountsServiceSoundMock(QObject* parent = 0);
@@ -48,6 +51,7 @@ public:
 
 private:
     double volume_;
+    QString lastRunningPlayer_;
     DBusPropertiesNotifier notifier_;
 };
 
diff --git a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml
index 859cd46..daf82e5 100644
--- a/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml
+++ b/tests/service-mocks/accounts-mock/com.ubuntu.AccountsService.Sound.Mock.xml
@@ -2,5 +2,6 @@
 <node>
   <interface name="com.ubuntu.AccountsService.Sound">
     <property name="Volume" type="d" access="readwrite"/>
+    <property name="LastRunningPlayer" type="s" access="readwrite"/>
   </interface>
 </node>
\ No newline at end of file
diff --git a/tests/sound-menu.cc b/tests/sound-menu.cc
index 2576d19..79ae703 100644
--- a/tests/sound-menu.cc
+++ b/tests/sound-menu.cc
@@ -62,7 +62,7 @@ class SoundMenuTest : public ::testing::Test
 
         void check_player_control_buttons(bool canPlay, bool canNext, bool canPrev)
         {
-            SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE, "");
+            SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE);
 
             MediaPlayerTrack * track = media_player_track_new("Artist", "Title", "Album", "http://art.url");
 
@@ -96,22 +96,22 @@ class SoundMenuTest : public ::testing::Test
 
             /* Player control */
             verify_item_attribute(section, 1, "x-canonical-type", g_variant_new_string("com.canonical.unity.playback-item"));
-	    //verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string(""));
-	    if (!canPlay) {
+        //verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string(""));
+        if (!canPlay) {
                 verify_item_attribute_is_not_set(section, 1, "x-canonical-play-action", G_VARIANT_TYPE_STRING);
-	    } else {
-	        verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("indicator.play.player-id"));
-	    }
-	    if (!canNext) {
+        } else {
+            verify_item_attribute(section, 1, "x-canonical-play-action", g_variant_new_string("indicator.play.player-id"));
+        }
+        if (!canNext) {
                 verify_item_attribute_is_not_set(section, 1, "x-canonical-next-action", G_VARIANT_TYPE_STRING);
-	    } else {
-	        verify_item_attribute(section, 1, "x-canonical-next-action", g_variant_new_string("indicator.next.player-id"));
-	    }
-	    if (!canPrev) {
+        } else {
+            verify_item_attribute(section, 1, "x-canonical-next-action", g_variant_new_string("indicator.next.player-id"));
+        }
+        if (!canPrev) {
                 verify_item_attribute_is_not_set(section, 1, "x-canonical-previous-action", G_VARIANT_TYPE_STRING);
-	    } else {
-	        verify_item_attribute(section, 1, "x-canonical-previous-action", g_variant_new_string("indicator.previous.player-id"));
-	    }
+        } else {
+            verify_item_attribute(section, 1, "x-canonical-previous-action", g_variant_new_string("indicator.previous.player-id"));
+        }
 
             g_clear_object(&section);
 
@@ -125,7 +125,7 @@ class SoundMenuTest : public ::testing::Test
 };
 
 TEST_F(SoundMenuTest, BasicObject) {
-    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE, "");
+    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE);
 
     ASSERT_NE(nullptr, menu);
 
@@ -134,7 +134,7 @@ TEST_F(SoundMenuTest, BasicObject) {
 }
 
 TEST_F(SoundMenuTest, AddRemovePlayer) {
-    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE, "");
+    SoundMenu * menu = sound_menu_new (nullptr, SOUND_MENU_DISPLAY_FLAGS_NONE);
 
     MediaPlayerTrack * track = media_player_track_new("Artist", "Title", "Album", "http://art.url");
 
diff --git a/tests/volume-control-test.cc b/tests/volume-control-test.cc
index 11fa4ff..62319a0 100644
--- a/tests/volume-control-test.cc
+++ b/tests/volume-control-test.cc
@@ -29,64 +29,65 @@ extern "C" {
 class VolumeControlTest : public ::testing::Test
 {
 
-	protected:
-		DbusTestService * service = NULL;
-		GDBusConnection * session = NULL;
-
-		virtual void SetUp() override {
-
-			g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
-			g_setenv("GSETTINGS_BACKEND", "memory", TRUE);
-
-			service = dbus_test_service_new(NULL);
-			dbus_test_service_start_tasks(service);
-
-			session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-			ASSERT_NE(nullptr, session);
-			g_dbus_connection_set_exit_on_close(session, FALSE);
-			g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session);
-		}
-
-		virtual void TearDown() {
-			g_clear_object(&service);
-
-			g_object_unref(session);
-
-			unsigned int cleartry = 0;
-			while (session != NULL && cleartry < 100) {
-				loop(100);
-				cleartry++;
-			}
-
-			ASSERT_EQ(nullptr, session);
-		}
-
-		static gboolean timeout_cb (gpointer user_data) {
-			GMainLoop * loop = static_cast<GMainLoop *>(user_data);
-			g_main_loop_quit(loop);
-			return G_SOURCE_REMOVE;
-		}
-
-		void loop (unsigned int ms) {
-			GMainLoop * loop = g_main_loop_new(NULL, FALSE);
-			g_timeout_add(ms, timeout_cb, loop);
-			g_main_loop_run(loop);
-			g_main_loop_unref(loop);
-		}
+    protected:
+        DbusTestService * service = NULL;
+        GDBusConnection * session = NULL;
+
+        virtual void SetUp() override {
+
+            g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
+            g_setenv("GSETTINGS_BACKEND", "memory", TRUE);
+
+            service = dbus_test_service_new(NULL);
+            dbus_test_service_start_tasks(service);
+
+            session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+            ASSERT_NE(nullptr, session);
+            g_dbus_connection_set_exit_on_close(session, FALSE);
+            g_object_add_weak_pointer(G_OBJECT(session), (gpointer *)&session);
+        }
+
+        virtual void TearDown() {
+            g_clear_object(&service);
+
+            g_object_unref(session);
+
+            unsigned int cleartry = 0;
+            while (session != NULL && cleartry < 100) {
+                loop(100);
+                cleartry++;
+            }
+
+            ASSERT_EQ(nullptr, session);
+        }
+
+        static gboolean timeout_cb (gpointer user_data) {
+            GMainLoop * loop = static_cast<GMainLoop *>(user_data);
+            g_main_loop_quit(loop);
+            return G_SOURCE_REMOVE;
+        }
+
+        void loop (unsigned int ms) {
+            GMainLoop * loop = g_main_loop_new(NULL, FALSE);
+            g_timeout_add(ms, timeout_cb, loop);
+            g_main_loop_run(loop);
+            g_main_loop_unref(loop);
+        }
 };
 
 TEST_F(VolumeControlTest, BasicObject) {
-	auto options = options_mock_new();
-	auto pgloop = pa_glib_mainloop_new(NULL);
-	auto control = volume_control_pulse_new(INDICATOR_SOUND_OPTIONS(options), pgloop);
+    auto options = options_mock_new();
+    auto pgloop = pa_glib_mainloop_new(NULL);
+    auto accounts_service_access = accounts_service_access_new();
+    auto control = volume_control_pulse_new(INDICATOR_SOUND_OPTIONS(options), pgloop, accounts_service_access);
 
-	/* Setup the PA backend */
-	loop(100);
+    /* Setup the PA backend */
+    loop(100);
 
-	/* Ready */
-	EXPECT_TRUE(volume_control_get_ready(VOLUME_CONTROL(control)));
+    /* Ready */
+    EXPECT_TRUE(volume_control_get_ready(VOLUME_CONTROL(control)));
 
-	g_clear_object(&control);
-	g_clear_object(&options);
-	g_clear_pointer(&pgloop, pa_glib_mainloop_free);
+    g_clear_object(&control);
+    g_clear_object(&options);
+    g_clear_pointer(&pgloop, pa_glib_mainloop_free);
 }