From 09b4c9880d5765eb24d1b0778af52f5b80b98c3d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 24 Jun 2009 12:35:35 -0500
Subject: starting to get mago into the test architecture

---
 tests/dbusmenu-gtk/Makefile.am | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 tests/dbusmenu-gtk/Makefile.am

(limited to 'tests/dbusmenu-gtk')

diff --git a/tests/dbusmenu-gtk/Makefile.am b/tests/dbusmenu-gtk/Makefile.am
new file mode 100644
index 0000000..9b18e21
--- /dev/null
+++ b/tests/dbusmenu-gtk/Makefile.am
@@ -0,0 +1,7 @@
+
+check: tests
+
+tests: mago
+
+mago:
+	mago -f $(srcdir)/dbusmenu.xml
-- 
cgit v1.2.3


From 9cc1c5b7a4ae7fd626ac5e4a498bd3ca56fdf09e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 24 Jun 2009 12:40:17 -0500
Subject: We're going to change the xml file to be a built file so that the
 paths are all correct.

---
 tests/dbusmenu-gtk/dbusmenu.xml    | 89 --------------------------------------
 tests/dbusmenu-gtk/dbusmenu.xml.in | 89 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 89 deletions(-)
 delete mode 100644 tests/dbusmenu-gtk/dbusmenu.xml
 create mode 100644 tests/dbusmenu-gtk/dbusmenu.xml.in

(limited to 'tests/dbusmenu-gtk')

diff --git a/tests/dbusmenu-gtk/dbusmenu.xml b/tests/dbusmenu-gtk/dbusmenu.xml
deleted file mode 100644
index 90d4882..0000000
--- a/tests/dbusmenu-gtk/dbusmenu.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<suite name="dbusmenu gtk test suite">
-  <class>dbusmenu.DbusMenuGtkTest</class>
-  <description>
-    Test libdbusmenu-gtk.
-  </description>
-   <case name="Static Test">
-    <method>testStaticMenu</method>
-    <description>Simple check for a menu </description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/static.json</menu_schema>
-      <menu_item>value39</menu_item>
-    </args>
-  </case>
- <case name="Blank label">
-    <method>testStaticMenu</method>
-    <description>Blank Label</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/blank_label.json</menu_schema>
-      <menu_item></menu_item>
-    </args>
-  </case>
- <case name="Blank Submenus">
-    <method>testSubmenus</method>
-    <description>Blank Submenus</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/blank_submenus.json</menu_schema>
-      <menu_item>value6</menu_item>
-      <submenus></submenus>
-    </args>
- </case>
- <case name="Long Label">
-    <method>testStaticMenu</method>
-    <description>Really Long Label (1000 chars)</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/long_label.json</menu_schema>
-      <menu_item>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</menu_item>
-    </args>
-   </case>
-  <case name="No Id">
-    <method>testStaticMenu</method>
-    <description>Search for a submenu that comes from a menu without ID</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/no_id.json</menu_schema>
-      <menu_item>submenu_from_no_id</menu_item>
-    </args>
-   </case>
- <case name="Blank Label 2 levels">
-    <method>testStaticMenu</method>
-    <description>Search for a submenu that comes from a menu with a blank label</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/blank_label_2levels.json</menu_schema>
-      <menu_item>value10</menu_item>
-    </args>
-   </case>
- <case name="No Label">
-    <method>testStaticMenu</method>
-    <description>Be sure that a submenu from a menu without label does not exist</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/no_label.json</menu_schema>
-      <menu_item>submenu_from_no_label</menu_item>
-      <notexists>True</notexists>
-    </args>
-   </case>
-  <case name="Several Submenus">
-    <method>testStaticMenu</method>
-    <description>Check that a submenu is shown</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/several_submenus.json</menu_schema>
-      <menu_item>value10</menu_item>
-    </args>
-   </case>
- <case name="Several Submenus Recursive">
-    <method>testStaticMenu</method>
-    <description>Be sure that a submenu from a 4th level depth, is shown</description>
-    <args>
-        <menu_schema>./dbusmenu-gtk/data/several_submenus_recursive.json</menu_schema>
-      <menu_item>value7001</menu_item>
-    </args>
-   </case>
- <case name="Several Submenus UTF8">
-    <method>testStaticMenu</method>
-    <description>Be sure that a submenu, with a UTF-8 label, is shown</description>
-    <args>
-      <menu_schema>./dbusmenu-gtk/data/several_submenus_utf8.json</menu_schema>
-      <menu_item>value5ス</menu_item>
-    </args>
- </case>
-</suite>
diff --git a/tests/dbusmenu-gtk/dbusmenu.xml.in b/tests/dbusmenu-gtk/dbusmenu.xml.in
new file mode 100644
index 0000000..90d4882
--- /dev/null
+++ b/tests/dbusmenu-gtk/dbusmenu.xml.in
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<suite name="dbusmenu gtk test suite">
+  <class>dbusmenu.DbusMenuGtkTest</class>
+  <description>
+    Test libdbusmenu-gtk.
+  </description>
+   <case name="Static Test">
+    <method>testStaticMenu</method>
+    <description>Simple check for a menu </description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/static.json</menu_schema>
+      <menu_item>value39</menu_item>
+    </args>
+  </case>
+ <case name="Blank label">
+    <method>testStaticMenu</method>
+    <description>Blank Label</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/blank_label.json</menu_schema>
+      <menu_item></menu_item>
+    </args>
+  </case>
+ <case name="Blank Submenus">
+    <method>testSubmenus</method>
+    <description>Blank Submenus</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/blank_submenus.json</menu_schema>
+      <menu_item>value6</menu_item>
+      <submenus></submenus>
+    </args>
+ </case>
+ <case name="Long Label">
+    <method>testStaticMenu</method>
+    <description>Really Long Label (1000 chars)</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/long_label.json</menu_schema>
+      <menu_item>aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</menu_item>
+    </args>
+   </case>
+  <case name="No Id">
+    <method>testStaticMenu</method>
+    <description>Search for a submenu that comes from a menu without ID</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/no_id.json</menu_schema>
+      <menu_item>submenu_from_no_id</menu_item>
+    </args>
+   </case>
+ <case name="Blank Label 2 levels">
+    <method>testStaticMenu</method>
+    <description>Search for a submenu that comes from a menu with a blank label</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/blank_label_2levels.json</menu_schema>
+      <menu_item>value10</menu_item>
+    </args>
+   </case>
+ <case name="No Label">
+    <method>testStaticMenu</method>
+    <description>Be sure that a submenu from a menu without label does not exist</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/no_label.json</menu_schema>
+      <menu_item>submenu_from_no_label</menu_item>
+      <notexists>True</notexists>
+    </args>
+   </case>
+  <case name="Several Submenus">
+    <method>testStaticMenu</method>
+    <description>Check that a submenu is shown</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/several_submenus.json</menu_schema>
+      <menu_item>value10</menu_item>
+    </args>
+   </case>
+ <case name="Several Submenus Recursive">
+    <method>testStaticMenu</method>
+    <description>Be sure that a submenu from a 4th level depth, is shown</description>
+    <args>
+        <menu_schema>./dbusmenu-gtk/data/several_submenus_recursive.json</menu_schema>
+      <menu_item>value7001</menu_item>
+    </args>
+   </case>
+ <case name="Several Submenus UTF8">
+    <method>testStaticMenu</method>
+    <description>Be sure that a submenu, with a UTF-8 label, is shown</description>
+    <args>
+      <menu_schema>./dbusmenu-gtk/data/several_submenus_utf8.json</menu_schema>
+      <menu_item>value5ス</menu_item>
+    </args>
+ </case>
+</suite>
-- 
cgit v1.2.3


