# HG changeset patch # User cmlenz # Date 1161700071 0 # Node ID 06a25d0962af6d115bfa229858c43a67fae97b38 # Parent d72d842e1083e6e8c3d32d87cadc8c777c39cf42 Improved the unit tests for nested namespaces in serialization. diff --git a/genshi/tests/output.py b/genshi/tests/output.py --- a/genshi/tests/output.py +++ b/genshi/tests/output.py @@ -15,7 +15,7 @@ import unittest import sys -from genshi.core import Stream +from genshi.core import Attrs, Stream, QName from genshi.input import HTML, XML from genshi.output import DocType, XMLSerializer, XHTMLSerializer, \ HTMLSerializer, EmptyTagFilter @@ -24,7 +24,7 @@ class XMLSerializerTestCase(unittest.TestCase): def test_doctype_in_stream(self): - stream = Stream([(Stream.DOCTYPE, DocType.HTML_STRICT, ('?', -1, -1))]) + stream = Stream([(Stream.DOCTYPE, DocType.HTML_STRICT, (None, -1, -1))]) output = stream.render(XMLSerializer) self.assertEqual('\n', output) def test_doctype_in_stream_no_pubid(self): - stream = Stream([(Stream.DOCTYPE, - ('html', None, 'http://www.w3.org/TR/html4/strict.dtd'), - ('?', -1, -1))]) + stream = Stream([ + (Stream.DOCTYPE, + ('html', None, 'http://www.w3.org/TR/html4/strict.dtd'), + (None, -1, -1)) + ]) output = stream.render(XMLSerializer) self.assertEqual('\n', @@ -50,7 +52,7 @@ def test_doctype_in_stream_no_pubid_or_sysid(self): stream = Stream([(Stream.DOCTYPE, ('html', None, None), - ('?', -1, -1))]) + (None, -1, -1))]) output = stream.render(XMLSerializer) self.assertEqual('\n', output) @@ -63,7 +65,9 @@ output) def test_doctype_one_and_only(self): - stream = Stream([(Stream.DOCTYPE, ('html', None, None), ('?', -1, -1))]) + stream = Stream([ + (Stream.DOCTYPE, ('html', None, None), (None, -1, -1)) + ]) output = stream.render(XMLSerializer, doctype=DocType.HTML_STRICT) self.assertEqual('', output) def test_processing_instruction(self): - stream = Stream([(Stream.PI, ('python', 'x = 2'), ('?', -1, -1))]) + stream = Stream([(Stream.PI, ('python', 'x = 2'), (None, -1, -1))]) output = stream.render(XMLSerializer) self.assertEqual('', output) def test_nested_default_namespaces(self): - xml = XML("""
-

-

""") - output = xml.render(XMLSerializer) - self.assertEqual("""
+ stream = Stream([ + (Stream.START_NS, ('', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('div'), Attrs()), (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, '', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, '', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.END, QName('div'), (None, -1, -1)), + (Stream.END_NS, '', (None, -1, -1)) + ]) + output = stream.render(XMLSerializer) + self.assertEqual("""
+

""", output) def test_nested_bound_namespaces(self): - xml = XML("""
-

-

""") - output = xml.render(XMLSerializer) + stream = Stream([ + (Stream.START_NS, ('x', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('div'), Attrs()), (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('x', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, 'x', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('x', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, 'x', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.END, QName('div'), (None, -1, -1)), + (Stream.END_NS, 'x', (None, -1, -1)) + ]) + output = stream.render(XMLSerializer) self.assertEqual("""

+

""", output) @@ -170,21 +204,51 @@ self.assertEqual(text, output) def test_nested_default_namespaces(self): - xml = XML("""
-

-

""") - output = xml.render(XHTMLSerializer) - self.assertEqual("""
+ stream = Stream([ + (Stream.START_NS, ('', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('div'), Attrs()), (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, '', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, '', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.END, QName('div'), (None, -1, -1)), + (Stream.END_NS, '', (None, -1, -1)) + ]) + output = stream.render(XHTMLSerializer) + self.assertEqual("""
+

""", output) def test_nested_bound_namespaces(self): - xml = XML("""
- -
""") - output = xml.render(XHTMLSerializer) + stream = Stream([ + (Stream.START_NS, ('x', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('div'), Attrs()), (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('x', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, 'x', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.START_NS, ('x', 'http://example.org/'), (None, -1, -1)), + (Stream.START, (QName('p'), Attrs()), (None, -1, -1)), + (Stream.END, QName('p'), (None, -1, -1)), + (Stream.END_NS, 'x', (None, -1, -1)), + (Stream.TEXT, '\n ', (None, -1, -1)), + (Stream.END, QName('div'), (None, -1, -1)), + (Stream.END_NS, 'x', (None, -1, -1)) + ]) + output = stream.render(XHTMLSerializer) self.assertEqual("""
- +

+

""", output)