tests: run xmlwriter tests during make check

There was a stray test() function already there. Move it to a unittest
file and run it with the other tests.

4 files changed, 32 insertions, 25 deletions

diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index 54419f71..f79362a1 100755
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -149,27 +149,3 @@ class XMLWriter(object):
             yield
         finally:
             self.pop_tag()
-
-
-def test():
-    w = XMLWriter()
-    w.push_tag('repository')
-    w.push_tag('namespace')
-    w.push_tag('enumeration')
-    w.push_tag('member',
-               [('name', 'west'),
-                ('value', '7'),
-                ('c:identifier', 'GTK_ANCHOR_WEST'),
-                ('glib:nick', 'west')])
-
-    w.pop_tag()
-    w.pop_tag()
-    w.pop_tag()
-    x = w.get_xml()
-    lines = x.split('\n')
-    import pprint
-    pprint.pprint(lines)
-    assert len(lines[3]) < 80, len(lines[3])
-
-if __name__ == '__main__':
-    test()
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 5322b7b4..30651ee1 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -231,7 +231,8 @@ endif
 PYTESTS = \
 	test_shlibs.py \
 	test_sourcescanner.py \
-	test_transformer.py
+	test_transformer.py \
+	test_xmlwriter.py
 
 TESTS = $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) $(PYTESTS)
 TESTS_ENVIRONMENT = env srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \
diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
index 07df91a9..a2ca035e 100644
--- a/tests/scanner/meson.build
+++ b/tests/scanner/meson.build
@@ -11,6 +11,7 @@ if cc.get_id() != 'msvc'
   scanner_test_files += [
     'test_sourcescanner.py',
     'test_transformer.py',
+    'test_xmlwriter.py',
     ]
 endif
 
diff --git a/tests/scanner/test_xmlwriter.py b/tests/scanner/test_xmlwriter.py
new file mode 100644
index 00000000..36df7ab8
--- /dev/null
+++ b/tests/scanner/test_xmlwriter.py
@@ -0,0 +1,29 @@
+import unittest
+
+from giscanner.xmlwriter import XMLWriter
+
+
+class TestXMLWriter(unittest.TestCase):
+
+    def test_various(self):
+        w = XMLWriter()
+        w.push_tag('repository')
+        w.push_tag('namespace')
+        w.push_tag('enumeration')
+        w.push_tag('member',
+                   [('name', 'west'),
+                    ('value', '7'),
+                    ('c:identifier', 'GTK_ANCHOR_WEST'),
+                    ('glib:nick', 'west')])
+
+        w.pop_tag()
+        w.pop_tag()
+        w.pop_tag()
+        x = w.get_xml()
+        self.assertTrue('GTK_ANCHOR_WEST' in x)
+        lines = x.split('\n')
+        self.assertTrue(len(lines[3]) < 80)
+
+
+if __name__ == '__main__':
+    unittest.main()