From e59b791cd717bbd4bbb541382e20bfa150941f57 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 24 Jun 2009 12:47:16 -0500
Subject: Building the xml file on the fly.

---
 tests/dbusmenu-gtk/Makefile.am     | 12 ++++++++++--
 tests/dbusmenu-gtk/dbusmenu.xml.in | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'tests/dbusmenu-gtk')

diff --git a/tests/dbusmenu-gtk/Makefile.am b/tests/dbusmenu-gtk/Makefile.am
index 9b18e21..2db9809 100644
--- a/tests/dbusmenu-gtk/Makefile.am
+++ b/tests/dbusmenu-gtk/Makefile.am
@@ -3,5 +3,13 @@ check: tests
 
 tests: mago
 
-mago:
-	mago -f $(srcdir)/dbusmenu.xml
+mago: dbusmenu.xml
+	mago -f $(builddir)/dbusmenu.xml
+
+dbusmenu.xml: dbusmenu.xml.in
+	sed -e "s|\@srcdir\@|$(srcdir)|" $< > $@
+
+EXTRA_DIST = dbusmenu.xml
+
+CLEANFILES = dbusmenu.xml
+
diff --git a/tests/dbusmenu-gtk/dbusmenu.xml.in b/tests/dbusmenu-gtk/dbusmenu.xml.in
index 90d4882..b49ee5e 100644
--- a/tests/dbusmenu-gtk/dbusmenu.xml.in
+++ b/tests/dbusmenu-gtk/dbusmenu.xml.in
@@ -8,7 +8,7 @@
     <method>testStaticMenu</method>
     <description>Simple check for a menu </description>
     <args>
-        <menu_schema>./dbusmenu-gtk/data/static.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/blank_label.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/blank_submenus.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/long_label.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/no_id.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/blank_label_2levels.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/no_label.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/several_submenus.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/several_submenus_recursive.json</menu_schema>
+        <menu_schema>@srcdir@/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>./dbusmenu-gtk/data/several_submenus_utf8.json</menu_schema>
+      <menu_schema>@srcdir@/data/several_submenus_utf8.json</menu_schema>
       <menu_item>value5ス</menu_item>
     </args>
  </case>
-- 
cgit v1.2.3