diff options
author | Ted Gould <ted@canonical.com> | 2009-10-09 12:06:56 -0400 |
---|---|---|
committer | Ted Gould <ted@canonical.com> | 2009-10-09 12:06:56 -0400 |
commit | dce80730186bfb61b1919652d71fc249b8df5f75 (patch) | |
tree | 4b73ccf17a97ffe3c0d66d1376360fd4e0430c76 /tests/dbusmenu-gtk | |
parent | 1e668b013089c5a4027102bca75f7542917fef2d (diff) | |
download | libdbusmenu-dce80730186bfb61b1919652d71fc249b8df5f75.tar.gz libdbusmenu-dce80730186bfb61b1919652d71fc249b8df5f75.tar.bz2 libdbusmenu-dce80730186bfb61b1919652d71fc249b8df5f75.zip |
Making the mago tests run in the make file in tests and making it so that they use a standard Python file.
Diffstat (limited to 'tests/dbusmenu-gtk')
-rw-r--r-- | tests/dbusmenu-gtk/Makefile.am | 8 | ||||
-rw-r--r-- | tests/dbusmenu-gtk/mago_tests/dbusmenu.py (renamed from tests/dbusmenu-gtk/dbusmenu.py.in) | 4 | ||||
-rw-r--r-- | tests/dbusmenu-gtk/mago_tests/dbusmenu.xml (renamed from tests/dbusmenu-gtk/dbusmenu.xml.in) | 20 |
3 files changed, 14 insertions, 18 deletions
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/mago_tests/dbusmenu.py index ce159e1..5e9f691 100644 --- a/tests/dbusmenu-gtk/dbusmenu.py.in +++ b/tests/dbusmenu-gtk/mago_tests/dbusmenu.py @@ -1,10 +1,10 @@ from mago.test_suite.main import SingleApplicationTestSuite from mago.application.main import Application -import ldtp, ooldtp, ldtputils +import ldtp, ooldtp, ldtputils, os.path class DbusMenuGtkApp(): - LAUNCHER = "@srcdir@/dbusMenuTest" + LAUNCHER = os.path.join(os.path.dirname(__file__), "..", "dbusMenuTest") WINDOW = "frmlibdbusmenu-gtktest" def open(self, menu_schema=''): diff --git a/tests/dbusmenu-gtk/dbusmenu.xml.in b/tests/dbusmenu-gtk/mago_tests/dbusmenu.xml index b49ee5e..d02191e 100644 --- a/tests/dbusmenu-gtk/dbusmenu.xml.in +++ b/tests/dbusmenu-gtk/mago_tests/dbusmenu.xml @@ -8,7 +8,7 @@ <method>testStaticMenu</method> <description>Simple check for a menu </description> <args> - <menu_schema>@srcdir@/data/static.json</menu_schema> + <menu_schema>data/static.json</menu_schema> <menu_item>value39</menu_item> </args> </case> @@ -16,7 +16,7 @@ <method>testStaticMenu</method> <description>Blank Label</description> <args> - <menu_schema>@srcdir@/data/blank_label.json</menu_schema> + <menu_schema>data/blank_label.json</menu_schema> <menu_item></menu_item> </args> </case> @@ -24,7 +24,7 @@ <method>testSubmenus</method> <description>Blank Submenus</description> <args> - <menu_schema>@srcdir@/data/blank_submenus.json</menu_schema> + <menu_schema>data/blank_submenus.json</menu_schema> <menu_item>value6</menu_item> <submenus></submenus> </args> @@ -33,7 +33,7 @@ <method>testStaticMenu</method> <description>Really Long Label (1000 chars)</description> <args> - <menu_schema>@srcdir@/data/long_label.json</menu_schema> + <menu_schema>data/long_label.json</menu_schema> <menu_item>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</menu_item> </args> </case> @@ -41,7 +41,7 @@ <method>testStaticMenu</method> <description>Search for a submenu that comes from a menu without ID</description> <args> - <menu_schema>@srcdir@/data/no_id.json</menu_schema> + <menu_schema>data/no_id.json</menu_schema> <menu_item>submenu_from_no_id</menu_item> </args> </case> @@ -49,7 +49,7 @@ <method>testStaticMenu</method> <description>Search for a submenu that comes from a menu with a blank label</description> <args> - <menu_schema>@srcdir@/data/blank_label_2levels.json</menu_schema> + <menu_schema>data/blank_label_2levels.json</menu_schema> <menu_item>value10</menu_item> </args> </case> @@ -57,7 +57,7 @@ <method>testStaticMenu</method> <description>Be sure that a submenu from a menu without label does not exist</description> <args> - <menu_schema>@srcdir@/data/no_label.json</menu_schema> + <menu_schema>data/no_label.json</menu_schema> <menu_item>submenu_from_no_label</menu_item> <notexists>True</notexists> </args> @@ -66,7 +66,7 @@ <method>testStaticMenu</method> <description>Check that a submenu is shown</description> <args> - <menu_schema>@srcdir@/data/several_submenus.json</menu_schema> + <menu_schema>data/several_submenus.json</menu_schema> <menu_item>value10</menu_item> </args> </case> @@ -74,7 +74,7 @@ <method>testStaticMenu</method> <description>Be sure that a submenu from a 4th level depth, is shown</description> <args> - <menu_schema>@srcdir@/data/several_submenus_recursive.json</menu_schema> + <menu_schema>data/several_submenus_recursive.json</menu_schema> <menu_item>value7001</menu_item> </args> </case> @@ -82,7 +82,7 @@ <method>testStaticMenu</method> <description>Be sure that a submenu, with a UTF-8 label, is shown</description> <args> - <menu_schema>@srcdir@/data/several_submenus_utf8.json</menu_schema> + <menu_schema>data/several_submenus_utf8.json</menu_schema> <menu_item>value5ス</menu_item> </args> </case> |