From bca9b7ee96632e7c89092184c174b45722e0511c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 09:20:36 -0500 Subject: Adding in two little client server binaries for testing the custom indicator. --- tests/test-libcustomindicator-dbus-server.c | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 tests/test-libcustomindicator-dbus-server.c (limited to 'tests/test-libcustomindicator-dbus-server.c') diff --git a/tests/test-libcustomindicator-dbus-server.c b/tests/test-libcustomindicator-dbus-server.c new file mode 100644 index 0000000..7c3de86 --- /dev/null +++ b/tests/test-libcustomindicator-dbus-server.c @@ -0,0 +1,11 @@ + +#include +#include +#include "test-defines.h" + +gint +main (gint argc, gchar * argv[]) +{ + + return 0; +} -- cgit v1.2.3 From 83a3d84ea6e0bb8a9ce7927b08658307becbb186 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 09:46:17 -0500 Subject: Fleshing out the server to setup a simple custom indicator. --- tests/test-defines.h | 2 +- tests/test-libcustomindicator-dbus-server.c | 30 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) (limited to 'tests/test-libcustomindicator-dbus-server.c') diff --git a/tests/test-defines.h b/tests/test-defines.h index b68d9fc..73ab316 100644 --- a/tests/test-defines.h +++ b/tests/test-defines.h @@ -2,6 +2,6 @@ #define TEST_ID "my-id" #define TEST_ICON_NAME "my-icon-name" #define TEST_ATTENTION_ICON_NAME "my-attention-icon-name" -#define TEST_STATE CUSTOM_INDICATOR_STATE_ACTIVE +#define TEST_STATE CUSTOM_INDICATOR_STATUS_ACTIVE #define TEST_CATEGORY CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS diff --git a/tests/test-libcustomindicator-dbus-server.c b/tests/test-libcustomindicator-dbus-server.c index 7c3de86..444706f 100644 --- a/tests/test-libcustomindicator-dbus-server.c +++ b/tests/test-libcustomindicator-dbus-server.c @@ -1,11 +1,41 @@ +#include +#include #include #include #include "test-defines.h" +static GMainLoop * mainloop = NULL; + +gboolean +kill_func (gpointer userdata) +{ + g_main_loop_quit(mainloop); + return FALSE; +} + 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)))); + + CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, + "id", TEST_ID, + "category", TEST_CATEGORY, + "status", TEST_STATE, + "icon-name", TEST_ICON_NAME, + "attention-icon-name", TEST_ATTENTION_ICON_NAME, + NULL)); + + g_timeout_add_seconds(2, kill_func, NULL); + + mainloop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(mainloop); + + g_object_unref(G_OBJECT(ci)); + g_debug("Quiting"); return 0; } -- cgit v1.2.3 From 603044567814b8a5bc895bb22a1bf3ea35e788a2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 15:47:31 -0500 Subject: Property name changes. Boo. --- tests/test-libcustomindicator-dbus-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/test-libcustomindicator-dbus-server.c') diff --git a/tests/test-libcustomindicator-dbus-server.c b/tests/test-libcustomindicator-dbus-server.c index 444706f..4c9dcb9 100644 --- a/tests/test-libcustomindicator-dbus-server.c +++ b/tests/test-libcustomindicator-dbus-server.c @@ -23,8 +23,8 @@ main (gint argc, gchar * argv[]) CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, "id", TEST_ID, - "category", TEST_CATEGORY, - "status", TEST_STATE, + "category-enum", TEST_CATEGORY, + "status-enum", TEST_STATE, "icon-name", TEST_ICON_NAME, "attention-icon-name", TEST_ATTENTION_ICON_NAME, NULL)); -- cgit v1.2.3 From 1b71a85918d149eb4fdd8f3213ddc52dabc6b684 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 16:19:40 -0500 Subject: Adding in testing the location of the dbusmenuserver --- tests/test-defines.h | 1 + tests/test-libcustomindicator-dbus-client.c | 18 ++++++++++++++++++ tests/test-libcustomindicator-dbus-server.c | 3 +++ 3 files changed, 22 insertions(+) (limited to 'tests/test-libcustomindicator-dbus-server.c') diff --git a/tests/test-defines.h b/tests/test-defines.h index 2afe4f4..9d1fc26 100644 --- a/tests/test-defines.h +++ b/tests/test-defines.h @@ -6,4 +6,5 @@ #define TEST_STATE_S "active" #define TEST_CATEGORY CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS #define TEST_CATEGORY_S "application-status" +#define TEST_OBJECT "/an/object/path/to/use" diff --git a/tests/test-libcustomindicator-dbus-client.c b/tests/test-libcustomindicator-dbus-client.c index bdc0fa6..e0203c0 100644 --- a/tests/test-libcustomindicator-dbus-client.c +++ b/tests/test-libcustomindicator-dbus-client.c @@ -158,6 +158,24 @@ prop_menu_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data) { propcount++; + 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 menu object failed: %s", error->message); + g_error_free(error); + passed = FALSE; + check_propcount(); + return; + } + + if (g_strcmp0(TEST_OBJECT, g_value_get_string(&value))) { + g_debug("Property menu object Returned: FAILED"); + passed = FALSE; + } else { + g_debug("Property menu object Returned: PASSED"); + } + check_propcount(); return; } diff --git a/tests/test-libcustomindicator-dbus-server.c b/tests/test-libcustomindicator-dbus-server.c index 4c9dcb9..2d61776 100644 --- a/tests/test-libcustomindicator-dbus-server.c +++ b/tests/test-libcustomindicator-dbus-server.c @@ -21,12 +21,15 @@ main (gint argc, gchar * argv[]) g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL)))); + DbusmenuServer * dms = dbusmenu_server_new(TEST_OBJECT); + CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, "id", TEST_ID, "category-enum", TEST_CATEGORY, "status-enum", TEST_STATE, "icon-name", TEST_ICON_NAME, "attention-icon-name", TEST_ATTENTION_ICON_NAME, + "menu-object", dms, NULL)); g_timeout_add_seconds(2, kill_func, NULL); -- cgit v1.2.3