From bffbb2c3612b6cc73d7845c365b1dcb05907e010 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Nov 2009 21:33:08 -0600 Subject: Switching to checking the entires list instead of individual functions. --- tests/test-loader.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/test-loader.c') diff --git a/tests/test-loader.c b/tests/test-loader.c index 4b2b096..141ad78 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -9,9 +9,7 @@ test_loader_filename_dummy_simple_accessors (void) IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); g_assert(object != NULL); - g_assert(indicator_object_get_label(object) != NULL); - g_assert(indicator_object_get_menu(object) != NULL); - g_assert(indicator_object_get_icon(object) != NULL); + g_assert(indicator_object_get_entries(object) != NULL); g_object_unref(object); -- cgit v1.2.3 From 03e89036c7db8eb1afcdc39b4de81863b4ee41f4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Nov 2009 22:16:43 -0600 Subject: Having the test expect an object, but fail when calling the functions. --- tests/test-loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/test-loader.c') diff --git a/tests/test-loader.c b/tests/test-loader.c index 141ad78..263e54f 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -43,7 +43,9 @@ void test_loader_filename_dummy_null (void) { IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); - g_assert(object == NULL); + g_assert(object != NULL); + g_assert(indicator_object_get_entries(object) == NULL); + g_object_unref(G_OBJECT(object)); return; } -- cgit v1.2.3 From 8c321faf4fe07293d747438923d10839bbf9ac6c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Nov 2009 11:14:22 -0600 Subject: Adding a simple indicator test that checks to make sure we can signal up the stack. --- tests/test-loader.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'tests/test-loader.c') diff --git a/tests/test-loader.c b/tests/test-loader.c index 263e54f..485a951 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -3,6 +3,42 @@ void destroy_cb (gpointer data, GObject * object); +void +entry_change_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer data) +{ + gpointer * valuestore = (gpointer *)data; + *valuestore = entry; + return; +} + +void +test_loader_filename_dummy_signaler (void) +{ + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-signaler.so"); + g_assert(object != NULL); + + gpointer added_value = NULL, removed_value = NULL; + + g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), &added_value); + g_signal_connect(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), &removed_value); + + GList * list = indicator_object_get_entries(object); + g_assert(list != NULL); + g_list_free(list); + + while (g_main_context_pending(NULL)) { + g_main_context_iteration(NULL, TRUE); + } + + g_assert(GPOINTER_TO_UINT(added_value) == 5); + g_assert(GPOINTER_TO_UINT(removed_value) == 5); + + g_object_unref(object); + + return; +} + + void test_loader_filename_dummy_simple_accessors (void) { @@ -89,6 +125,7 @@ test_loader_creation_deletion_suite (void) g_test_add_func ("/libindicator/loader/dummy/blank_load", test_loader_filename_dummy_null); g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors); + g_test_add_func ("/libindicator/loader/dummy/signaler", test_loader_filename_dummy_signaler); return; } -- cgit v1.2.3