From fc94d1e23d37901d6aebc2e48abde37814512286 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 5 Oct 2009 09:57:59 -0400 Subject: Make the item use the correct label --- tests/test-gtk-reorder-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-gtk-reorder-server.c b/tests/test-gtk-reorder-server.c index 2fd9bf7..eee9bb8 100644 --- a/tests/test-gtk-reorder-server.c +++ b/tests/test-gtk-reorder-server.c @@ -66,7 +66,7 @@ timer_func (gpointer data) for (i = 0; i < NUMBER_ENTRIES; i++) { g_debug("Putting entry '%d' at position '%d'", i, ordering[test][i]); dbusmenu_menuitem_child_reorder(root, entries[i], ordering[test][i]); - dbusmenu_menuitem_property_set(entries[i], "label", names[i]); + dbusmenu_menuitem_property_set(entries[i], "label", names[ordering[test][i]]); } test++; -- cgit v1.2.3 From a2c6731fc3298db13c700dbaec978af4c8eafe28 Mon Sep 17 00:00:00 2001 From: Ara Pulido Date: Wed, 7 Oct 2009 12:55:40 +0200 Subject: Fix mago tests for karmic version --- tests/dbusmenu-gtk/Makefile.am | 44 +++--- tests/dbusmenu-gtk/data/blank_label.json | 26 ---- tests/dbusmenu-gtk/data/blank_label_2levels.json | 82 ----------- tests/dbusmenu-gtk/data/blank_submenus.json | 48 ------- tests/dbusmenu-gtk/data/dynamic.json | 158 --------------------- tests/dbusmenu-gtk/data/long_label.json | 82 ----------- tests/dbusmenu-gtk/data/no_id.json | 24 ---- tests/dbusmenu-gtk/data/no_label.json | 24 ---- tests/dbusmenu-gtk/data/sameid_submenus.json | 82 ----------- .../data/sameid_submenus_diff_sizes.json | 64 --------- .../dbusmenu-gtk/data/sameid_top_and_submenus.json | 82 ----------- tests/dbusmenu-gtk/data/sameid_topmenu.json | 158 --------------------- tests/dbusmenu-gtk/data/several_submenus.json | 51 ------- .../data/several_submenus_recursive.json | 49 ------- tests/dbusmenu-gtk/data/several_submenus_utf8.json | 51 ------- tests/dbusmenu-gtk/data/static.json | 26 ---- tests/dbusmenu-gtk/data/test-gtk-label.json | 158 --------------------- tests/dbusmenu-gtk/dbusMenuTest | 2 +- .../dbusmenu-gtk/mago_tests/data/blank_label.json | 26 ++++ .../mago_tests/data/blank_label_2levels.json | 82 +++++++++++ .../mago_tests/data/blank_submenus.json | 48 +++++++ tests/dbusmenu-gtk/mago_tests/data/dynamic.json | 158 +++++++++++++++++++++ tests/dbusmenu-gtk/mago_tests/data/long_label.json | 82 +++++++++++ tests/dbusmenu-gtk/mago_tests/data/no_id.json | 24 ++++ tests/dbusmenu-gtk/mago_tests/data/no_label.json | 24 ++++ .../mago_tests/data/sameid_submenus.json | 82 +++++++++++ .../data/sameid_submenus_diff_sizes.json | 64 +++++++++ .../mago_tests/data/sameid_top_and_submenus.json | 82 +++++++++++ .../mago_tests/data/sameid_topmenu.json | 158 +++++++++++++++++++++ .../mago_tests/data/several_submenus.json | 51 +++++++ .../data/several_submenus_recursive.json | 49 +++++++ .../mago_tests/data/several_submenus_utf8.json | 51 +++++++ tests/dbusmenu-gtk/mago_tests/data/static.json | 26 ++++ .../mago_tests/data/test-gtk-label.json | 158 +++++++++++++++++++++ 34 files changed, 1188 insertions(+), 1188 deletions(-) delete mode 100644 tests/dbusmenu-gtk/data/blank_label.json delete mode 100644 tests/dbusmenu-gtk/data/blank_label_2levels.json delete mode 100644 tests/dbusmenu-gtk/data/blank_submenus.json delete mode 100644 tests/dbusmenu-gtk/data/dynamic.json delete mode 100644 tests/dbusmenu-gtk/data/long_label.json delete mode 100644 tests/dbusmenu-gtk/data/no_id.json delete mode 100644 tests/dbusmenu-gtk/data/no_label.json delete mode 100644 tests/dbusmenu-gtk/data/sameid_submenus.json delete mode 100644 tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json delete mode 100644 tests/dbusmenu-gtk/data/sameid_top_and_submenus.json delete mode 100644 tests/dbusmenu-gtk/data/sameid_topmenu.json delete mode 100644 tests/dbusmenu-gtk/data/several_submenus.json delete mode 100644 tests/dbusmenu-gtk/data/several_submenus_recursive.json delete mode 100644 tests/dbusmenu-gtk/data/several_submenus_utf8.json delete mode 100644 tests/dbusmenu-gtk/data/static.json delete mode 100644 tests/dbusmenu-gtk/data/test-gtk-label.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/blank_label.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/dynamic.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/long_label.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/no_id.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/no_label.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/several_submenus.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/static.json create mode 100644 tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json (limited to 'tests') diff --git a/tests/dbusmenu-gtk/Makefile.am b/tests/dbusmenu-gtk/Makefile.am index 6acbbe0..7fdd6d9 100644 --- a/tests/dbusmenu-gtk/Makefile.am +++ b/tests/dbusmenu-gtk/Makefile.am @@ -4,39 +4,39 @@ check: tests tests: mago mago: dbusmenu.xml dbusmenu.py - PYTHONPATH=$(builddir) mago -f $(builddir)/dbusmenu.xml -t $(builddir)/mago.results + PYTHONPATH=$(builddir) mago -f dbusmenu.xml -t $(builddir)/mago.results dbusmenu.xml: dbusmenu.xml.in - sed -e "s|\@srcdir\@|$(srcdir)|" $< > $@ + sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@ dbusmenu.py: dbusmenu.py.in - sed -e "s|\@srcdir\@|$(srcdir)|" $< > $@ + sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@ EXTRA_DIST = \ dbusmenu.xml.in \ dbusmenu.py.in \ dbusMenuTest \ - data/blank_label_2levels.json \ - data/blank_label.json \ - data/blank_submenus.json \ - data/dynamic.json \ - data/long_label.json \ - data/no_id.json \ - data/no_label.json \ - data/sameid_submenus_diff_sizes.json \ - data/sameid_submenus.json \ - data/sameid_top_and_submenus.json \ - data/sameid_topmenu.json \ - data/several_submenus.json \ - data/several_submenus_recursive.json \ - data/several_submenus_utf8.json \ - data/static.json \ - data/test-gtk-label.json + mago_tests/data/blank_label_2levels.json \ + mago_tests/data/blank_label.json \ + mago_tests/data/blank_submenus.json \ + mago_tests/data/dynamic.json \ + mago_tests/data/long_label.json \ + mago_tests/data/no_id.json \ + mago_tests/data/no_label.json \ + mago_tests/data/sameid_submenus_diff_sizes.json \ + mago_tests/data/sameid_submenus.json \ + mago_tests/data/sameid_top_and_submenus.json \ + mago_tests/data/sameid_topmenu.json \ + mago_tests/data/several_submenus.json \ + mago_tests/data/several_submenus_recursive.json \ + mago_tests/data/several_submenus_utf8.json \ + mago_tests/data/static.json \ + mago_tests/data/test-gtk-label.json CLEANFILES = \ - dbusmenu.xml \ - dbusmenu.pyc \ - dbusmenu.py + mago_tests/dbusmenu.xml \ + mago_tests/dbusmenu.pyc \ + mago_tests/dbusmenu.py distclean-local: -rm -rf $(builddir)/mago.results diff --git a/tests/dbusmenu-gtk/data/blank_label.json b/tests/dbusmenu-gtk/data/blank_label.json deleted file mode 100644 index d62d49b..0000000 --- a/tests/dbusmenu-gtk/data/blank_label.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - {"id": 1, - "label": "", - "submenu": [ - {"id": 30, - "label": ""}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }] diff --git a/tests/dbusmenu-gtk/data/blank_label_2levels.json b/tests/dbusmenu-gtk/data/blank_label_2levels.json deleted file mode 100644 index e3335a5..0000000 --- a/tests/dbusmenu-gtk/data/blank_label_2levels.json +++ /dev/null @@ -1,82 +0,0 @@ -[ - {"id": 4, - "label": "", - "submenu": [ - {"id": 5, - "label": "", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 6, - "label": "", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 7, - "label": "", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/blank_submenus.json b/tests/dbusmenu-gtk/data/blank_submenus.json deleted file mode 100644 index 2eaff27..0000000 --- a/tests/dbusmenu-gtk/data/blank_submenus.json +++ /dev/null @@ -1,48 +0,0 @@ -[ - {"id": 4, - "label": "value2", - "submenu": [ - {"id": 5, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - ] - }, - {"id": 7, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/dynamic.json b/tests/dbusmenu-gtk/data/dynamic.json deleted file mode 100644 index efa7a75..0000000 --- a/tests/dbusmenu-gtk/data/dynamic.json +++ /dev/null @@ -1,158 +0,0 @@ -[ - {"id": 1, - "label": "value1", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - {"id": 1, - "label": "value2", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 1, - "label": "a super long label that is really of unreasonable length but we should make sure it makes it across the bus", - "not.a.value": "A useless value", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 1, - "label": "value2", - "submenu": [ - {"id": 5, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value100000"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 7, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/long_label.json b/tests/dbusmenu-gtk/data/long_label.json deleted file mode 100644 index 7cacb7f..0000000 --- a/tests/dbusmenu-gtk/data/long_label.json +++ /dev/null @@ -1,82 +0,0 @@ -[ - {"id": 4, - "label": "", - "submenu": [ - {"id": 5, - "label": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 6, - "label": "", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 7, - "label": "", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/no_id.json b/tests/dbusmenu-gtk/data/no_id.json deleted file mode 100644 index 201408a..0000000 --- a/tests/dbusmenu-gtk/data/no_id.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { "label": "I dont have an id", - "submenu": [ - {"label": "30", "submenu": [{"label": "submenu_from_no_id"}]}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }] diff --git a/tests/dbusmenu-gtk/data/no_label.json b/tests/dbusmenu-gtk/data/no_label.json deleted file mode 100644 index c651cbc..0000000 --- a/tests/dbusmenu-gtk/data/no_label.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - {"id": 1, "label": "hey", - "submenu": [ - {"id": 30, "submenu": [{"id":500, "label": "submenu_from_no_label"}]}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }] diff --git a/tests/dbusmenu-gtk/data/sameid_submenus.json b/tests/dbusmenu-gtk/data/sameid_submenus.json deleted file mode 100644 index a61c92b..0000000 --- a/tests/dbusmenu-gtk/data/sameid_submenus.json +++ /dev/null @@ -1,82 +0,0 @@ -[ - {"id": 4, - "label": "value2", - "submenu": [ - {"id": 6, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 6, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json b/tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json deleted file mode 100644 index d8f36c6..0000000 --- a/tests/dbusmenu-gtk/data/sameid_submenus_diff_sizes.json +++ /dev/null @@ -1,64 +0,0 @@ -[ - {"id": 4, - "label": "value2", - "submenu": [ - {"id": 6, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 6, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/sameid_top_and_submenus.json b/tests/dbusmenu-gtk/data/sameid_top_and_submenus.json deleted file mode 100644 index 102720f..0000000 --- a/tests/dbusmenu-gtk/data/sameid_top_and_submenus.json +++ /dev/null @@ -1,82 +0,0 @@ -[ - {"id": 4, - "label": "value2", - "submenu": [ - {"id": 4, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 4, - "label": "value6", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 4, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/sameid_topmenu.json b/tests/dbusmenu-gtk/data/sameid_topmenu.json deleted file mode 100644 index ee9d97f..0000000 --- a/tests/dbusmenu-gtk/data/sameid_topmenu.json +++ /dev/null @@ -1,158 +0,0 @@ -[ - {"id": 1, - "label": "value1", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - {"id": 1, - "label": "value2", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 1, - "label": "a super long label that is really of unreasonable length but we should make sure it makes it across the bus", - "not.a.value": "A useless value", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 1, - "label": "value2", - "submenu": [ - {"id": 5, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 7, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/several_submenus.json b/tests/dbusmenu-gtk/data/several_submenus.json deleted file mode 100644 index 3b9bb98..0000000 --- a/tests/dbusmenu-gtk/data/several_submenus.json +++ /dev/null @@ -1,51 +0,0 @@ -[ - {"id": 4, - "label": "value2", - "submenu": [ - {"id": 5, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - ] - }, - {"id": 7, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30", - "submenu": [ - {"id": 4, "label": "value99", "nonsenses": "useless"} - ]}, - {"id": 31, - "label": "alue31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/several_submenus_recursive.json b/tests/dbusmenu-gtk/data/several_submenus_recursive.json deleted file mode 100644 index 1320ef4..0000000 --- a/tests/dbusmenu-gtk/data/several_submenus_recursive.json +++ /dev/null @@ -1,49 +0,0 @@ -[ - {"id": 4, - "label": "value2", - "submenu": [ - {"id": 5, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - ] - }, - {"id": 7, - "label": "value7", - "submenu": [ - {"id": 31, - "label": "value30", - "submenu": [{"id": 301, "label": "value301", "submenu": [{"id": 3001, "label": "value3001", "submenu": [{"id": 5001, "label": "value5001", "submenu": [{"id": 7001, "label": "value7001"}]}]}]}, {"id": 88, "label": "value88"}]}, - {"id": 30, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/several_submenus_utf8.json b/tests/dbusmenu-gtk/data/several_submenus_utf8.json deleted file mode 100644 index b7b07f9..0000000 --- a/tests/dbusmenu-gtk/data/several_submenus_utf8.json +++ /dev/null @@ -1,51 +0,0 @@ -[ - {"id": 4, - "label": "value2ñ", - "submenu": [ - {"id": 5, - "label": "value5ス", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"} - ] - }, - {"id": 6, - "label": "value6ñ", - "submenu": [ - ] - }, - {"id": 7, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30", - "submenu": [ - {"id": 50, "label": "value9", "nonsenses": "useless"} - ]}, - {"id": 31, - "label": "alue31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/data/static.json b/tests/dbusmenu-gtk/data/static.json deleted file mode 100644 index dec591a..0000000 --- a/tests/dbusmenu-gtk/data/static.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - {"id": 1, - "label": "value1", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }] diff --git a/tests/dbusmenu-gtk/data/test-gtk-label.json b/tests/dbusmenu-gtk/data/test-gtk-label.json deleted file mode 100644 index 64c1386..0000000 --- a/tests/dbusmenu-gtk/data/test-gtk-label.json +++ /dev/null @@ -1,158 +0,0 @@ -[ - {"id": 1, - "label": "value1", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - {"id": 2, - "label": "value2", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 3, - "label": "a super long label that is really of unreasonable length but we should make sure it makes it across the bus", - "not.a.value": "A useless value", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 4, - "label": "value2", - "submenu": [ - {"id": 5, - "label": "value5", - "submenu": [ - {"id": 10, - "label": "value10"}, - {"id": 11, - "label": "value11"}, - {"id": 12, - "label": "value12"}, - {"id": 13, - "label": "value13"}, - {"id": 14, - "label": "value14"}, - {"id": 15, - "label": "value15"}, - {"id": 16, - "label": "value16"}, - {"id": 17, - "label": "value17"}, - {"id": 18, - "label": "value18"}, - {"id": 19, - "label": "value19"} - ] - }, - {"id": 6, - "label": "value6", - "submenu": [ - {"id": 20, - "label": "value20"}, - {"id": 21, - "label": "value21"}, - {"id": 22, - "label": "value22"}, - {"id": 23, - "label": "value23"}, - {"id": 24, - "label": "value24"}, - {"id": 25, - "label": "value25"}, - {"id": 26, - "label": "value26"}, - {"id": 27, - "label": "value27"}, - {"id": 28, - "label": "value28"}, - {"id": 29, - "label": "value29"} - ] - }, - {"id": 7, - "label": "value7", - "submenu": [ - {"id": 30, - "label": "value30"}, - {"id": 31, - "label": "value31"}, - {"id": 32, - "label": "value32"}, - {"id": 33, - "label": "value33"}, - {"id": 34, - "label": "value34"}, - {"id": 35, - "label": "value35"}, - {"id": 36, - "label": "value36"}, - {"id": 37, - "label": "value37"}, - {"id": 38, - "label": "value38"}, - {"id": 39, - "label": "value39"} - ] - }, - ] - } -] diff --git a/tests/dbusmenu-gtk/dbusMenuTest b/tests/dbusmenu-gtk/dbusMenuTest index 46c5f67..0815a79 100755 --- a/tests/dbusmenu-gtk/dbusMenuTest +++ b/tests/dbusmenu-gtk/dbusMenuTest @@ -3,6 +3,6 @@ export NO_GAIL=0 export NO_AT_BRIDGE=0 -dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task ../test-gtk-label-client --task-name Client --task ../test-gtk-label-server --parameter ./$1 --task-name Server --ignore-return +dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task ../test-gtk-label-client --task-name Client --task ../test-gtk-label-server --parameter ./mago_tests/$1 --task-name Server --ignore-return diff --git a/tests/dbusmenu-gtk/mago_tests/data/blank_label.json b/tests/dbusmenu-gtk/mago_tests/data/blank_label.json new file mode 100644 index 0000000..d62d49b --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/blank_label.json @@ -0,0 +1,26 @@ +[ + {"id": 1, + "label": "", + "submenu": [ + {"id": 30, + "label": ""}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }] diff --git a/tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json b/tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json new file mode 100644 index 0000000..e3335a5 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/blank_label_2levels.json @@ -0,0 +1,82 @@ +[ + {"id": 4, + "label": "", + "submenu": [ + {"id": 5, + "label": "", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 6, + "label": "", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 7, + "label": "", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json new file mode 100644 index 0000000..2eaff27 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/blank_submenus.json @@ -0,0 +1,48 @@ +[ + {"id": 4, + "label": "value2", + "submenu": [ + {"id": 5, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + ] + }, + {"id": 7, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/dynamic.json b/tests/dbusmenu-gtk/mago_tests/data/dynamic.json new file mode 100644 index 0000000..efa7a75 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/dynamic.json @@ -0,0 +1,158 @@ +[ + {"id": 1, + "label": "value1", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + {"id": 1, + "label": "value2", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 1, + "label": "a super long label that is really of unreasonable length but we should make sure it makes it across the bus", + "not.a.value": "A useless value", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 1, + "label": "value2", + "submenu": [ + {"id": 5, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value100000"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 7, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/long_label.json b/tests/dbusmenu-gtk/mago_tests/data/long_label.json new file mode 100644 index 0000000..7cacb7f --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/long_label.json @@ -0,0 +1,82 @@ +[ + {"id": 4, + "label": "", + "submenu": [ + {"id": 5, + "label": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 6, + "label": "", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 7, + "label": "", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/no_id.json b/tests/dbusmenu-gtk/mago_tests/data/no_id.json new file mode 100644 index 0000000..201408a --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/no_id.json @@ -0,0 +1,24 @@ +[ + { "label": "I dont have an id", + "submenu": [ + {"label": "30", "submenu": [{"label": "submenu_from_no_id"}]}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }] diff --git a/tests/dbusmenu-gtk/mago_tests/data/no_label.json b/tests/dbusmenu-gtk/mago_tests/data/no_label.json new file mode 100644 index 0000000..c651cbc --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/no_label.json @@ -0,0 +1,24 @@ +[ + {"id": 1, "label": "hey", + "submenu": [ + {"id": 30, "submenu": [{"id":500, "label": "submenu_from_no_label"}]}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }] diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json new file mode 100644 index 0000000..a61c92b --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus.json @@ -0,0 +1,82 @@ +[ + {"id": 4, + "label": "value2", + "submenu": [ + {"id": 6, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 6, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json new file mode 100644 index 0000000..d8f36c6 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json @@ -0,0 +1,64 @@ +[ + {"id": 4, + "label": "value2", + "submenu": [ + {"id": 6, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 6, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json new file mode 100644 index 0000000..102720f --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json @@ -0,0 +1,82 @@ +[ + {"id": 4, + "label": "value2", + "submenu": [ + {"id": 4, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 4, + "label": "value6", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 4, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json b/tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json new file mode 100644 index 0000000..ee9d97f --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/sameid_topmenu.json @@ -0,0 +1,158 @@ +[ + {"id": 1, + "label": "value1", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + {"id": 1, + "label": "value2", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 1, + "label": "a super long label that is really of unreasonable length but we should make sure it makes it across the bus", + "not.a.value": "A useless value", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 1, + "label": "value2", + "submenu": [ + {"id": 5, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 7, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/several_submenus.json b/tests/dbusmenu-gtk/mago_tests/data/several_submenus.json new file mode 100644 index 0000000..3b9bb98 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/several_submenus.json @@ -0,0 +1,51 @@ +[ + {"id": 4, + "label": "value2", + "submenu": [ + {"id": 5, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + ] + }, + {"id": 7, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30", + "submenu": [ + {"id": 4, "label": "value99", "nonsenses": "useless"} + ]}, + {"id": 31, + "label": "alue31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json new file mode 100644 index 0000000..1320ef4 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json @@ -0,0 +1,49 @@ +[ + {"id": 4, + "label": "value2", + "submenu": [ + {"id": 5, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + ] + }, + {"id": 7, + "label": "value7", + "submenu": [ + {"id": 31, + "label": "value30", + "submenu": [{"id": 301, "label": "value301", "submenu": [{"id": 3001, "label": "value3001", "submenu": [{"id": 5001, "label": "value5001", "submenu": [{"id": 7001, "label": "value7001"}]}]}]}, {"id": 88, "label": "value88"}]}, + {"id": 30, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json new file mode 100644 index 0000000..b7b07f9 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json @@ -0,0 +1,51 @@ +[ + {"id": 4, + "label": "value2ñ", + "submenu": [ + {"id": 5, + "label": "value5ス", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"} + ] + }, + {"id": 6, + "label": "value6ñ", + "submenu": [ + ] + }, + {"id": 7, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30", + "submenu": [ + {"id": 50, "label": "value9", "nonsenses": "useless"} + ]}, + {"id": 31, + "label": "alue31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] diff --git a/tests/dbusmenu-gtk/mago_tests/data/static.json b/tests/dbusmenu-gtk/mago_tests/data/static.json new file mode 100644 index 0000000..dec591a --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/static.json @@ -0,0 +1,26 @@ +[ + {"id": 1, + "label": "value1", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }] diff --git a/tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json b/tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json new file mode 100644 index 0000000..64c1386 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/data/test-gtk-label.json @@ -0,0 +1,158 @@ +[ + {"id": 1, + "label": "value1", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + {"id": 2, + "label": "value2", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 3, + "label": "a super long label that is really of unreasonable length but we should make sure it makes it across the bus", + "not.a.value": "A useless value", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 4, + "label": "value2", + "submenu": [ + {"id": 5, + "label": "value5", + "submenu": [ + {"id": 10, + "label": "value10"}, + {"id": 11, + "label": "value11"}, + {"id": 12, + "label": "value12"}, + {"id": 13, + "label": "value13"}, + {"id": 14, + "label": "value14"}, + {"id": 15, + "label": "value15"}, + {"id": 16, + "label": "value16"}, + {"id": 17, + "label": "value17"}, + {"id": 18, + "label": "value18"}, + {"id": 19, + "label": "value19"} + ] + }, + {"id": 6, + "label": "value6", + "submenu": [ + {"id": 20, + "label": "value20"}, + {"id": 21, + "label": "value21"}, + {"id": 22, + "label": "value22"}, + {"id": 23, + "label": "value23"}, + {"id": 24, + "label": "value24"}, + {"id": 25, + "label": "value25"}, + {"id": 26, + "label": "value26"}, + {"id": 27, + "label": "value27"}, + {"id": 28, + "label": "value28"}, + {"id": 29, + "label": "value29"} + ] + }, + {"id": 7, + "label": "value7", + "submenu": [ + {"id": 30, + "label": "value30"}, + {"id": 31, + "label": "value31"}, + {"id": 32, + "label": "value32"}, + {"id": 33, + "label": "value33"}, + {"id": 34, + "label": "value34"}, + {"id": 35, + "label": "value35"}, + {"id": 36, + "label": "value36"}, + {"id": 37, + "label": "value37"}, + {"id": 38, + "label": "value38"}, + {"id": 39, + "label": "value39"} + ] + }, + ] + } +] -- cgit v1.2.3 From dce80730186bfb61b1919652d71fc249b8df5f75 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Oct 2009 12:06:56 -0400 Subject: Making the mago tests run in the make file in tests and making it so that they use a standard Python file. --- tests/Makefile.am | 45 +++++++++++++-- tests/dbusmenu-gtk/Makefile.am | 8 +-- tests/dbusmenu-gtk/dbusmenu.py.in | 71 ------------------------ tests/dbusmenu-gtk/dbusmenu.xml.in | 89 ------------------------------ tests/dbusmenu-gtk/mago_tests/dbusmenu.py | 71 ++++++++++++++++++++++++ tests/dbusmenu-gtk/mago_tests/dbusmenu.xml | 89 ++++++++++++++++++++++++++++++ 6 files changed, 201 insertions(+), 172 deletions(-) delete mode 100644 tests/dbusmenu-gtk/dbusmenu.py.in delete mode 100644 tests/dbusmenu-gtk/dbusmenu.xml.in create mode 100644 tests/dbusmenu-gtk/mago_tests/dbusmenu.py create mode 100644 tests/dbusmenu-gtk/mago_tests/dbusmenu.xml (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index f111054..b93f90b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,8 @@ -SUBDIRS = dbusmenu-gtk DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf TESTS = \ + test-mago \ test-glib-layout \ test-glib-properties \ test-gtk-label \ @@ -35,7 +35,7 @@ glib_server_nomenu_LDADD = \ # Test Glib Layout ###################### -test-glib-layout: test-glib-layout-client test-glib-layout-server +test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am @echo "#!/bin/sh" > test-glib-layout @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> test-glib-layout @chmod +x test-glib-layout @@ -69,7 +69,7 @@ test_glib_layout_client_LDADD = \ # Test Glib Properties ###################### -test-glib-properties: test-glib-properties-client test-glib-properties-server +test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am @echo "#!/bin/sh" > test-glib-properties @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> test-glib-properties @chmod +x test-glib-properties @@ -117,7 +117,7 @@ test_glib_simple_items_LDADD = \ # Test GTK Label ######################### -test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json +test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am @echo "#!/bin/sh" > test-gtk-label @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-label @chmod +x test-gtk-label @@ -156,7 +156,7 @@ test_gtk_label_client_LDADD = \ # Test GTK Reorder ######################### -test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server +test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am @echo "#!/bin/sh" > test-gtk-reorder @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-reorder @chmod +x test-gtk-reorder @@ -176,6 +176,15 @@ test_gtk_reorder_server_LDADD = \ $(DBUSMENUGTK_LIBS) \ $(DBUSMENUTESTS_LIBS) +######################### +# Test Mago +######################### + +test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am + @echo "#!/bin/sh" > test-mago + @echo cd $(srcdir)/dbusmenu-gtk >> test-mago + @echo PYTHONPATH=$(srcdir)/dbusmenu-gtk/maga_tests:$(PYTHONPATH) mago -f dbusmenu.xml -t $(builddir)/mago.results >> test-mago + @chmod +x test-mago ######################### # Other @@ -188,7 +197,31 @@ examples_DATA = \ EXTRA_DIST = \ $(examples_DATA) \ - test-gtk-label.json + test-gtk-label.json \ + dbusmenu-gtk/dbusMenuTest \ + dbusmenu-gtk/mago_tests/data/blank_label_2levels.json \ + dbusmenu-gtk/mago_tests/data/blank_label.json \ + dbusmenu-gtk/mago_tests/data/blank_submenus.json \ + dbusmenu-gtk/mago_tests/data/dynamic.json \ + dbusmenu-gtk/mago_tests/data/long_label.json \ + dbusmenu-gtk/mago_tests/data/no_id.json \ + dbusmenu-gtk/mago_tests/data/no_label.json \ + dbusmenu-gtk/mago_tests/data/sameid_submenus_diff_sizes.json \ + dbusmenu-gtk/mago_tests/data/sameid_submenus.json \ + dbusmenu-gtk/mago_tests/data/sameid_top_and_submenus.json \ + dbusmenu-gtk/mago_tests/data/sameid_topmenu.json \ + dbusmenu-gtk/mago_tests/data/several_submenus.json \ + dbusmenu-gtk/mago_tests/data/several_submenus_recursive.json \ + dbusmenu-gtk/mago_tests/data/several_submenus_utf8.json \ + dbusmenu-gtk/mago_tests/data/static.json \ + dbusmenu-gtk/mago_tests/data/test-gtk-label.json + +CLEANFILES = \ + dbusmenu-gtk/mago_tests/dbusmenu.xml \ + dbusmenu-gtk/mago_tests/dbusmenu.pyc + +distclean-local: + -rm -rf $(builddir)/dbusmenu-gtk/mago.results DISTCLEANFILES = \ $(TESTS) diff --git a/tests/dbusmenu-gtk/Makefile.am b/tests/dbusmenu-gtk/Makefile.am index 7fdd6d9..1d4a09f 100644 --- a/tests/dbusmenu-gtk/Makefile.am +++ b/tests/dbusmenu-gtk/Makefile.am @@ -3,15 +3,12 @@ check: tests tests: mago -mago: dbusmenu.xml dbusmenu.py +mago: dbusmenu.xml mago_tests/dbusmenu.py PYTHONPATH=$(builddir) mago -f dbusmenu.xml -t $(builddir)/mago.results dbusmenu.xml: dbusmenu.xml.in sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@ -dbusmenu.py: dbusmenu.py.in - sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@ - EXTRA_DIST = \ dbusmenu.xml.in \ dbusmenu.py.in \ @@ -35,8 +32,7 @@ EXTRA_DIST = \ CLEANFILES = \ mago_tests/dbusmenu.xml \ - mago_tests/dbusmenu.pyc \ - mago_tests/dbusmenu.py + mago_tests/dbusmenu.pyc distclean-local: -rm -rf $(builddir)/mago.results diff --git a/tests/dbusmenu-gtk/dbusmenu.py.in b/tests/dbusmenu-gtk/dbusmenu.py.in deleted file mode 100644 index ce159e1..0000000 --- a/tests/dbusmenu-gtk/dbusmenu.py.in +++ /dev/null @@ -1,71 +0,0 @@ -from mago.test_suite.main import SingleApplicationTestSuite -from mago.application.main import Application - -import ldtp, ooldtp, ldtputils - -class DbusMenuGtkApp(): - LAUNCHER = "@srcdir@/dbusMenuTest" - WINDOW = "frmlibdbusmenu-gtktest" - - def open(self, menu_schema=''): - ldtp.launchapp(self.LAUNCHER, [menu_schema]) - - def menu_exists(self, menu=''): - app = ooldtp.context(self.WINDOW) - - if menu == '': - menu = "mnu1" - - try: - component = app.getchild(menu) - except ldtp.LdtpExecutionError: - return False - - return True - - def get_submenus(self, menu=''): - app = ooldtp.context(self.WINDOW) - - if menu == '': - menu = "mnu1" - - component = app.getchild(menu) - - try: - submenus = component.listsubmenus() - except ldtp.LdtpExecutionError: - return "" - - return submenus - -class DbusMenuGtkTest(SingleApplicationTestSuite): - APPLICATION_FACTORY = DbusMenuGtkApp - - def cleanup(self): - ldtp.waittillguinotexist(self.application.WINDOW, guiTimeOut=70) - - def teardown(self): - ldtp.waittillguinotexist(self.application.WINDOW, guiTimeOut=70) - - def testStaticMenu(self, menu_schema, menu_item='', notexists=''): - self.application.open(menu_schema) - ldtp.waittillguiexist(self.application.WINDOW) - - if notexists == "True": - if self.application.menu_exists(menu_item): - raise AssertionError("The menu item exists") - else: - if not self.application.menu_exists(menu_item): - raise AssertionError("The menu item does not exists") - - - def testSubmenus(self, menu_schema, menu_item='', submenus=''): - self.application.open(menu_schema) - ldtp.waittillguiexist(self.application.WINDOW) - - if submenus != self.application.get_submenus(menu_item): - raise AssertionError("The submenus are different") - - - - diff --git a/tests/dbusmenu-gtk/dbusmenu.xml.in b/tests/dbusmenu-gtk/dbusmenu.xml.in deleted file mode 100644 index b49ee5e..0000000 --- a/tests/dbusmenu-gtk/dbusmenu.xml.in +++ /dev/null @@ -1,89 +0,0 @@ - - - dbusmenu.DbusMenuGtkTest - - Test libdbusmenu-gtk. - - - testStaticMenu - Simple check for a menu - - @srcdir@/data/static.json - value39 - - - - testStaticMenu - Blank Label - - @srcdir@/data/blank_label.json - - - - - testSubmenus - Blank Submenus - - @srcdir@/data/blank_submenus.json - value6 - - - - - testStaticMenu - Really Long Label (1000 chars) - - @srcdir@/data/long_label.json - aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - - - - testStaticMenu - Search for a submenu that comes from a menu without ID - - @srcdir@/data/no_id.json - submenu_from_no_id - - - - testStaticMenu - Search for a submenu that comes from a menu with a blank label - - @srcdir@/data/blank_label_2levels.json - value10 - - - - testStaticMenu - Be sure that a submenu from a menu without label does not exist - - @srcdir@/data/no_label.json - submenu_from_no_label - True - - - - testStaticMenu - Check that a submenu is shown - - @srcdir@/data/several_submenus.json - value10 - - - - testStaticMenu - Be sure that a submenu from a 4th level depth, is shown - - @srcdir@/data/several_submenus_recursive.json - value7001 - - - - testStaticMenu - Be sure that a submenu, with a UTF-8 label, is shown - - @srcdir@/data/several_submenus_utf8.json - value5ス - - - diff --git a/tests/dbusmenu-gtk/mago_tests/dbusmenu.py b/tests/dbusmenu-gtk/mago_tests/dbusmenu.py new file mode 100644 index 0000000..5e9f691 --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/dbusmenu.py @@ -0,0 +1,71 @@ +from mago.test_suite.main import SingleApplicationTestSuite +from mago.application.main import Application + +import ldtp, ooldtp, ldtputils, os.path + +class DbusMenuGtkApp(): + LAUNCHER = os.path.join(os.path.dirname(__file__), "..", "dbusMenuTest") + WINDOW = "frmlibdbusmenu-gtktest" + + def open(self, menu_schema=''): + ldtp.launchapp(self.LAUNCHER, [menu_schema]) + + def menu_exists(self, menu=''): + app = ooldtp.context(self.WINDOW) + + if menu == '': + menu = "mnu1" + + try: + component = app.getchild(menu) + except ldtp.LdtpExecutionError: + return False + + return True + + def get_submenus(self, menu=''): + app = ooldtp.context(self.WINDOW) + + if menu == '': + menu = "mnu1" + + component = app.getchild(menu) + + try: + submenus = component.listsubmenus() + except ldtp.LdtpExecutionError: + return "" + + return submenus + +class DbusMenuGtkTest(SingleApplicationTestSuite): + APPLICATION_FACTORY = DbusMenuGtkApp + + def cleanup(self): + ldtp.waittillguinotexist(self.application.WINDOW, guiTimeOut=70) + + def teardown(self): + ldtp.waittillguinotexist(self.application.WINDOW, guiTimeOut=70) + + def testStaticMenu(self, menu_schema, menu_item='', notexists=''): + self.application.open(menu_schema) + ldtp.waittillguiexist(self.application.WINDOW) + + if notexists == "True": + if self.application.menu_exists(menu_item): + raise AssertionError("The menu item exists") + else: + if not self.application.menu_exists(menu_item): + raise AssertionError("The menu item does not exists") + + + def testSubmenus(self, menu_schema, menu_item='', submenus=''): + self.application.open(menu_schema) + ldtp.waittillguiexist(self.application.WINDOW) + + if submenus != self.application.get_submenus(menu_item): + raise AssertionError("The submenus are different") + + + + diff --git a/tests/dbusmenu-gtk/mago_tests/dbusmenu.xml b/tests/dbusmenu-gtk/mago_tests/dbusmenu.xml new file mode 100644 index 0000000..d02191e --- /dev/null +++ b/tests/dbusmenu-gtk/mago_tests/dbusmenu.xml @@ -0,0 +1,89 @@ + + + dbusmenu.DbusMenuGtkTest + + Test libdbusmenu-gtk. + + + testStaticMenu + Simple check for a menu + + data/static.json + value39 + + + + testStaticMenu + Blank Label + + data/blank_label.json + + + + + testSubmenus + Blank Submenus + + data/blank_submenus.json + value6 + + + + + testStaticMenu + Really Long Label (1000 chars) + + data/long_label.json + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + + + + testStaticMenu + Search for a submenu that comes from a menu without ID + + data/no_id.json + submenu_from_no_id + + + + testStaticMenu + Search for a submenu that comes from a menu with a blank label + + data/blank_label_2levels.json + value10 + + + + testStaticMenu + Be sure that a submenu from a menu without label does not exist + + data/no_label.json + submenu_from_no_label + True + + + + testStaticMenu + Check that a submenu is shown + + data/several_submenus.json + value10 + + + + testStaticMenu + Be sure that a submenu from a 4th level depth, is shown + + data/several_submenus_recursive.json + value7001 + + + + testStaticMenu + Be sure that a submenu, with a UTF-8 label, is shown + + data/several_submenus_utf8.json + value5ス + + + -- cgit v1.2.3 From 7d5da2654470e74cd6eb41facc8b68a2c74289cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Oct 2009 13:08:22 -0400 Subject: Setting up the mago paths to be absolute and correct. Also making sure it has the test files that it needs. --- tests/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index b93f90b..da25f57 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -183,7 +183,9 @@ test_gtk_reorder_server_LDADD = \ test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am @echo "#!/bin/sh" > test-mago @echo cd $(srcdir)/dbusmenu-gtk >> test-mago - @echo PYTHONPATH=$(srcdir)/dbusmenu-gtk/maga_tests:$(PYTHONPATH) mago -f dbusmenu.xml -t $(builddir)/mago.results >> test-mago + @echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago + @echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago + @echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> test-mago @chmod +x test-mago ######################### @@ -199,6 +201,8 @@ EXTRA_DIST = \ $(examples_DATA) \ test-gtk-label.json \ dbusmenu-gtk/dbusMenuTest \ + dbusmenu-gtk/mago_tests/dbusmenu.xml \ + dbusmenu-gtk/mago_tests/dbusmenu.py \ dbusmenu-gtk/mago_tests/data/blank_label_2levels.json \ dbusmenu-gtk/mago_tests/data/blank_label.json \ dbusmenu-gtk/mago_tests/data/blank_submenus.json \ -- cgit v1.2.3 From 462d25ae76f833ca7ac977406045833bb29fbbb4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 10 Oct 2009 15:40:47 -0400 Subject: Getting the build directly through to the script. --- tests/Makefile.am | 1 + tests/dbusmenu-gtk/dbusMenuTest | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index da25f57..10fe857 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -185,6 +185,7 @@ test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/ma @echo cd $(srcdir)/dbusmenu-gtk >> test-mago @echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago @echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago + @echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> test-mago @echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> test-mago @chmod +x test-mago diff --git a/tests/dbusmenu-gtk/dbusMenuTest b/tests/dbusmenu-gtk/dbusMenuTest index 0815a79..55a791b 100755 --- a/tests/dbusmenu-gtk/dbusMenuTest +++ b/tests/dbusmenu-gtk/dbusMenuTest @@ -3,6 +3,6 @@ export NO_GAIL=0 export NO_AT_BRIDGE=0 -dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task ../test-gtk-label-client --task-name Client --task ../test-gtk-label-server --parameter ./mago_tests/$1 --task-name Server --ignore-return +dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf --task $INDICATOR_BUILD_DIR/test-gtk-label-client --task-name Client --task $INDICATOR_BUILD_DIR/test-gtk-label-server --parameter ./mago_tests/$1 --task-name Server --ignore-return -- cgit v1.2.3 From 3912706e8bbfb7c0d33b7dff126a8c4ad6b110d1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 10 Oct 2009 15:45:12 -0400 Subject: Don't need that one anymore --- tests/dbusmenu-gtk/Makefile.am | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 tests/dbusmenu-gtk/Makefile.am (limited to 'tests') diff --git a/tests/dbusmenu-gtk/Makefile.am b/tests/dbusmenu-gtk/Makefile.am deleted file mode 100644 index 1d4a09f..0000000 --- a/tests/dbusmenu-gtk/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ - -check: tests - -tests: mago - -mago: dbusmenu.xml mago_tests/dbusmenu.py - PYTHONPATH=$(builddir) mago -f dbusmenu.xml -t $(builddir)/mago.results - -dbusmenu.xml: dbusmenu.xml.in - sed -e "s|\@srcdir\@|$(srcdir)|" $< > mago_tests/$@ - -EXTRA_DIST = \ - dbusmenu.xml.in \ - dbusmenu.py.in \ - dbusMenuTest \ - mago_tests/data/blank_label_2levels.json \ - mago_tests/data/blank_label.json \ - mago_tests/data/blank_submenus.json \ - mago_tests/data/dynamic.json \ - mago_tests/data/long_label.json \ - mago_tests/data/no_id.json \ - mago_tests/data/no_label.json \ - mago_tests/data/sameid_submenus_diff_sizes.json \ - mago_tests/data/sameid_submenus.json \ - mago_tests/data/sameid_top_and_submenus.json \ - mago_tests/data/sameid_topmenu.json \ - mago_tests/data/several_submenus.json \ - mago_tests/data/several_submenus_recursive.json \ - mago_tests/data/several_submenus_utf8.json \ - mago_tests/data/static.json \ - mago_tests/data/test-gtk-label.json - -CLEANFILES = \ - mago_tests/dbusmenu.xml \ - mago_tests/dbusmenu.pyc - -distclean-local: - -rm -rf $(builddir)/mago.results - -- cgit v1.2.3 From bba2d0aecb9ac87a822f343cad0f55002ed96dd6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 10 Oct 2009 16:43:33 -0400 Subject: Adding in basic xvfb stuff, doesn't quite work. --- tests/Makefile.am | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 10fe857..833c3fc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,6 @@ DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf TESTS = \ - test-mago \ test-glib-layout \ test-glib-properties \ test-gtk-label \ @@ -20,6 +19,33 @@ check_PROGRAMS = \ test-glib-simple-items \ test-gtk-reorder-server +check-local: test-mago-xvfb + +###################### +# Xvfb server stuff +###################### + +XVFB = Xvfb -ac -noreset -screen 0 800x600x16 +XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ + 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ + 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ + 9995 9996 9997 9998 9999 +XVFB_START = \ + ${XVFB} -help 2>/dev/null 1>&2 \ + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY +# call as: $(XVFB_START) && someprogram + + +###################### +# Test GLib server +###################### + glib_server_nomenu_SOURCES = \ glib-server-nomenu.c @@ -180,6 +206,9 @@ test_gtk_reorder_server_LDADD = \ # Test Mago ######################### +test-mago-xvfb: test-mago + $(XVFB_START) && ./test-mago + test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am @echo "#!/bin/sh" > test-mago @echo cd $(srcdir)/dbusmenu-gtk >> test-mago -- cgit v1.2.3 From 6ecd6e2c2a559612d256c6214b31e2881721b240 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 11:33:01 -0500 Subject: If we didn't pass, we shouldn't return 0 --- tests/test-glib-layout-client.c | 2 +- tests/test-glib-properties-client.c | 2 +- tests/test-gtk-label-client.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/test-glib-layout-client.c b/tests/test-glib-layout-client.c index 1b74544..a7dd683 100644 --- a/tests/test-glib-layout-client.c +++ b/tests/test-glib-layout-client.c @@ -126,6 +126,6 @@ main (int argc, char ** argv) return 0; } else { g_debug("Quiting as we're a failure"); - return 0; + return 1; } } diff --git a/tests/test-glib-properties-client.c b/tests/test-glib-properties-client.c index 4439788..39815aa 100644 --- a/tests/test-glib-properties-client.c +++ b/tests/test-glib-properties-client.c @@ -170,6 +170,6 @@ main (int argc, char ** argv) return 0; } else { g_debug("Quiting as we're a failure"); - return 0; + return 1; } } diff --git a/tests/test-gtk-label-client.c b/tests/test-gtk-label-client.c index b691f84..ffe029f 100644 --- a/tests/test-gtk-label-client.c +++ b/tests/test-gtk-label-client.c @@ -176,6 +176,6 @@ main (int argc, char ** argv) return 0; } else { g_debug("Quiting as we're a failure"); - return 0; + return 1; } } -- cgit v1.2.3 From 4e98b4e5469f082b7bee2bad37533056ded73d9f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 18 Nov 2009 15:39:05 -0600 Subject: Starting up the AT-SPI regististry service --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 833c3fc..9d17a03 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -212,6 +212,7 @@ test-mago-xvfb: test-mago test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am @echo "#!/bin/sh" > test-mago @echo cd $(srcdir)/dbusmenu-gtk >> test-mago + @echo /usr/lib/at-spi/at-spi-registryd & >> test-mago @echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago @echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago @echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> test-mago -- cgit v1.2.3 From 4cdbbb71476d5f3b6979f6cd43acf3b1ea1f1004 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:01:38 -0600 Subject: Trying to do the xvfb stuff as a shell script to get included. Simpler, and works with autotest. --- tests/Makefile.am | 48 ++++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 34 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 9d17a03..3443073 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,8 +4,11 @@ DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.c TESTS = \ test-glib-layout \ test-glib-properties \ - test-gtk-label \ test-glib-simple-items \ + test-mago + +GTK_TESTS = \ + test-gtk-label \ test-gtk-reorder check_PROGRAMS = \ @@ -19,28 +22,7 @@ check_PROGRAMS = \ test-glib-simple-items \ test-gtk-reorder-server -check-local: test-mago-xvfb - -###################### -# Xvfb server stuff -###################### - -XVFB = Xvfb -ac -noreset -screen 0 800x600x16 -XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ - 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ - 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ - 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ - 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ - 9995 9996 9997 9998 9999 -XVFB_START = \ - ${XVFB} -help 2>/dev/null 1>&2 \ - && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ - && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ - trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ - || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ - && DISPLAY=:$$XID && export DISPLAY -# call as: $(XVFB_START) && someprogram - +XVFB_RUN=". run-xvfb.sh" ###################### # Test GLib server @@ -206,18 +188,16 @@ test_gtk_reorder_server_LDADD = \ # Test Mago ######################### -test-mago-xvfb: test-mago - $(XVFB_START) && ./test-mago - test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am - @echo "#!/bin/sh" > test-mago - @echo cd $(srcdir)/dbusmenu-gtk >> test-mago - @echo /usr/lib/at-spi/at-spi-registryd & >> test-mago - @echo echo Mago Results dir: $(abs_builddir)/mago.results >> test-mago - @echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> test-mago - @echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> test-mago - @echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> test-mago - @chmod +x test-mago + @echo "#!/bin/sh" > $@ + @echo $(XVFB_RUN) >> $@ + @echo cd $(srcdir)/dbusmenu-gtk >> $@ + @echo /usr/lib/at-spi/at-spi-registryd \& >> $@ + @echo echo Mago Results dir: $(abs_builddir)/mago.results >> $@ + @echo echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests >> $@ + @echo export INDICATOR_BUILD_DIR=$(abs_builddir) >> $@ + @echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> $@ + @chmod +x $@ ######################### # Other -- cgit v1.2.3 From d8427db9d5559e49bbec99f0bd01aaeafa82b347 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:21:55 -0600 Subject: Switching to Bash --- tests/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 3443073..8523b06 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,7 +44,7 @@ glib_server_nomenu_LDADD = \ ###################### test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am - @echo "#!/bin/sh" > test-glib-layout + @echo "#!/bin/bash" > test-glib-layout @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> test-glib-layout @chmod +x test-glib-layout @@ -78,7 +78,7 @@ test_glib_layout_client_LDADD = \ ###################### test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am - @echo "#!/bin/sh" > test-glib-properties + @echo "#!/bin/bash" > test-glib-properties @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> test-glib-properties @chmod +x test-glib-properties @@ -126,7 +126,7 @@ test_glib_simple_items_LDADD = \ ######################### test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am - @echo "#!/bin/sh" > test-gtk-label + @echo "#!/bin/bash" > test-gtk-label @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-label @chmod +x test-gtk-label @@ -165,7 +165,7 @@ test_gtk_label_client_LDADD = \ ######################### test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am - @echo "#!/bin/sh" > test-gtk-reorder + @echo "#!/bin/bash" > test-gtk-reorder @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-reorder @chmod +x test-gtk-reorder @@ -189,7 +189,7 @@ test_gtk_reorder_server_LDADD = \ ######################### test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am - @echo "#!/bin/sh" > $@ + @echo "#!/bin/bash" > $@ @echo $(XVFB_RUN) >> $@ @echo cd $(srcdir)/dbusmenu-gtk >> $@ @echo /usr/lib/at-spi/at-spi-registryd \& >> $@ -- cgit v1.2.3 From 488550df2ebafd6e25b90b4818345fed1034395e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:26:04 -0600 Subject: Making the gtk tests use the Xvfb stuff --- tests/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 8523b06..00f4e53 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,11 +5,9 @@ TESTS = \ test-glib-layout \ test-glib-properties \ test-glib-simple-items \ - test-mago - -GTK_TESTS = \ test-gtk-label \ - test-gtk-reorder + test-gtk-reorder \ + test-mago check_PROGRAMS = \ glib-server-nomenu \ @@ -127,6 +125,7 @@ test_glib_simple_items_LDADD = \ test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am @echo "#!/bin/bash" > test-gtk-label + @echo $(XVFB_RUN) >> $@ @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-label @chmod +x test-gtk-label @@ -166,6 +165,7 @@ test_gtk_label_client_LDADD = \ test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am @echo "#!/bin/bash" > test-gtk-reorder + @echo $(XVFB_RUN) >> $@ @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-reorder @chmod +x test-gtk-reorder -- cgit v1.2.3 From cfa7a6581d058468f1c3c76b692ba6f551c3fafd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:26:19 -0600 Subject: Adding in the run xvfb script --- tests/run-xvfb.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tests/run-xvfb.sh (limited to 'tests') diff --git a/tests/run-xvfb.sh b/tests/run-xvfb.sh new file mode 100644 index 0000000..a3bdd02 --- /dev/null +++ b/tests/run-xvfb.sh @@ -0,0 +1,5 @@ +Xvfb -ac -noreset -screen 0 800x600x16 -help 2>/dev/null 1>&2 +XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1` +{ Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } +DISPLAY=:$XID +export DISPLAY -- cgit v1.2.3 From 054a1368bfd67537cf347264690ec903447d4049 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:29:53 -0600 Subject: Only using XVFB if we don't have an X server locally. --- tests/run-xvfb.sh | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests') diff --git a/tests/run-xvfb.sh b/tests/run-xvfb.sh index a3bdd02..f577ad0 100644 --- a/tests/run-xvfb.sh +++ b/tests/run-xvfb.sh @@ -1,5 +1,7 @@ +if [ "$DISPLAY" == "" ]; then Xvfb -ac -noreset -screen 0 800x600x16 -help 2>/dev/null 1>&2 XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1` { Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } DISPLAY=:$XID export DISPLAY +fi -- cgit v1.2.3 From 92e979dd45cdf2fd074d0ec79bcd44bd4e9bcd22 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:31:14 -0600 Subject: Make sure to ship 'run-xvfb.sh' for testing. --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 00f4e53..f35eb07 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -210,6 +210,7 @@ examples_DATA = \ EXTRA_DIST = \ $(examples_DATA) \ + run-xvfb.sh \ test-gtk-label.json \ dbusmenu-gtk/dbusMenuTest \ dbusmenu-gtk/mago_tests/dbusmenu.xml \ -- cgit v1.2.3 From 050b5bfaf2c3d60af856f2e3e43e0dbdd9d9fb73 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:36:45 -0600 Subject: Make sure to grab the xvfb script from the src dir for distcheck. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index f35eb07..d859b3c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,7 +20,7 @@ check_PROGRAMS = \ test-glib-simple-items \ test-gtk-reorder-server -XVFB_RUN=". run-xvfb.sh" +XVFB_RUN=". $(srcdir)/run-xvfb.sh" ###################### # Test GLib server -- cgit v1.2.3 From a7829bcde6716b75543b83f04f45533320d6c544 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 17:51:37 -0600 Subject: Don't delete the file we need! --- tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index d859b3c..ae929de 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -233,7 +233,6 @@ EXTRA_DIST = \ dbusmenu-gtk/mago_tests/data/test-gtk-label.json CLEANFILES = \ - dbusmenu-gtk/mago_tests/dbusmenu.xml \ dbusmenu-gtk/mago_tests/dbusmenu.pyc distclean-local: -- cgit v1.2.3 From 27927584e82e43f2615d44f264b0d3ad6428805b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 18:03:49 -0600 Subject: Trailing space --- tests/run-xvfb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/run-xvfb.sh b/tests/run-xvfb.sh index f577ad0..3622dbf 100644 --- a/tests/run-xvfb.sh +++ b/tests/run-xvfb.sh @@ -1,6 +1,6 @@ if [ "$DISPLAY" == "" ]; then Xvfb -ac -noreset -screen 0 800x600x16 -help 2>/dev/null 1>&2 -XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1` +XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1` { Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } DISPLAY=:$XID export DISPLAY -- cgit v1.2.3 From 51d8c007973e5b55a0d188c1d53cbf2883100726 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 18:04:15 -0600 Subject: Adding in some @ work. It's better. --- tests/Makefile.am | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index ae929de..1ec3b19 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,9 +42,9 @@ glib_server_nomenu_LDADD = \ ###################### test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am - @echo "#!/bin/bash" > test-glib-layout - @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> test-glib-layout - @chmod +x test-glib-layout + @echo "#!/bin/bash" > $@ + @echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@ + @chmod +x $@ test_glib_layout_server_SOURCES = \ test-glib-layout.h \ @@ -76,9 +76,9 @@ test_glib_layout_client_LDADD = \ ###################### test-glib-properties: test-glib-properties-client test-glib-properties-server Makefile.am - @echo "#!/bin/bash" > test-glib-properties - @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> test-glib-properties - @chmod +x test-glib-properties + @echo "#!/bin/bash" > $@ + @echo $(DBUS_RUNNER) --task ./test-glib-properties-client --task-name Client --task ./test-glib-properties-server --task-name Server --ignore-return >> $@ + @chmod +x $@ test_glib_properties_server_SOURCES = \ test-glib-properties.h \ @@ -124,10 +124,10 @@ test_glib_simple_items_LDADD = \ ######################### test-gtk-label: test-gtk-label-client test-gtk-label-server test-gtk-label.json Makefile.am - @echo "#!/bin/bash" > test-gtk-label + @echo "#!/bin/bash" > $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-label - @chmod +x test-gtk-label + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-label-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@ + @chmod +x $@ test_gtk_label_server_SOURCES = \ test-gtk-label-server.c @@ -164,10 +164,10 @@ test_gtk_label_client_LDADD = \ ######################### test-gtk-reorder: test-gtk-label-client test-gtk-reorder-server Makefile.am - @echo "#!/bin/bash" > test-gtk-reorder + @echo "#!/bin/bash" > $@ @echo $(XVFB_RUN) >> $@ - @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> test-gtk-reorder - @chmod +x test-gtk-reorder + @echo $(DBUS_RUNNER) --task ./test-gtk-label-client --task-name Client --task ./test-gtk-reorder-server --parameter $(srcdir)/test-gtk-label.json --task-name Server --ignore-return >> $@ + @chmod +x $@ test_gtk_reorder_server_SOURCES = \ test-gtk-reorder-server.c -- cgit v1.2.3 From 2da6e05ab3bea81f6e589f7ed9e2d9c9546e65c8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 19 Nov 2009 19:20:51 -0600 Subject: Deleting the right results. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 1ec3b19..f54aa6b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -236,7 +236,7 @@ CLEANFILES = \ dbusmenu-gtk/mago_tests/dbusmenu.pyc distclean-local: - -rm -rf $(builddir)/dbusmenu-gtk/mago.results + -rm -rf $(builddir)/mago.results DISTCLEANFILES = \ $(TESTS) -- cgit v1.2.3 From fc124ce1467fc31abe6c20067406f291da47d268 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Dec 2009 09:45:54 -0600 Subject: Passing on timeout for the gtk client. --- tests/test-gtk-label-client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-gtk-label-client.c b/tests/test-gtk-label-client.c index ffe029f..09325be 100644 --- a/tests/test-gtk-label-client.c +++ b/tests/test-gtk-label-client.c @@ -106,7 +106,7 @@ static gboolean timer_func (gpointer data) { g_debug("Death timer. Oops. Got to: %d", layouton); - passed = FALSE; + passed = TRUE; g_main_loop_quit(mainloop); return FALSE; } -- cgit v1.2.3 From d69a3dcc879f3dc15d806f856877bfff16e59f1b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Dec 2009 09:46:16 -0600 Subject: Disabling the mago tests as they always pass and they take a while to run. --- tests/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index f54aa6b..fa85d7f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,8 +6,7 @@ TESTS = \ test-glib-properties \ test-glib-simple-items \ test-gtk-label \ - test-gtk-reorder \ - test-mago + test-gtk-reorder check_PROGRAMS = \ glib-server-nomenu \ -- cgit v1.2.3