Tests branch finally makes its way into trunk - more testing needed

15 files changed, 470 insertions, 125 deletions

diff --git a/Makefile.am b/Makefile.am
index 357fa33..9f75289 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 
 SUBDIRS = \
 	src \
-    data \
-    tests \
+	data \
+	tests \
 	po
 
 EXTRA_DIST = autogen.sh
diff --git a/configure.ac b/configure.ac
index c58595b..a0812d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 ###########################
 # Dependencies 
-###########################
+###########################  
 
 GTK_REQUIRED_VERSION=2.12
 INDICATOR_REQUIRED_VERSION=0.3.6
@@ -34,7 +34,7 @@ INDICATOR_DISPLAY_OBJECTS=0.1.4
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-						  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
+			  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION
                           libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS)
                           
 AC_SUBST(APPLET_CFLAGS)
@@ -42,9 +42,12 @@ AC_SUBST(APPLET_LIBS)
 
 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
 
+PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION)
+AC_SUBST(PULSEAUDIO_CFLAGS)
+AC_SUBST(PULSEAUDIO_LIBS)
+
 PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                 indicator >= $INDICATOR_REQUIRED_VERSION
-                                libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
 )
 
 AC_SUBST(SOUNDSERVICE_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 062d993..f472662 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,8 +45,8 @@ indicator_sound_service_SOURCES = \
     sound-service-server.h \
     slider-menu-item.h \
     slider-menu-item.c
-indicator_sound_service_CFLAGS = $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
-indicator_sound_service_LDADD = $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
+indicator_sound_service_CFLAGS = $(PULSEAUDIO_CFLAGS) $(SOUNDSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
+indicator_sound_service_LDADD = $(PULSEAUDIO_LIBS) $(SOUNDSERVICE_LIBS) $(GCONF_LIBS)
 
 sound-service-server.h: $(srcdir)/sound-service.xml
 	dbus-binding-tool \
diff --git a/src/indicator-sound.c b/src/indicator-sound.c
index a1a531a..a67a0b0 100644
--- a/src/indicator-sound.c
+++ b/src/indicator-sound.c
@@ -144,9 +144,9 @@ indicator_sound_class_init (IndicatorSoundClass *klass)
 	io_class->get_label = get_label;
 	io_class->get_image = get_icon;
 	io_class->get_menu  = get_menu;
-        io_class->scroll    = scroll;
+    io_class->scroll    = scroll;
 
-        design_team_size = gtk_icon_size_register("design-team-size", 22, 22);
+    design_team_size = gtk_icon_size_register("design-team-size", 22, 22);
 
 	return;
 }
diff --git a/src/pulse-manager.c b/src/pulse-manager.c
index e1634a9..c6fc6ac 100644
--- a/src/pulse-manager.c
+++ b/src/pulse-manager.c
@@ -72,6 +72,11 @@ void establish_pulse_activities(SoundServiceDbus *service)
 	pa_context_connect(pulse_context, NULL, PA_CONTEXT_NOFAIL, NULL);    
 }
 
