← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

[merge] 0.7-bugfix: Fix fileid_involved to unescape xml characters, fix StubServer to handle paramiko > 1.5.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
16
16
 
17
17
from cStringIO import StringIO
18
18
 
19
 
from bzrlib.selftest import TestCase
 
19
from bzrlib.tests import TestCase
20
20
from bzrlib.inventory import Inventory, InventoryEntry
21
 
from bzrlib.xml import serializer_v4
 
21
from bzrlib.xml4 import serializer_v4
22
22
from bzrlib.xml5 import serializer_v5
23
23
 
24
24
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
60
60
_committed_inv_v5 = """<inventory>
61
61
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
62
62
      name="bar" parent_id="TREE_ROOT" 
63
 
      text_version="mbp@foo-123123" entry_version="mbp@foo-123123"
64
 
      />
 
63
      revision="mbp@foo-123123"/>
65
64
<directory name="subdir"
66
65
           file_id="foo-20050801201819-4139aa4a272f4250"
67
66
           parent_id="TREE_ROOT" 
68
 
           entry_version="mbp@foo-00"/>
 
67
           revision="mbp@foo-00"/>
69
68
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
70
69
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
71
 
      entry_version="mbp@foo-00"
72
 
      text_version="mbp@foo-123123"/>
 
70
      revision="mbp@foo-00"/>
73
71
</inventory>
74
72
"""
75
73
 
91
89
           "Martin Pool <mbp@sourcefrog.net>")
92
90
        eq(rev.inventory_id,
93
91
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
94
 
        eq(len(rev.parents), 1)
95
 
        eq(rev.parents[0].revision_id,
 
92
        eq(len(rev.parent_ids), 1)
 
93
        eq(rev.parent_ids[0],
96
94
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
97
95
 
98
96
    def test_unpack_revision_5(self):
102
100
        eq = self.assertEqual
103
101
        eq(rev.committer,
104
102
           "Martin Pool <mbp@sourcefrog.net>")
105
 
        eq(len(rev.parents), 1)
 
103
        eq(len(rev.parent_ids), 1)
106
104
        eq(rev.timezone, 36000)
107
 
        eq(rev.parents[0].revision_id,
 
105
        eq(rev.parent_ids[0],
108
106
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
109
107
 
110
108
    def test_unpack_inventory_5(self):
115
113
        eq(len(inv), 4)
116
114
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
117
115
        eq(ie.kind, 'file')
118
 
        eq(ie.text_version, 'mbp@foo-123123')
119
 
        eq(ie.entry_version, 'mbp@foo-00')
 
116
        eq(ie.revision, 'mbp@foo-00')
120
117
        eq(ie.name, 'bar')
121
118
        eq(inv[ie.parent_id].kind, 'directory')
122
119
 
129
126
        self.assertEqual(inv, inv2)
130
127
 
131
128
    def test_repack_revision_5(self):
 
129
        """Round-trip revision to XML v5"""
132
130
        inp = StringIO(_revision_v5)
133
131
        rev = serializer_v5.read_revision(inp)
134
132
        outp = StringIO()
135
133
        serializer_v5.write_revision(rev, outp)
136
 
        rev2 = serializer_v5.read_revision(StringIO(outp.getvalue()))
 
134
        outfile_contents = outp.getvalue()
 
135
        rev2 = serializer_v5.read_revision(StringIO(outfile_contents))
137
136
        self.assertEqual(rev, rev2)
138
137
 
 
138
    def test_pack_revision_5(self):
 
139
        """Pack revision to XML v5"""
 
140
        # fixed 20051025, revisions should have final newline
 
141
        rev = serializer_v5.read_revision_from_string(_revision_v5)
 
142
        outp = StringIO()
 
143
        serializer_v5.write_revision(rev, outp)
 
144
        outfile_contents = outp.getvalue()
 
145
        self.assertEqual(outfile_contents[-1], '\n')
 
146
        self.assertEqualDiff(outfile_contents, serializer_v5.write_revision_to_string(rev))