← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 21:27:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212700-esqmtrmevddxrsq2
Clean up the test slightly, hoping to avoid race conditions, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
26
26
    )
27
27
from bzrlib.tests import TestCase
28
28
from bzrlib.inventory import Inventory
 
29
from bzrlib.xml4 import serializer_v4
29
30
import bzrlib.xml5
30
31
 
 
32
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
 
33
<entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_id="TREE_ROOT" />
 
34
<entry file_id="foo-20050801201819-4139aa4a272f4250" kind="directory" name="foo" parent_id="TREE_ROOT" />
 
35
<entry file_id="bar-20050824000535-6bc48cfad47ed134" kind="file" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" />
 
36
</inventory>"""
 
37
 
 
38
 
 
39
_revision_v4 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
 
40
    inventory_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
 
41
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
 
42
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
 
43
    timestamp="1125907235.212"
 
44
    timezone="36000">
 
45
<message>- start splitting code for xml (de)serialization away from objects
 
46
  preparatory to supporting multiple formats by a single library
 
47
</message>
 
48
<parents>
 
49
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" revision_sha1="7bdf4cc8c5bdac739f8cf9b10b78cf4b68f915ff" />
 
50
</parents>
 
51
</revision>
 
52
"""
 
53
 
31
54
_revision_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
32
55
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
33
56
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
194
217
class TestSerializer(TestCase):
195
218
    """Test XML serialization"""
196
219
 
 
220
    def test_canned_inventory(self):
 
221
        """Test unpacked a canned inventory v4 file."""
 
222
        inp = StringIO(_working_inventory_v4)
 
223
        inv = serializer_v4.read_inventory(inp)
 
224
        self.assertEqual(len(inv), 4)
 
225
        self.assert_('bar-20050901064931-73b4b1138abc9cd2' in inv)
 
226
 
 
227
    def test_unpack_revision(self):
 
228
        """Test unpacking a canned revision v4"""
 
229
        inp = StringIO(_revision_v4)
 
230
        rev = serializer_v4.read_revision(inp)
 
231
        eq = self.assertEqual
 
232
        eq(rev.committer,
 
233
           "Martin Pool <mbp@sourcefrog.net>")
 
234
        eq(rev.inventory_id,
 
235
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
 
236
        eq(len(rev.parent_ids), 1)
 
237
        eq(rev.parent_ids[0],
 
238
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
 
239
 
197
240
    def test_unpack_revision_5(self):
198
241
        """Test unpacking a canned revision v5"""
199
242
        inp = StringIO(_revision_v5)
536
579
        uni_str = u'\xb5\xe5&\u062c'
537
580
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
538
581
                         bzrlib.xml8._encode_and_escape(uni_str))
539
 
 
540
 
 
541
 
class TestMisc(TestCase):
542
 
 
543
 
    def test_unescape_xml(self):
544
 
        """We get some kind of error when malformed entities are passed"""
545
 
        self.assertRaises(KeyError, bzrlib.xml8._unescape_xml, 'foo&bar;')