From 38c6ce2a36d6416016f64e5963deee29bc02f8b3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 20 Apr 2009 12:36:07 -0500 Subject: Adding an interests test --- tests/test-interests-client.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 tests/test-interests-client.c (limited to 'tests/test-interests-client.c') diff --git a/tests/test-interests-client.c b/tests/test-interests-client.c new file mode 100644 index 0000000..0fe8587 --- /dev/null +++ b/tests/test-interests-client.c @@ -0,0 +1,63 @@ + +#include +#include "libindicate/indicator.h" +#include "libindicate/server.h" +#include "libindicate/interests.h" + +static gboolean passed = TRUE; +static GMainLoop * mainloop = NULL; +static gboolean interests[INDICATE_INTEREST_LAST] = {0}; + +static gboolean +check_interests (void) +{ + guint i; + for (i = INDICATE_INTEREST_NONE; i < INDICATE_INTEREST_LAST; i++) { + if (!interests[i]) { + return FALSE; + } + } + + return TRUE; +} + +static void +interest_added (IndicateServer * server, IndicateInterests interest) +{ + g_debug("Oh, someone is interested in my for: %d", interest); + interests[interest] = TRUE; + + if (check_interests()) { + g_main_loop_quit(mainloop); + } + + return; +} + +static gboolean +done_timeout_cb (gpointer data) +{ + g_debug("All interests not set"); + passed = FALSE; + g_main_loop_quit(mainloop); + return FALSE; +} + +int +main (int argc, char * argv) +{ + g_type_init(); + + IndicateIndicator * indicator = indicate_indicator_new(); + indicate_indicator_show(indicator); + + IndicateServer * server = indicate_server_ref_default(); + g_signal_connect(G_OBJECT(server), INDICATE_SERVER_SIGNAL_INTEREST_ADDED, G_CALLBACK(interest_added), NULL); + + g_timeout_add_seconds(10, done_timeout_cb, indicator); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + return !passed; +} -- cgit v1.2.3 From c5cc32d7fa7c6abe909f3d19a7e1deb529bcc4a9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 20 Apr 2009 13:16:14 -0500 Subject: Expanding range of interest test and not checking to see if we got none, we shouldn't get it. --- tests/test-interests-client.c | 4 ++-- tests/test-interests-server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/test-interests-client.c') diff --git a/tests/test-interests-client.c b/tests/test-interests-client.c index 0fe8587..bde3b26 100644 --- a/tests/test-interests-client.c +++ b/tests/test-interests-client.c @@ -12,7 +12,7 @@ static gboolean check_interests (void) { guint i; - for (i = INDICATE_INTEREST_NONE; i < INDICATE_INTEREST_LAST; i++) { + for (i = INDICATE_INTEREST_NONE + 1; i < INDICATE_INTEREST_LAST; i++) { if (!interests[i]) { return FALSE; } @@ -54,7 +54,7 @@ main (int argc, char * argv) IndicateServer * server = indicate_server_ref_default(); g_signal_connect(G_OBJECT(server), INDICATE_SERVER_SIGNAL_INTEREST_ADDED, G_CALLBACK(interest_added), NULL); - g_timeout_add_seconds(10, done_timeout_cb, indicator); + g_timeout_add_seconds(2, done_timeout_cb, indicator); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-interests-server.c b/tests/test-interests-server.c index 82cab3c..e1433d8 100644 --- a/tests/test-interests-server.c +++ b/tests/test-interests-server.c @@ -10,8 +10,8 @@ server_added (IndicateListener * listener, IndicateListenerServer * server, gcha { g_debug("Indicator Server Added: %s %s", INDICATE_LISTENER_SERVER_DBUS_NAME(server), type); - guint i; - for (i = INDICATE_INTEREST_NONE; i < INDICATE_INTEREST_LAST; i++) { + gint i; + for (i = INDICATE_INTEREST_NONE - 2; i < INDICATE_INTEREST_LAST + 2; i++) { g_debug("Indicating Interests: %d", i); indicate_listener_server_show_interest(listener, server, i); } -- cgit v1.2.3