From e40da89a473b15b64d036cdce2e1ead59770778b Mon Sep 17 00:00:00 2001
From: Xavi Garcia Mena <xavi.garcia.mena@canonical.com>
Date: Tue, 23 Feb 2016 13:48:46 +0100
Subject: Created new class AccountsServiceAccess to hold all accounts service
 operations

---
 tests/volume-control-test.cc | 109 ++++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 54 deletions(-)

(limited to 'tests/volume-control-test.cc')

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);
 }
-- 
cgit v1.2.3