← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

Factor out another win32 special case and add platform independent tests for it.

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
22
 
from bzrlib.xml5 import serializer_v5
 
21
from bzrlib.xml4 import serializer_v4
 
22
import bzrlib.xml5
23
23
 
24
24
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
25
25
<entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_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
 
      />
65
 
<directory name="subdir"
66
 
           file_id="foo-20050801201819-4139aa4a272f4250"
67
 
           parent_id="TREE_ROOT" 
68
 
           entry_version="mbp@foo-00"/>
69
 
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
70
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
71
 
      entry_version="mbp@foo-00"
72
 
      text_version="mbp@foo-123123"/>
 
63
      revision="mbp@foo-123123"/>
 
64
<directory name="subdir"
 
65
           file_id="foo-20050801201819-4139aa4a272f4250"
 
66
           parent_id="TREE_ROOT" 
 
67
           revision="mbp@foo-00"/>
 
68
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
 
69
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 
70
      revision="mbp@foo-00"/>
 
71
</inventory>
 
72
"""
 
73
 
 
74
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
 
75
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
 
76
      name="bar" parent_id="TREE_ROOT" 
 
77
      revision="mbp@foo-123123"/>
 
78
<directory name="subdir"
 
79
           file_id="foo-20050801201819-4139aa4a272f4250"
 
80
           parent_id="TREE_ROOT" 
 
81
           revision="mbp@foo-00"/>
 
82
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
 
83
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 
84
      revision="mbp@foo-00"/>
73
85
</inventory>
74
86
"""
75
87
 
91
103
           "Martin Pool <mbp@sourcefrog.net>")
92
104
        eq(rev.inventory_id,
93
105
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
94
 
        eq(len(rev.parents), 1)
95
 
        eq(rev.parents[0].revision_id,
 
106
        eq(len(rev.parent_ids), 1)
 
107
        eq(rev.parent_ids[0],
96
108
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
97
109
 
98
110
    def test_unpack_revision_5(self):
99
111
        """Test unpacking a canned revision v5"""
100
112
        inp = StringIO(_revision_v5)
101
 
        rev = serializer_v5.read_revision(inp)
 
113
        rev = bzrlib.xml5.serializer_v5.read_revision(inp)
102
114
        eq = self.assertEqual
103
115
        eq(rev.committer,
104
116
           "Martin Pool <mbp@sourcefrog.net>")
105
 
        eq(len(rev.parents), 1)
 
117
        eq(len(rev.parent_ids), 1)
106
118
        eq(rev.timezone, 36000)
107
 
        eq(rev.parents[0].revision_id,
 
119
        eq(rev.parent_ids[0],
108
120
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
109
121
 
110
122
    def test_unpack_inventory_5(self):
111
123
        """Unpack canned new-style inventory"""
112
124
        inp = StringIO(_committed_inv_v5)
113
 
        inv = serializer_v5.read_inventory(inp)
114
 
        eq = self.assertEqual
115
 
        eq(len(inv), 4)
116
 
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
117
 
        eq(ie.kind, 'file')
118
 
        eq(ie.text_version, 'mbp@foo-123123')
119
 
        eq(ie.entry_version, 'mbp@foo-00')
 
125
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
 
126
        eq = self.assertEqual
 
127
        eq(len(inv), 4)
 
128
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
 
129
        eq(ie.kind, 'file')
 
130
        eq(ie.revision, 'mbp@foo-00')
 
131
        eq(ie.name, 'bar')
 
132
        eq(inv[ie.parent_id].kind, 'directory')
 
133
 
 
134
    def test_unpack_basis_inventory_5(self):
 
135
        """Unpack canned new-style inventory"""
 
136
        inp = StringIO(_basis_inv_v5)
 
137
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
 
138
        eq = self.assertEqual
 
139
        eq(len(inv), 4)
 
140
        eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
 
141
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
 
142
        eq(ie.kind, 'file')
 
143
        eq(ie.revision, 'mbp@foo-00')
120
144
        eq(ie.name, 'bar')
121
145
        eq(inv[ie.parent_id].kind, 'directory')
122
146
 
123
147
    def test_repack_inventory_5(self):
124
148
        inp = StringIO(_committed_inv_v5)
125
 
        inv = serializer_v5.read_inventory(inp)
 
149
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
126
150
        outp = StringIO()
127
 
        serializer_v5.write_inventory(inv, outp)
128
 
        inv2 = serializer_v5.read_inventory(StringIO(outp.getvalue()))
 
151
        bzrlib.xml5.serializer_v5.write_inventory(inv, outp)
 
152
        inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
129
153
        self.assertEqual(inv, inv2)
130
154
 
131
155
    def test_repack_revision_5(self):
 
156
        """Round-trip revision to XML v5"""
132
157
        inp = StringIO(_revision_v5)
133
 
        rev = serializer_v5.read_revision(inp)
 
158
        rev = bzrlib.xml5.serializer_v5.read_revision(inp)
134
159
        outp = StringIO()
135
 
        serializer_v5.write_revision(rev, outp)
136
 
        rev2 = serializer_v5.read_revision(StringIO(outp.getvalue()))
 
160
        bzrlib.xml5.serializer_v5.write_revision(rev, outp)
 
161
        outfile_contents = outp.getvalue()
 
162
        rev2 = bzrlib.xml5.serializer_v5.read_revision(StringIO(outfile_contents))
137
163
        self.assertEqual(rev, rev2)
138
164
 
 
165
    def test_pack_revision_5(self):
 
166
        """Pack revision to XML v5"""
 
167
        # fixed 20051025, revisions should have final newline
 
168
        rev = bzrlib.xml5.serializer_v5.read_revision_from_string(_revision_v5)
 
169
        outp = StringIO()
 
170
        bzrlib.xml5.serializer_v5.write_revision(rev, outp)
 
171
        outfile_contents = outp.getvalue()
 
172
        self.assertEqual(outfile_contents[-1], '\n')
 
173
        self.assertEqualDiff(outfile_contents, bzrlib.xml5.serializer_v5.write_revision_to_string(rev))