aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am7
-rw-r--r--tests/test-glib-layout-client.c4
-rw-r--r--tests/test-glib-properties-client.c12
-rw-r--r--tests/test-glib-properties-server.c6
-rw-r--r--tests/test-glib-properties.h12
-rw-r--r--tests/test-gtk-label.json4
6 files changed, 26 insertions, 19 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5297dbd..746ac23 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -231,10 +231,15 @@ examplesdir = $(docdir)/examples/
examples_DATA = \
$(glib_server_nomenu_SOURCES)
+jsondir = $(datadir)/${PACKAGE}/json/
+
+json_DATA = \
+ test-gtk-label.json
+
EXTRA_DIST = \
$(examples_DATA) \
run-xvfb.sh \
- test-gtk-label.json \
+ $(json_DATA) \
dbusmenu-gtk/dbusMenuTest \
dbusmenu-gtk/mago_tests/dbusmenu.xml \
dbusmenu-gtk/mago_tests/dbusmenu.py \
diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c
index 82228b5..5ea0cf8 100644
--- a/tests/test-glib-layout-client.c
+++ b/tests/test-glib-layout-client.c
@@ -57,13 +57,13 @@ verify_root_to_layout(DbusmenuMenuitem * mi, layout_t * layout)
}
guint i = 0;
- for (i = 0; children != NULL && layout->submenu[i].id != 0; children = g_list_next(children), i++) {
+ for (i = 0; children != NULL && layout->submenu[i].id != -1; children = g_list_next(children), i++) {
if (!verify_root_to_layout(DBUSMENU_MENUITEM(children->data), &layout->submenu[i])) {
return FALSE;
}
}
- if (children == NULL && layout->submenu[i].id == 0) {
+ if (children == NULL && layout->submenu[i].id == -1) {
return TRUE;
}
diff --git a/tests/test-glib-properties-client.c b/tests/test-glib-properties-client.c
index 39815aa..434465a 100644
--- a/tests/test-glib-properties-client.c
+++ b/tests/test-glib-properties-client.c
@@ -60,8 +60,10 @@ verify_root_to_layout(DbusmenuMenuitem * mi, proplayout_t * layout)
g_debug("Verifying ID: %d", layout->id);
if (layout->id != dbusmenu_menuitem_get_id(mi)) {
- g_debug("\tFailed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi));
- return FALSE;
+ if (!dbusmenu_menuitem_get_root(mi)) {
+ g_debug("\tFailed as ID %d is not equal to %d", layout->id, dbusmenu_menuitem_get_id(mi));
+ return FALSE;
+ }
}
if (!verify_props(mi, layout->properties)) {
@@ -85,13 +87,13 @@ verify_root_to_layout(DbusmenuMenuitem * mi, proplayout_t * layout)
}
guint i = 0;
- for (i = 0; children != NULL && layout->submenu[i].id != 0; children = g_list_next(children), i++) {
+ for (i = 0; children != NULL && layout->submenu[i].id != -1; children = g_list_next(children), i++) {
if (!verify_root_to_layout(DBUSMENU_MENUITEM(children->data), &layout->submenu[i])) {
return FALSE;
}
}
- if (children == NULL && layout->submenu[i].id == 0) {
+ if (children == NULL && layout->submenu[i].id == -1) {
g_debug("\tPassed: %d", layout->id);
return TRUE;
}
@@ -140,7 +142,7 @@ layout_verify_timer (gpointer data)
layouton++;
- if (layouts[layouton].id == 0) {
+ if (layouts[layouton].id == -1) {
g_main_loop_quit(mainloop);
}
diff --git a/tests/test-glib-properties-server.c b/tests/test-glib-properties-server.c
index 8dad37f..091e550 100644
--- a/tests/test-glib-properties-server.c
+++ b/tests/test-glib-properties-server.c
@@ -46,14 +46,14 @@ set_props (DbusmenuMenuitem * mi, gchar ** props)
static DbusmenuMenuitem *
layout2menuitem (proplayout_t * layout)
{
- if (layout == NULL || layout->id == 0) return NULL;
+ if (layout == NULL || layout->id == -1) return NULL;
DbusmenuMenuitem * local = dbusmenu_menuitem_new_with_id(layout->id);
set_props(local, layout->properties);
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);
@@ -72,7 +72,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-properties.h b/tests/test-glib-properties.h
index 5e83f5c..c0c929a 100644
--- a/tests/test-glib-properties.h
+++ b/tests/test-glib-properties.h
@@ -24,7 +24,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
typedef struct _proplayout_t proplayout_t;
struct _proplayout_t {
- guint id;
+ gint id;
gchar ** properties;
proplayout_t * submenu;
};
@@ -68,7 +68,7 @@ proplayout_t submenu_4_1[] = {
{id: 17, properties: props2, submenu: NULL},
{id: 18, properties: props2, submenu: NULL},
{id: 19, properties: props2, submenu: NULL},
- {id: 0, properties: NULL, submenu: NULL}
+ {id: -1, properties: NULL, submenu: NULL}
};
proplayout_t submenu_4_2[] = {
@@ -82,7 +82,7 @@ proplayout_t submenu_4_2[] = {
{id: 27, properties: props2, submenu: NULL},
{id: 28, properties: props2, submenu: NULL},
{id: 29, properties: props2, submenu: NULL},
- {id: 0, properties: NULL, submenu: NULL}
+ {id: -1, properties: NULL, submenu: NULL}
};
proplayout_t submenu_4_3[] = {
@@ -96,14 +96,14 @@ proplayout_t submenu_4_3[] = {
{id: 37, properties: props2, submenu: NULL},
{id: 38, properties: props2, submenu: NULL},
{id: 39, properties: props2, submenu: NULL},
- {id: 0, properties: NULL, submenu: NULL}
+ {id: -1, properties: NULL, submenu: NULL}
};
proplayout_t submenu_4_0[] = {
{id: 1, properties: props2, submenu: submenu_4_1},
{id: 2, properties: props2, submenu: submenu_4_2},
{id: 3, properties: props2, submenu: submenu_4_3},
- {id: 0, properties: NULL, submenu: NULL}
+ {id: -1, properties: NULL, submenu: NULL}
};
proplayout_t layouts[] = {
@@ -111,6 +111,6 @@ proplayout_t layouts[] = {
{id: 10, properties: props2, submenu: NULL},
{id: 20, properties: props3, submenu: NULL},
{id: 100, properties: props2, submenu: submenu_4_0},
- {id: 0, properties: NULL, submenu: NULL}
+ {id: -1, properties: NULL, submenu: NULL}
};
diff --git a/tests/test-gtk-label.json b/tests/test-gtk-label.json
index 1a46dcf..973ab7b 100644
--- a/tests/test-gtk-label.json
+++ b/tests/test-gtk-label.json
@@ -198,7 +198,7 @@
{"id": 39, "type": "standard",
"label": "value39"}
]
- },
+ }
]
},
{"id": 8, "type": "standard",
@@ -367,5 +367,5 @@ QmCC",
"toggle-state": -1
}
]
- },
+ }
]
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 16:22:20 +0000