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/dbusmenu-gtk') 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