+pa_context* get_context()
+{
+    return pulse_context;
+}
+
 void close_pulse_activites()
 {
     if (pulse_context != NULL){
@@ -98,7 +103,11 @@ static void reconnect_to_pulse()
  	    pa_context_unref(pulse_context);
         pulse_context = NULL;
    	}
-    g_hash_table_destroy(sink_hash);
+    
+    if(sink_hash != NULL){
+        g_hash_table_destroy(sink_hash);
+        sink_hash = NULL;
+    }
 
     // reconnect
 	pulse_context = pa_context_new(pa_glib_mainloop_get_api(pa_main_loop), "ayatana.indicator.sound");
@@ -114,8 +123,6 @@ static void destroy_sink_info(void *value)
 {
     sink_info *sink = (sink_info*)value;
     g_free(sink->name);
-    g_free(sink->description);        
-    g_free(sink->icon_name);  
     g_free(sink);  
 }
 
@@ -289,11 +296,8 @@ static void pulse_sink_info_callback(pa_context *c, const pa_sink_info *sink, in
         g_debug("About to add an item to our hash");
         sink_info *value;
         value = g_new0(sink_info, 1);
-        value->index = value->device_index = sink->index;
+        value->index = sink->index;
         value->name = g_strdup(sink->name);
-        value->description = g_strdup(sink->description);
-        value->icon_name = g_strdup(pa_proplist_gets(sink->proplist, PA_PROP_DEVICE_ICON_NAME));
-        value->active_port = (sink->active_port != NULL);
         value->mute = !!sink->mute;
         value->volume = sink->volume;
         value->base_volume = sink->base_volume;
@@ -362,15 +366,11 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
     {
         sink_info *s = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(info->index));
         s->name = g_strdup(info->name);
-        s->description = g_strdup(info->description);
-        s->icon_name = g_strdup(pa_proplist_gets(info->proplist, PA_PROP_DEVICE_ICON_NAME));
-        s->active_port = (info->active_port != NULL);
         gboolean mute_changed = s->mute != !!info->mute;
         s->mute = !!info->mute;
         gboolean volume_changed = (pa_cvolume_equal(&info->volume, &s->volume) == 0);
         s->volume = info->volume;
         s->base_volume = info->base_volume;
-        s->channel_map = info->channel_map; 
         if(DEFAULT_SINK_INDEX == s->index)
         {
             //update the UI
@@ -398,18 +398,13 @@ static void update_sink_info(pa_context *c, const pa_sink_info *info, int eol, v
     }
     else
     {
-
         sink_info *value;
         value = g_new0(sink_info, 1);
-        value->index = value->device_index = info->index;
+        value->index = info->index;
         value->name = g_strdup(info->name);
-        value->description = g_strdup(info->description);
-        value->icon_name = g_strdup(pa_proplist_gets(info->proplist, PA_PROP_DEVICE_ICON_NAME));
-        value->active_port = (info->active_port != NULL);
         value->mute = !!info->mute;
         value->volume = info->volume;
         value->base_volume = info->base_volume;
-        value->channel_map = info->channel_map;
         g_hash_table_insert(sink_hash, GINT_TO_POINTER(value->index), value);
         g_debug("pulse-manager:update_sink_info -> After adding a new sink to our hash");
         sound_service_dbus_update_sink_availability(dbus_service, TRUE);    
@@ -462,9 +457,13 @@ static void subscribed_events_callback(pa_context *c, enum pa_subscription_event
 			g_debug("PA_SUBSCRIPTION_EVENT_SINK event triggered");            
             if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) 
             {
-                if(index == DEFAULT_SINK_INDEX)
-                    g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL event triggered");  
+                if(index == DEFAULT_SINK_INDEX){
+                    g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL event triggered - default sink has been removed !! \n updating UI to reflect the change");  
                     sound_service_dbus_update_sink_availability(dbus_service, FALSE);    
+                }
+                else{
+                    g_debug("PA_SUBSCRIPTION_EVENT_SINK REMOVAL - some device other than the default - no panic");
+                }
             } 
             else 
             {
diff --git a/src/pulse-manager.h b/src/pulse-manager.h
index e1777fb..54978bb 100644
--- a/src/pulse-manager.h
+++ b/src/pulse-manager.h
@@ -30,14 +30,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 typedef struct {
     gchar* name;
-    gchar* description;
-    gchar* icon_name;
     gint index;
-    gint device_index;
     pa_cvolume volume;
     pa_channel_map channel_map;
     gboolean mute;
-    gboolean active_port;
     pa_volume_t base_volume;
 } sink_info;
 
diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c
index 260e064..5c6c487 100644
--- a/src/sound-service-dbus.c
+++ b/src/sound-service-dbus.c
@@ -140,7 +140,7 @@ sound_service_dbus_init (SoundServiceDbus *self)
 	}
     /* register the service on it */
 	dbus_g_connection_register_g_object(priv->connection,
-	                                    "/org/ayatana/indicator/sound/service",
+	                                    INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
 	                                    G_OBJECT(self));
 }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4767f76..bc67c30 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,12 +1,20 @@
-
 check_PROGRAMS = \
-	test-indicator-sound 
-#	test-indicator-sound-dbus-client \
-#	test-indicator-sound-dbus-server 
+	test-indicator-sound \ 
+	test-pulse-manager \
+	test-indicator-sound-dbus-client \
+	test-indicator-sound-dbus-server 
+
+TESTS = \
+	test-indicator-sound \
+	test-pulse-manager
 
-TESTS =
 DISTCLEANFILES = $(TESTS)
 
+noinst_LTLIBRARIES        = libmockpulse.la
+libmockpulse_la_SOURCES   = mockpulse.c mockpulse.h
+libmockpulse_la_CFLAGS    = $(PULSEAUDIO_CFLAGS)
+
+
 #########################################
 ##  test-indicator-sound
 #########################################
@@ -15,79 +23,121 @@ test_indicator_sound_SOURCES = \
     $(top_builddir)/src/indicator-sound.c
     
 test_indicator_sound_CFLAGS = \
+	$(PULSEAUDIO_CFLAGS) \
 	$(APPLET_CFLAGS) \
 	-Wall -Werror \
 	-I$(srcdir) \
 	-DTOP_BUILD_DIR="\"${abs_top_builddir}\""
 
 test_indicator_sound_LDADD = \
+	libmockpulse.la \
+	$(PULSEAUDIO_LIBS) \
 	$(APPLET_LIBS) 
 
 
 #########################################
+##  test-pulse-manager
+#########################################
+
+check_PROGRAMS += test-pulse-manager
+
+test_pulse_manager_SOURCES = \
+	test-pulse-manager.c \
+    $(top_builddir)/src/dbus-menu-manager.c \
+    $(top_builddir)/src/sound-service-dbus.c \ 
+    $(top_builddir)/src/slider-menu-item.c 
+
+test_pulse_manager_CFLAGS = \
+	$(PULSEAUDIO_CFLAGS) \
+	$(SOUNDSERVICE_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	-Wall -Werror \
+	-I$(srcdir) \
+	-I$(SOUNDSERVICE_CFLAGS)
+
+test_pulse_manager_LDADD = \
+	libmockpulse.la \
+	$(PULSEAUDIO_LIBS) \
+	$(SOUNDSERVICE_LIBS) \
+	$(GCONF_LIBS) \
+	$(APPLET_LIBS) 
+
+#########################################
 ##  test-indicator-sound-dbus-client
 #########################################
-#test_indicator_sound_dbus_client_SOURCES = \
-#	test-defines.h \
-#	test-indicator-sound-dbus-client.c 
+test_indicator_sound_dbus_client_SOURCES = \
+	test-defines.h \
+	test-indicator-sound-dbus-client.c
 
-#test_indicator_sound_dbus_client_CFLAGS = \
-#	$(SOUNDSERVICE_CFLAGS) \
-#	-Wall -Werror \
-#	-I$(srcdir) 
+test_indicator_sound_dbus_client_CFLAGS = \
+	$(PULSEAUDIO_CFLAGS) \
+	$(SOUNDSERVICE_CFLAGS) \
+	-Wall -Werror \
+	-I$(srcdir) \
+	-I$(SOUNDSERVICE_CFLAGS)
 
-#test_indicator_sound_dbus_client_LDADD = \
-#	$(SOUNDSERVICE_LIBS)
+test_indicator_sound_dbus_client_LDADD = \
+	$(PULSEAUDIO_LIBS) \
+	$(SOUNDSERVICE_LIBS)
 
 ########################################
 #  test-indicator-sound-dbus-server
 ########################################
-#test_indicator_sound_dbus_server_SOURCES = \
-#	test-defines.h \
-#    test-indicator-sound-dbus-server.c \
-#    $(top_builddir)/src/sound-service-dbus.c \
-#    $(top_builddir)/src/pulse-manager.c \
-#    $(top_builddir)/src/slider-menu-item.c \
-#    $(top_builddir)/src/dbus-menu-manager.c
-
-#test_indicator_sound_dbus_server_CFLAGS = \
-#    $(SOUNDSERVICE_CFLAGS) \
-#	-Wall -Werror \
-#	-I$(srcdir) 
+test_indicator_sound_dbus_server_SOURCES = \
+	test-defines.h \
+    test-indicator-sound-dbus-server.c \
+    $(top_builddir)/src/sound-service-dbus.c \
+    $(top_builddir)/src/pulse-manager.c \
+    $(top_builddir)/src/slider-menu-item.c \
+    $(top_builddir)/src/dbus-menu-manager.c
+
+test_indicator_sound_dbus_server_CFLAGS = \
+    $(SOUNDSERVICE_CFLAGS) \
+	-Wall -Werror \
+	-I$(srcdir) 
 
-#test_indicator_sound_dbus_server_LDADD = \
-#	$(SOUNDSERVICE_LIBS) 
+test_indicator_sound_dbus_server_LDADD = \
+	$(SOUNDSERVICE_LIBS) \
+	$(PULSEAUDIO_LIBS) 
 
 
 #########################################
 ##  Actual tests
 #########################################
 
-#XML_REPORT   = indicator-sound-check-results.xml
-#HTML_REPORT  = indicator-sound-check-results.html
+XML_REPORT   = indicator-sound-check-results.xml
+HTML_REPORT  = indicator-sound-check-results.html
+
+indicator-sound-tests: indicator-sound-tests-gtester Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo $(DBUS_RUNNER) --task ./indicator-sound-tests-gtester >> $@
+	@chmod +x $@
+
+indicator-sound-tests-gtester: test-indicator-sound Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo gtester -k --verbose -o=indicator-sound-check-results.xml ./test-indicator-sound >> $@
+	@chmod +x $@
+
+TESTS += indicator-sound-tests-gtester
 
-#indicator-sound-tests: indicator-sound-tests-gtester Makefile.am
-#	@echo "#!/bin/sh" > $@
-#	@echo $(DBUS_RUNNER) --task ./indicator-sound-tests-gtester >> $@
-#	@chmod +x $@
+pulse-manager-tests-gtester: test-pulse-manager Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo gtester -k --verbose -o=pulse-manager-check-results.xml ./test-pulse-manager >> $@
+	@chmod +x $@
 
-#indicator-sound-tests-gtester: test-indicator-sound Makefile.am
-#	@echo "#!/bin/sh" > $@
-#	@echo gtester -k --verbose -o=$(XML_REPORT) ./test-indicator-sound >> $@
-#	@chmod +x $@
+TESTS += pulse-manager-tests-gtester
 
-#TESTS += indicator-sound-tests
+DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) indicator-sound-tests-gtester
 
-#DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) indicator-sound-tests-gtester
+DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
-#DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
+test-indicator-sound-dbus: test-indicator-sound-dbus-client test-indicator-sound-dbus-server Makefile.am
+	@echo "#!/bin/sh" > test-indicator-sound-dbus
+	@echo $(DBUS_RUNNER) --task ./test-indicator-sound-dbus-server --task-name Server --ignore-return >> test-indicator-sound-dbus --task ./test-indicator-sound-dbus-client --task-name Client
+	@chmod +x test-indicator-sound-dbus
 
-#test-indicator-sound-dbus: test-indicator-sound-dbus-client test-indicator-sound-dbus-server Makefile.am
-#	@echo "#!/bin/sh" > test-indicator-sound-dbus
-#	@echo $(DBUS_RUNNER) --task ./test-indicator-sound-dbus-client --task-name Client --task ./test-indicator-sound-dbus-server --task-name Server --ignore-return >> test-indicator-sound-dbus
-#	@chmod +x test-indicator-sound-dbus
+TESTS += test-indicator-sound-dbus
 
-#TESTS += test-indicator-sound-dbus
 
 
 
diff --git a/tests/mockpulse.c b/tests/mockpulse.c
new file mode 100644
index 0000000..b868e07
--- /dev/null
+++ b/tests/mockpulse.c
@@ -0,0 +1,105 @@
+/*
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Robert Collins <robert.collins@canonical.com>
+
+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/>.
+*/
+
+
+#include <pulse/glib-mainloop.h>
+#include <pulse/context.h>
+#include <pulse/operation.h>
+#include <pulse/introspect.h>
+#include "mockpulse.h"
+
+struct pa_context {
+  int refcount;
+  pa_context_notify_cb_t cb;
+  void *cbdata;
+  pa_context_state_t state;
+};
+
+pa_glib_mainloop *
+pa_glib_mainloop_new(GMainContext *c)
+{
+    return NULL;
+}
+
+pa_context *
+pa_context_new(pa_mainloop_api *loop, char const *name) {
+  struct pa_context * result = g_new(pa_context, 1);
+  result->refcount = 1;
+  return result;
+}
+
+void
+pa_context_unref(pa_context * context) {
+  context->refcount--;
+  if (!context->refcount)
+    g_free(context);
+}
+
+void
+pa_context_set_state_callback(pa_context *c, pa_context_notify_cb_t cb, void *userdata)
+{
+  c->cb = cb;
+  c->cbdata = userdata;
+}
+
+void set_pa_context_get_state_result(pa_context *c, pa_context_state_t state)
+{
+  c->state = state;
+}
+
+pa_context_state_t
+pa_context_get_state(pa_context *c)
+{
+  return c->state;
+}
+
+struct pa_operation {
+  int refcount;
+};
+
+
+/*void pa_context_connect(pa_context* c, const char *server, pa_context_flags_t flags, const pa_spawn_api *api)*/
+/*{*/
+/*    set_pa_context_get_state_result(c, PA_CONTEXT_CONNECTING);*/
+/*}*/
+
+/* Can be made into a list if we need multiple callbacks */
+static pa_sink_info *next_sink_info;
+
+void
+set_pa_context_get_sink_info(pa_sink_info *info) {
+  next_sink_info = info;
+}
+
+pa_operation *
+pa_context_get_sink_info_by_index(pa_context *c, uint32_t idx, pa_sink_info_cb_t cb, void * userdata)
+{
+  pa_operation *result = g_new(pa_operation, 1);
+  result->refcount = 1;
+  cb(c, next_sink_info, 0, userdata);
+  return result;
+}
+
+void
+pa_operation_unref(pa_operation * foo)
+{
+  foo->refcount--;
+  if (!foo->refcount)
+    g_free(foo);
+}
diff --git a/tests/mockpulse.h b/tests/mockpulse.h
new file mode 100644
index 0000000..71cd85b
--- /dev/null
+++ b/tests/mockpulse.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Robert Collins <robert.collins@canonical.com>
+
+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/>.
+*/
+
+/**
+ * Control interface for the mocked pa-glib-mainloop test library 
+ */
+#include <pulse/glib-mainloop.h>
+
+void set_pa_context_get_state_result(pa_context *, pa_context_state_t state);
+void set_pa_context_get_sink_info(pa_sink_info *info);
diff --git a/tests/test-defines.h b/tests/test-defines.h
index 68064fc..214274e 100644
--- a/tests/test-defines.h
+++ b/tests/test-defines.h
@@ -20,5 +20,6 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define  TEST_MUTE                  FALSE
-
+#define     TEST_MUTE_VALUE                 TRUE
+#define     TEST_VOLUME_VALUE               77.77777
+#define     TEST_AVAILABLE_VALUE            TRUE
diff --git a/tests/test-indicator-sound-dbus-client.c b/tests/test-indicator-sound-dbus-client.c
index 08ce93e..1c23dc5 100644
--- a/tests/test-indicator-sound-dbus-client.c
+++ b/tests/test-indicator-sound-dbus-client.c
@@ -26,39 +26,68 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib.h>
 #include "../src/dbus-shared-names.h"
 #include "test-defines.h"
+#include "../src/sound-service-client.h"
 
 static GMainLoop * mainloop = NULL;
-static gboolean passed = TRUE;
+static DBusGProxy * proxy= NULL;
 
 static void
-fetch_mute_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
+test_fetch_mute(DBusGProxy * proxy)
 {
-	GError * error = NULL;
-	GValue value = {0};
-
-	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
-		g_warning("Getting mute failed: %s", error->message);
+    GError * error = NULL;
+    gboolean *fetched_mute_value;
+    fetched_mute_value = g_new0(gboolean, 1);
+    org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error);
+	if (error != NULL) {
+		g_warning("test-indicator-sound-dbus-client::test_fetch_mute - Unable to fetch mute: %s", error->message);
 		g_error_free(error);
-		passed = FALSE;
-		return;
+        g_free(fetched_mute_value);
+        return;
 	}
+    g_assert(TEST_MUTE_VALUE == *fetched_mute_value); 
+    g_free(fetched_mute_value);
+}
 
-	if (TEST_MUTE != g_value_get_boolean(&value)) {
-		g_debug("Mute vale Returned: FAILED");
-		passed = FALSE;
-	} else {
-		g_debug("Property ID Returned: PASSED");
+static void
+test_fetch_volume(DBusGProxy * proxy)
+{
+	GError * error = NULL;
+    gdouble *volume_percent_input;
+    volume_percent_input = g_new0(gdouble, 1);
+    org_ayatana_indicator_sound_get_sink_volume(proxy, volume_percent_input, &error);
+	if (error != NULL) {
+		g_warning("test-indicator-sound-dbus-client::test_fetch_volume - Unable to fetch VOLUME: %s", error->message);
+		g_error_free(error);
+        g_free(volume_percent_input);
+        return;
 	}
-	return;
+    g_assert(TEST_VOLUME_VALUE == *volume_percent_input); 
+    g_free(volume_percent_input);
+}
+
+static void 
+test_fetch_availability(DBusGProxy * proxy)
+{
+    GError * error = NULL;
+    gboolean * available_input;
+    available_input = g_new0(gboolean, 1);
+    org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error);
+    if (error != NULL) {
+	    g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message);
+	    g_error_free(error);
+        g_free(available_input);
+        return;
+    }
+    g_assert(TEST_AVAILABLE_VALUE == *available_input);
+    g_free(available_input);
 }
 
 
 gboolean
 kill_func (gpointer userdata)
 {
+    g_free(proxy);
 	g_main_loop_quit(mainloop);
-	g_warning("Forced to Kill");
-	passed = FALSE;
 	return FALSE;
 }
 
@@ -66,6 +95,7 @@ gint
 main (gint argc, gchar * argv[])
 {
 	g_type_init();
+	g_test_init(&argc, &argv, NULL);
 
 	g_usleep(500000);
 
@@ -76,37 +106,30 @@ main (gint argc, gchar * argv[])
 		return 1;
 	}
 
-	DBusGProxy * props = dbus_g_proxy_new_for_name_owner(session_bus,
-                                                         INDICATOR_SOUND_DBUS_NAME,
-														 INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
-														 INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
-                                                         &error);
-/*	                                                     ":1.0",*/
-/*	                                                     "/need/a/path",*/
-/*	                                                     DBUS_INTERFACE_PROPERTIES,*/
-/*	                                                     &error);*/
+	DBusGProxy * proxy = dbus_g_proxy_new_for_name_owner(session_bus,
+                                            ":1.0",
+											 INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
+                                             INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
+                                             &error);
 	if (error != NULL) {
 		g_error("Unable to get property proxy: %s", error->message);
 		return 1;
 	}
 
-	dbus_g_proxy_begin_call (props,
-	                         "GetSinkMute",
-	                         fetch_mute_cb,
-	                         NULL, NULL,
-	                         G_TYPE_INVALID);
+/*    g_test_add_func("/test-indicator-sound-dbus/test-fetch-mute", test_fetch_mute);*/
+/*    g_test_add_func("/test-indicator-sound-dbus/test-fetch-volume", test_fetch_volume);*/
+/*    g_test_add_func("/test-indicator-sound-dbus/test-fetch-availability", test_fetch_availability);*/
+/*    g_test_queue_free(proxy);*/
+/*    return g_test_run();*/
+
+    test_fetch_mute(proxy);
+    test_fetch_volume(proxy);    
+    test_fetch_availability(proxy);    
 
 	g_timeout_add_seconds(2, kill_func, NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
 
-	if (passed) {
-		g_debug("Quiting");
-		return 0;
-	} else {
-		g_debug("Quiting as we're a failure");
-		return 1;
-	}
 	return 0;
 }
diff --git a/tests/test-indicator-sound-dbus-server.c b/tests/test-indicator-sound-dbus-server.c
index 21d7dfe..6912dc4 100644
--- a/tests/test-indicator-sound-dbus-server.c
+++ b/tests/test-indicator-sound-dbus-server.c
@@ -43,13 +43,17 @@ gint
 main (gint argc, gchar * argv[])
 {
     g_type_init();
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
+   
+	//g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
 
     dbus_interface = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL);
 
     // Set the mute value
-    sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE);
-    g_timeout_add_seconds(2, kill_func, NULL);
+    sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE_VALUE);
+    sound_service_dbus_update_sink_volume(dbus_interface, TEST_VOLUME_VALUE);
+    sound_service_dbus_update_sink_availability(dbus_interface, TEST_AVAILABLE_VALUE);
+
+    g_timeout_add_seconds(4, kill_func, NULL);
 
     // Run the loop
     mainloop = g_main_loop_new(NULL, FALSE);
