[gentoo-commits] proj/g-sorcery:master commit in: g_sorcery/, tests/

[Jauhien Piatlicki]

commit:     fa7c0ac5f53757d538483c449df7fd5ae233eb7e
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Sun Jun 30 23:30:54 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Sun Jun 30 23:30:54 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=fa7c0ac5

g_sorcery/metadata: MetadataGenerator, generate

---
 g_sorcery/metadata.py  |  7 ++++++-
 tests/test_metadata.py | 43 +++++++++++++++++++++++++++++++++++++------
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/g_sorcery/metadata.py b/g_sorcery/metadata.py
index 1ead07a..89d071e 100644
--- a/g_sorcery/metadata.py
+++ b/g_sorcery/metadata.py
@@ -19,7 +19,7 @@ import xml.dom.minidom as minidom
 def prettify(tree):
     rough_str = ET.tostring(tree, 'unicode')
     reparsed = minidom.parseString(rough_str)
-    return reparsed.toprettyxml()
+    return reparsed.toprettyxml(encoding="utf-8").decode("utf-8")
 
 class XMLGenerator:
     def __init__(self, external, schema):
@@ -140,6 +140,11 @@ class MetadataGenerator:
         description = self.db.get_package_description(package)
         metadata = self.process(package, description)
         metadata = self.postprocess(package, description, metadata)
+        metadata = prettify(metadata)
+        metadata = metadata.split('\n')
+        if metadata[-1] == '':
+                metadata = metadata[:-1]
+        metadata.insert(1, '<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">')
         return metadata
 
     def process(self, package, description):

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index aeaac6d..2398733 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -15,7 +15,7 @@ import xml.etree.ElementTree as ET
 
 import tempfile, unittest
 
-from g_sorcery import exceptions, metadata
+from g_sorcery import exceptions, metadata, package_db
 
 class TestXMLGenerator(unittest.TestCase):
     def setUp(self):
@@ -79,6 +79,23 @@ class DummyMetadataGenerator(metadata.MetadataGenerator):
     def __init__(self, db):
         super().__init__(db)
 
+package = package_db.Package("app-test", "test", "0.1")
+
+description = {'herd' : ['test'],
+               'maintainer' : [{'email' : 'test@×××××××.com', 'name' : 'testor'}],
+               'longdescription' : 'test metadata',
+               'use' : {'flag' : [('flag1', 'test flag1'), ('flag2', 'test flag2')]},
+               'upstream' : {'maintainer' : [{'name' : 'TEST'}], 'remote-id' : '001'}}
+
+class DummyDB(package_db.PackageDB):
+    def __init__(self, directory, repo_uri="", db_uri=""):
+        super().__init__(directory, repo_uri, db_uri)
+
+    def generate_tree(self):
+        self.add_category("app-test")
+        self.add_package(package, description)
+        
+
 class TestMetadataGenerator(unittest.TestCase):
     def setUp(self):
         self.tempdir = tempfile.TemporaryDirectory()
@@ -88,19 +105,33 @@ class TestMetadataGenerator(unittest.TestCase):
 
     def test_process(self):
         mg = DummyMetadataGenerator(None)
-        description = {'herd' : ['test'],
-                       'maintainer' : [{'email' : 'test@×××××××.com', 'name' : 'testor'}],
-                       'longdescription' : 'test metadata',
-                       'use' : {'flag' : [('flag1', 'test flag1'), ('flag2', 'test flag2')]},
-                       'upstream' : {'maintainer' : [{'name' : 'TEST'}], 'remote-id' : '001'}}
         self.assertEqual(ET.tostring(mg.process(None, description), encoding='unicode'),
                          '<pkgmetadata><herd>test</herd><maintainer><email>test@×××××××.com</email>\
 <name>testor</name></maintainer><longdescription>test metadata</longdescription><use>\
 <flag name="flag1">test flag1</flag><flag name="flag2">test flag2</flag></use>\
 <upstream><maintainer><name>TEST</name></maintainer><remote-id>001</remote-id></upstream></pkgmetadata>')
 
+    def test_generate(self):
+        db = DummyDB(self.tempdir.name)
+        db.generate()
+        mg = DummyMetadataGenerator(db)
+        metadata = mg.generate(package)
+        self.assertEqual(metadata,
+                          ['<?xml version="1.0" encoding="utf-8"?>',
+                           '<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">',
+                           '<pkgmetadata>', '\t<herd>test</herd>',
+                           '\t<maintainer>', '\t\t<email>test@×××××××.com</email>',
+                           '\t\t<name>testor</name>', '\t</maintainer>',
+                           '\t<longdescription>test metadata</longdescription>',
+                           '\t<use>', '\t\t<flag name="flag1">test flag1</flag>',
+                           '\t\t<flag name="flag2">test flag2</flag>', '\t</use>',
+                           '\t<upstream>', '\t\t<maintainer>', '\t\t\t<name>TEST</name>',
+                           '\t\t</maintainer>', '\t\t<remote-id>001</remote-id>',
+                           '\t</upstream>', '</pkgmetadata>'])
+
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(TestXMLGenerator('test_generate'))
     suite.addTest(TestMetadataGenerator('test_process'))
+    suite.addTest(TestMetadataGenerator('test_generate'))
     return suite