aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-10-22 16:19:40 -0500
committerTed Gould <ted@canonical.com>2009-10-22 16:19:40 -0500
commit1b71a85918d149eb4fdd8f3213ddc52dabc6b684 (patch)
tree09c21cb5f41880c1a7b28527655a374cebb9b61a
parentd6cc9393161f536e479ab8ec2c175c7237b40df4 (diff)
downloadlibayatana-appindicator-1b71a85918d149eb4fdd8f3213ddc52dabc6b684.tar.gz
libayatana-appindicator-1b71a85918d149eb4fdd8f3213ddc52dabc6b684.tar.bz2
libayatana-appindicator-1b71a85918d149eb4fdd8f3213ddc52dabc6b684.zip
Adding in testing the location of the dbusmenuserver
-rw-r--r--tests/test-defines.h1
-rw-r--r--tests/test-libcustomindicator-dbus-client.c18
-rw-r--r--tests/test-libcustomindicator-dbus-server.c3
3 files changed, 22 insertions, 0 deletions
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);