diff --git a/tests/test-indicator-sound.c b/tests/test-indicator-sound.c
index eb68b17..cd28587 100644
--- a/tests/test-indicator-sound.c
+++ b/tests/test-indicator-sound.c
@@ -86,14 +86,13 @@ void test_libindicator_image_names()
 }
 
 
-
 gint main (gint argc, gchar * argv[])
 {
 	g_type_init();
 	g_test_init(&argc, &argv, NULL);
 
-    g_test_add_func("/indicator-sound/indicator-sound/init", test_libindicator_sound_init);
-    g_test_add_func("/indicator-sound/indicator-sound/state_machine", test_libindicator_determine_state);
+/*    g_test_add_func("/indicator-sound/indicator-sound/init", test_libindicator_sound_init);*/
+/*    g_test_add_func("/indicator-sound/indicator-sound/state_machine", test_libindicator_determine_state);*/
     g_test_add_func("/indicator-sound/indicator-sound/image_names", test_libindicator_image_names);
 
 	return g_test_run ();
diff --git a/tests/test-pulse-manager.c b/tests/test-pulse-manager.c
new file mode 100644
index 0000000..313f325
--- /dev/null
+++ b/tests/test-pulse-manager.c
@@ -0,0 +1,139 @@
+/*
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Robert Collins <robert.collins@canonical.com>
+    Conor Curran <conor.curran@canonical.com>
+
+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/>.
+*/
+
+#include <string.h>
+
+/* we intend to test static functions 
+which are not to be exported
+hence the inclusion of the C file*/
+#include "../src/pulse-manager.c"
+#include "mockpulse.h"
+
+
+/**
+Helper Methods
+**/
+static pa_sink_info* 
+mock_sink_info() 
+{
+    pa_sink_info* mock_sink;
+    mock_sink = g_new0(pa_sink_info, 1);
+    mock_sink->index = 8;
+    mock_sink->name = g_strdup("mock_sink");
+    mock_sink->mute = 0;
+    pa_cvolume volume; // nearly full volume:
+    pa_cvolume_set(&volume, 1, 30000);
+    mock_sink->volume = volume;
+    return mock_sink;
+}
+
+
+
+/*static void test_pa_context_exit()*/
+/*{*/
+/*    pa_context* context = pa_context_new(NULL, "foo");*/
+
+/*    pa_context_set_state_callback(context, context_state_callback, NULL);*/
+/*    // => call context_state_callback(context, NULL);*/
+/*    // pa_context_get_state is mocked to return the right FAIL flag.*/
+/*    set_pa_context_get_state_result(context, PA_CONTEXT_FAILED);*/
+/*    context_state_callback(context, NULL);*/
+/*    // Test to ensure context is tidied after failure.*/
+/*    g_assert(context == NULL);*/
+/*    // 2. then using the same pa_context_get_state we could ensure the manager*/
+/*    // is attempting to reconnect to PA. */
+/*    //g_assert(PA_CONTEXT_CONNECTING == pa_context_get_state(get_context()));*/
+/*    //pa_context_unref(context);*/
+/*}*/
+
+static void test_sink_update()
+{
+    pa_context* context = pa_context_new(NULL, "foo");    
+    pa_sink_info* mock_sink = mock_sink_info();
+    set_pa_context_get_sink_info(mock_sink);
+    sink_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_sink_info);
+
+    pa_context_get_sink_info_by_index(context, mock_sink->index, pulse_sink_info_callback, NULL);
+
+    mock_sink->mute = 1;
+    pa_cvolume volume; // nearly full volume:
+    pa_cvolume_set(&volume, 1, 10000);
+    mock_sink->volume = volume;
+
+    set_pa_context_get_sink_info(mock_sink);
+
+    pa_context_get_sink_info_by_index(context, mock_sink->index, update_sink_info, NULL);
+
+    GList *keys = g_hash_table_get_keys(sink_hash);
+    gint position =  g_list_index(keys, GINT_TO_POINTER(mock_sink->index));
+
+    g_assert(position >= 0);
+
+    sink_info* stored_sink_info = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(mock_sink->index));
+
+    g_assert(!!mock_sink->mute == stored_sink_info->mute);
+    g_assert(pa_cvolume_equal(&mock_sink->volume, &stored_sink_info->volume));
+
+
+    g_free(mock_sink);
+    g_hash_table_destroy(sink_hash);
+    pa_context_unref(context);
+}
+
+
+static void test_sink_cache_population()
+{
+    pa_context* context = pa_context_new(NULL, "foo");    
+    pa_sink_info* mock_sink = mock_sink_info();
+    set_pa_context_get_sink_info(mock_sink);
+    sink_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_sink_info);
+
+    pa_context_get_sink_info_by_index(context, mock_sink->index, pulse_sink_info_callback, NULL);
+
+    GList *keys = g_hash_table_get_keys(sink_hash);
+    gint position =  g_list_index(keys, GINT_TO_POINTER(mock_sink->index));
+
+    g_assert(position >= 0);
+
+    sink_info* stored_sink_info = g_hash_table_lookup(sink_hash, GINT_TO_POINTER(mock_sink->index));
+
+    g_assert(g_ascii_strncasecmp(mock_sink->name, stored_sink_info->name, strlen(mock_sink->name)) == 0);
+    g_assert(!!mock_sink->mute == stored_sink_info->mute);
+    g_assert(mock_sink->index == stored_sink_info->index);
+    g_assert(pa_cvolume_equal(&mock_sink->volume, &stored_sink_info->volume));
+
+    g_free(mock_sink);
+    g_hash_table_destroy(sink_hash);
+    pa_context_unref(context);
+}
+
+
+gint main (gint argc, gchar * argv[])
+{
+  g_type_init();
+  g_test_init(&argc, &argv, NULL);
+  
+  g_test_add_func("/indicator-sound/pulse-manager/sink-cache-population", test_sink_cache_population);
+  g_test_add_func("/indicator-sound/pulse-manager/sink-update", test_sink_update);
+
+  //g_test_add_func("/indicator-sound/pulse-manager/pa-context-exit", test_pa_context_exit);
+  
+  return g_test_run ();
+}