aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-04 23:18:24 -0800
committerTed Gould <ted@gould.cx>2010-02-04 23:18:24 -0800
commita94d7042028da404cb336c0a0e9fcdadb2406a61 (patch)
tree826a9ab4be3bb146d5ce023bc4aa5624f23577bc /tests
parent4c4e8cb681afda3eb23befa3db88fd05852d7d6a (diff)
downloadlibdbusmenu-a94d7042028da404cb336c0a0e9fcdadb2406a61.tar.gz
libdbusmenu-a94d7042028da404cb336c0a0e9fcdadb2406a61.tar.bz2
libdbusmenu-a94d7042028da404cb336c0a0e9fcdadb2406a61.zip
Changing key value to -1 and having the id be a gint. Also not working about id mismatch with root.
Diffstat (limited to 'tests')
-rw-r--r--tests/test-glib-layout-client.c8
-rw-r--r--tests/test-glib-layout-server.c4
-rw-r--r--tests/test-glib-layout.h22
3 files changed, 18 insertions, 16 deletions
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index bb2d13a..82228b5 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -36,8 +36,10 @@ verify_root_to_layout(DbusmenuMenuitem * mi, layout_t * layout)
g_debug("Verifying ID: %d", layout->id);
if (layout->id != dbusmenu_menuitem_get_id(mi)) {
- g_debug("Failed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi));
- return FALSE;
+ if (!(dbusmenu_menuitem_get_root(mi) && dbusmenu_menuitem_get_id(mi) == 0)) {
+ g_debug("Failed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi));
+ return FALSE;
+ }
}
GList * children = dbusmenu_menuitem_get_children(mi);
@@ -88,7 +90,7 @@ layout_updated (DbusmenuClient * client, gpointer data)
layouton++;
- if (layouts[layouton].id == 0) {
+ if (layouts[layouton].id == -1) {
g_main_loop_quit(mainloop);
}
diff --git a/tests/test-glib-layout-server.c b/tests/test-glib-layout-server.c
index 40dd048..111e164 100644
--- a/tests/test-glib-layout-server.c
+++ b/tests/test-glib-layout-server.c
@@ -41,7 +41,7 @@ layout2menuitem (layout_t * layout)
if (layout->submenu != NULL) {
guint count;
- for (count = 0; layout->submenu[count].id != 0; count++) {
+ for (count = 0; layout->submenu[count].id != -1; count++) {
DbusmenuMenuitem * child = layout2menuitem(&layout->submenu[count]);
if (child != NULL) {
dbusmenu_menuitem_child_append(local, child);
@@ -60,7 +60,7 @@ static GMainLoop * mainloop = NULL;
static gboolean
timer_func (gpointer data)
{
- if (layouts[layouton].id == 0) {
+ if (layouts[layouton].id == -1) {
g_main_loop_quit(mainloop);
return FALSE;
}
diff --git a/tests/test-glib-layout.h b/tests/test-glib-layout.h
index a13125d..b64c4ea 100644
--- a/tests/test-glib-layout.h
+++ b/tests/test-glib-layout.h
@@ -21,51 +21,51 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
typedef struct _layout_t layout_t;
struct _layout_t {
- guint id;
+ gint id;
layout_t * submenu;
};
layout_t submenu_2[] = {
{id: 2, submenu: NULL},
{id: 3, submenu: NULL},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_3_1[] = {
{id: 3, submenu: NULL},
{id: 4, submenu: NULL},
{id: 5, submenu: NULL},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_3_2[] = {
{id: 7, submenu: NULL},
{id: 8, submenu: NULL},
{id: 9, submenu: NULL},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_3[] = {
{id: 2, submenu: submenu_3_1},
{id: 6, submenu: submenu_3_2},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_4_1[] = {
{id: 6, submenu: NULL},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_4_2[] = {
{id: 5, submenu: submenu_4_1},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_4_3[] = {
{id: 4, submenu: submenu_4_2},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_4_4[] = {
{id: 3, submenu: submenu_4_3},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t submenu_4_5[] = {
{id: 2, submenu: submenu_4_4},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};
layout_t layouts[] = {
@@ -73,6 +73,6 @@ layout_t layouts[] = {
{id: 1, submenu: submenu_2},
{id: 1, submenu: submenu_3},
{id: 1, submenu: submenu_4_5},
- {id: 0, submenu: NULL}
+ {id: -1, submenu: NULL}
};