From 8d9b6e921d45ba5f4153e7c1fd784eef64c3d80e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:47:52 -0500 Subject: Adding in a couple of desktop tests --- tests/test-libappindicator.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'tests') diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 8d12ac5..202c5e1 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -291,6 +291,22 @@ test_libappindicator_label_signals (void) g_assert(label_signals_count == 1); return; +} + +void +test_libappindicator_desktop_menu (void) +{ + + + +} + +void +test_libappindicator_desktop_menu_bad (void) +{ + + + } void @@ -302,6 +318,8 @@ test_libappindicator_props_suite (void) g_test_add_func ("/indicator-application/libappindicator/prop_signals", test_libappindicator_prop_signals); g_test_add_func ("/indicator-application/libappindicator/set_label", test_libappindicator_set_label); g_test_add_func ("/indicator-application/libappindicator/label_signals", test_libappindicator_label_signals); + g_test_add_func ("/indicator-application/libappindicator/desktop_menu", test_libappindicator_desktop_menu); + g_test_add_func ("/indicator-application/libappindicator/desktop_menu_bad",test_libappindicator_desktop_menu_bad); return; } -- cgit v1.2.3 From 145fd40be09045eb775dd5cdf754623ae7fc210b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:49:27 -0500 Subject: Adding a desktop file for testing --- tests/Makefile.am | 4 +++- tests/test-libappindicator.desktop | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 tests/test-libappindicator.desktop (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index f2bdbb2..f52b78b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,7 +13,9 @@ check_PROGRAMS = \ TESTS = DISTCLEANFILES = $(TESTS) -EXTRA_DIST = run-xvfb.sh +EXTRA_DIST = \ + run-xvfb.sh \ + test-libappindicator.desktop ######################################### ## test-libappindicator diff --git a/tests/test-libappindicator.desktop b/tests/test-libappindicator.desktop new file mode 100644 index 0000000..59be810 --- /dev/null +++ b/tests/test-libappindicator.desktop @@ -0,0 +1,23 @@ +[Desktop Entry] +Name=AppIndicator Test +GenericName=Test +Comment=This is only a test +Exec=/usr/bin/false +Terminal=false +Type=Application +X-Ayatana-Desktop-Shortcuts=Short1;Short2;Short3; + +[Short1 Shortcut Group] +Name=Shortcut 1 +Exec=/usr/bin/true +OnlyShowIn=Test Program; + +[Short2 Shortcut Group] +Name=Shortcut 2 +Exec=/usr/bin/true +OnlyShowIn=Test Program; + +[Short3 Shortcut Group] +Name=Shortcut 3 +Exec=/usr/bin/true +OnlyShowIn=Test Program; -- cgit v1.2.3 From 2e1b3533b988c227f5699bc88dc5df0e67669430 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 11:49:47 -0500 Subject: Adding the srcdir to the build command line --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index f52b78b..9cecd5e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,6 +26,7 @@ test_libappindicator_SOURCES = \ test_libappindicator_CFLAGS = \ $(INDICATOR_CFLAGS) \ + -DSRCDIR="\"$(srcdir)\"" \ -Wall -Werror \ -I$(top_srcdir)/src -- cgit v1.2.3 From 52c706605c23a2b3b06e5f4262d5ea1ab1577567 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Nov 2010 12:10:46 -0500 Subject: Adding a test to check the number of items in the desktop file --- tests/test-libappindicator.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'tests') diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 202c5e1..f340a67 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -296,9 +296,26 @@ test_libappindicator_label_signals (void) void test_libappindicator_desktop_menu (void) { + AppIndicator * ci = app_indicator_new ("my-id", + "my-name", + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); + g_assert(ci != NULL); + g_assert(app_indicator_get_label(ci) == NULL); + g_assert(app_indicator_get_label_guide(ci) == NULL); + app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Test Program"); + GtkMenu * menu = app_indicator_get_menu(ci); + g_assert(menu != NULL); + + GList * children = gtk_container_get_children(GTK_CONTAINER(menu)); + g_assert(children != NULL); + g_assert(g_list_length(children) == 3); + + g_object_unref(G_OBJECT(ci)); + + return; } void -- cgit v1.2.3 From 53d10c22f2df62a7ee96f7effa9f641bf638a627 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:05:29 -0600 Subject: Test setting the menu and verify it comes out --- tests/test-libappindicator.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'tests') diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 8d12ac5..7a1976c 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -25,6 +25,9 @@ with this program. If not, see . #include +#include +#include + void test_libappindicator_prop_signals_status_helper (AppIndicator * ci, gchar * status, gboolean * signalactivated) { @@ -224,6 +227,50 @@ test_libappindicator_set_label (void) return; } +void +test_libappindicator_set_menu (void) +{ + AppIndicator * ci = app_indicator_new ("my-id", + "my-name", + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); + + g_assert(ci != NULL); + + GtkMenu * menu = GTK_MENU(gtk_menu_new()); + + GtkMenuItem * item = GTK_MENU_ITEM(gtk_menu_item_new_with_label("Test Label")); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(item)); + gtk_widget_show(GTK_WIDGET(item)); + + app_indicator_set_menu(ci, menu); + + g_assert(app_indicator_get_menu(ci) != NULL); + + GValue serverval = {0}; + g_value_init(&serverval, DBUSMENU_TYPE_SERVER); + g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval); + + DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval)); + g_assert(server != NULL); + + GValue rootval = {0}; + g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM); + g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval); + DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval)); + g_assert(root != NULL); + + GList * children = dbusmenu_menuitem_get_children(root); + g_assert(children != NULL); + g_assert(g_list_length(children) == 1); + + const gchar * label = dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(children->data), DBUSMENU_MENUITEM_PROP_LABEL); + g_assert(label != NULL); + g_assert(g_strcmp0(label, "Test Label") == 0); + + g_object_unref(G_OBJECT(ci)); + return; +} + void label_signals_cb (AppIndicator * appindicator, gchar * label, gchar * guide, gpointer user_data) { @@ -301,6 +348,7 @@ test_libappindicator_props_suite (void) g_test_add_func ("/indicator-application/libappindicator/init_set_props", test_libappindicator_init_set_props); g_test_add_func ("/indicator-application/libappindicator/prop_signals", test_libappindicator_prop_signals); g_test_add_func ("/indicator-application/libappindicator/set_label", test_libappindicator_set_label); + g_test_add_func ("/indicator-application/libappindicator/set_menu", test_libappindicator_set_menu); g_test_add_func ("/indicator-application/libappindicator/label_signals", test_libappindicator_label_signals); return; -- cgit v1.2.3 From d089c385b260d54d7521c277ebc875a3017d7f96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 21:25:00 -0600 Subject: Switching to be dbusmenu based instead of GTK menu based --- tests/test-libappindicator.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 82f3d05..00a8f19 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -353,15 +353,26 @@ test_libappindicator_desktop_menu (void) app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Test Program"); - GtkMenu * menu = app_indicator_get_menu(ci); - g_assert(menu != NULL); + GValue serverval = {0}; + g_value_init(&serverval, DBUSMENU_TYPE_SERVER); + g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval); + + DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval)); + g_assert(server != NULL); + + GValue rootval = {0}; + g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM); + g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval); + DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval)); + g_assert(root != NULL); - GList * children = gtk_container_get_children(GTK_CONTAINER(menu)); + GList * children = dbusmenu_menuitem_get_children(root); g_assert(children != NULL); g_assert(g_list_length(children) == 3); - g_object_unref(G_OBJECT(ci)); + + g_object_unref(G_OBJECT(ci)); return; } -- cgit v1.2.3 From 178f821b27fd31a5059d76a9ccc0cf9ff551e35b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 22:11:03 -0600 Subject: Clearing the events before unrefing --- tests/test-libappindicator.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'tests') diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 7a1976c..ece2df0 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -267,6 +267,13 @@ test_libappindicator_set_menu (void) g_assert(label != NULL); g_assert(g_strcmp0(label, "Test Label") == 0); + /* Interesting, eh? We need this because we send out events on the bus + but they don't come back until the idle is run. So we need those + events to clear before removing the object */ + while (g_main_context_pending(NULL)) { + g_main_context_iteration(NULL, TRUE); + } + g_object_unref(G_OBJECT(ci)); return; } -- cgit v1.2.3 From ca62d8c2fa745e4d033a9b6c79b146b1bbb86a2f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 22:18:55 -0600 Subject: Changing the ID to ensure we get different paths --- tests/test-libappindicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 3860b69..46460f0 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -350,7 +350,7 @@ test_libappindicator_label_signals (void) void test_libappindicator_desktop_menu (void) { - AppIndicator * ci = app_indicator_new ("my-id", + AppIndicator * ci = app_indicator_new ("my-id-desktop-menu", "my-name", APP_INDICATOR_CATEGORY_APPLICATION_STATUS); -- cgit v1.2.3 From aad192611ca84bfabc036658066ea584385f0982 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Nov 2010 22:21:11 -0600 Subject: Fleshing out a function to see if an invalid name results in no entries --- tests/test-libappindicator.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'tests') diff --git a/tests/test-libappindicator.c b/tests/test-libappindicator.c index 46460f0..cadf783 100644 --- a/tests/test-libappindicator.c +++ b/tests/test-libappindicator.c @@ -386,9 +386,34 @@ test_libappindicator_desktop_menu (void) void test_libappindicator_desktop_menu_bad (void) { + AppIndicator * ci = app_indicator_new ("my-id-desktop-menu-bad", + "my-name", + APP_INDICATOR_CATEGORY_APPLICATION_STATUS); + + g_assert(ci != NULL); + g_assert(app_indicator_get_label(ci) == NULL); + g_assert(app_indicator_get_label_guide(ci) == NULL); + + app_indicator_build_menu_from_desktop(ci, SRCDIR "/test-libappindicator.desktop", "Not Test Program"); + + GValue serverval = {0}; + g_value_init(&serverval, DBUSMENU_TYPE_SERVER); + g_object_get_property(G_OBJECT(ci), "dbus-menu-server", &serverval); + DbusmenuServer * server = DBUSMENU_SERVER(g_value_get_object(&serverval)); + g_assert(server != NULL); + GValue rootval = {0}; + g_value_init(&rootval, DBUSMENU_TYPE_MENUITEM); + g_object_get_property(G_OBJECT(server), DBUSMENU_SERVER_PROP_ROOT_NODE, &rootval); + DbusmenuMenuitem * root = DBUSMENU_MENUITEM(g_value_get_object(&rootval)); + g_assert(root != NULL); + + GList * children = dbusmenu_menuitem_get_children(root); + g_assert(g_list_length(children) == 0); + g_object_unref(G_OBJECT(ci)); + return; } void -- cgit v1.2.3