/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_xml.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_xml.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from io import BytesIO
17
18
 
18
19
from .. import (
19
20
    errors,
25
26
    xml7,
26
27
    xml8,
27
28
    )
28
 
from ..sixish import (
29
 
    BytesIO,
30
 
    )
31
29
from ..bzr.inventory import Inventory
32
30
from . import TestCase
33
31
import breezy.bzr.xml5
34
32
 
35
 
_revision_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
 
33
_revision_v5 = b"""<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
36
34
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
37
35
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
38
36
    timestamp="1125907235.212"
46
44
</revision>
47
45
"""
48
46
 
49
 
_revision_v5_utc = """\
 
47
_revision_v5_utc = b"""\
50
48
<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
51
49
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
52
50
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
61
59
</revision>
62
60
"""
63
61
 
64
 
_committed_inv_v5 = """<inventory>
 
62
_committed_inv_v5 = b"""<inventory>
65
63
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
66
64
      name="bar" parent_id="TREE_ROOT"
67
65
      revision="mbp@foo-123123"
77
75
</inventory>
78
76
"""
79
77
 
80
 
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
 
78
_basis_inv_v5 = b"""<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
81
79
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
82
80
      name="bar" parent_id="TREE_ROOT"
83
81
      revision="mbp@foo-123123"/>
93
91
 
94
92
 
95
93
# DO NOT REFLOW THIS. Its the exact revision we want.
96
 
_expected_rev_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="5" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
 
94
_expected_rev_v5 = b"""<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="5" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
97
95
<message>- start splitting code for xml (de)serialization away from objects
98
96
  preparatory to supporting multiple formats by a single library
99
97
</message>
105
103
 
106
104
 
107
105
# DO NOT REFLOW THIS. Its the exact inventory we want.
108
 
_expected_inv_v5 = """<inventory format="5">
 
106
_expected_inv_v5 = b"""<inventory format="5">
109
107
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
110
108
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" revision="mbp@foo-00" />
111
109
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" text_sha1="B" text_size="0" />
113
111
"""
114
112
 
115
113
 
116
 
_expected_inv_v5_root = """<inventory file_id="f&lt;" format="5" revision_id="mother!">
 
114
_expected_inv_v5_root = b"""<inventory file_id="f&lt;" format="5" revision_id="mother!">
117
115
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f&lt;" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
118
116
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" parent_id="f&lt;" revision="mbp@foo-00" />
119
117
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" text_sha1="B" text_size="0" />
121
119
</inventory>
122
120
"""
123
121
 
124
 
_expected_inv_v6 = """<inventory format="6" revision_id="rev_outer">
 
122
_expected_inv_v6 = b"""<inventory format="6" revision_id="rev_outer">
125
123
<directory file_id="tree-root-321" name="" revision="rev_outer" />
126
124
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
127
125
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
129
127
</inventory>
130
128
"""
131
129
 
132
 
_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
 
130
_expected_inv_v7 = b"""<inventory format="7" revision_id="rev_outer">
133
131
<directory file_id="tree-root-321" name="" revision="rev_outer" />
134
132
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
135
133
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
138
136
</inventory>
139
137
"""
140
138
 
141
 
_expected_rev_v8 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
 
139
_expected_rev_v8 = b"""<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
142
140
<message>- start splitting code for xml (de)serialization away from objects
143
141
  preparatory to supporting multiple formats by a single library
144
142
</message>
148
146
</revision>
149
147
"""
150
148
 
151
 
_expected_inv_v8 = """<inventory format="8" revision_id="rev_outer">
 
149
_expected_inv_v8 = b"""<inventory format="8" revision_id="rev_outer">
152
150
<directory file_id="tree-root-321" name="" revision="rev_outer" />
153
151
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
154
152
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
156
154
</inventory>
157
155
"""
158
156
 
159
 
_revision_utf8_v5 = """<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;"
 
157
_revision_utf8_v5 = b"""<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;"
160
158
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
161
159
    revision_id="erik@b&#229;gfors-02"
162
160
    timestamp="1125907235.212"
169
167
</revision>
170
168
"""
171
169
 
172
 
_inventory_utf8_v5 = """<inventory file_id="TRE&#233;_ROOT" format="5"
 
170
_expected_rev_v8_complex = b"""<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="erik@b&#229;gfors-02" timestamp="1125907235.212" timezone="36000">
 
171
<message>Include &#181;nicode characters
 
172
</message>
 
173
<parents>
 
174
<revision_ref revision_id="erik@b&#229;gfors-01" />
 
175
<revision_ref revision_id="erik@bagfors-02" />
 
176
</parents>
 
177
<properties><property name="bar" />
 
178
<property name="foo">this has a
 
179
newline in it</property>
 
180
</properties>
 
181
</revision>
 
182
"""
 
183
 
 
184
 
 
185
 
 
186
_inventory_utf8_v5 = b"""<inventory file_id="TRE&#233;_ROOT" format="5"
173
187
                                   revision_id="erik@b&#229;gfors-02">
174
188
<file file_id="b&#229;r-01"
175
189
      name="b&#229;r" parent_id="TRE&#233;_ROOT"
185
199
"""
186
200
 
187
201
# Before revision_id was always stored as an attribute
188
 
_inventory_v5a = """<inventory format="5">
 
202
_inventory_v5a = b"""<inventory format="5">
189
203
</inventory>
190
204
"""
191
205
 
192
206
# Before revision_id was always stored as an attribute
193
 
_inventory_v5b = """<inventory format="5" revision_id="a-rev-id">
 
207
_inventory_v5b = b"""<inventory format="5" revision_id="a-rev-id">
194
208
</inventory>
195
209
"""
196
210
 
208
222
        eq(len(rev.parent_ids), 1)
209
223
        eq(rev.timezone, 36000)
210
224
        eq(rev.parent_ids[0],
211
 
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
 
225
           b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
212
226
 
213
227
    def test_unpack_revision_5_utc(self):
214
228
        inp = BytesIO(_revision_v5_utc)
219
233
        eq(len(rev.parent_ids), 1)
220
234
        eq(rev.timezone, 0)
221
235
        eq(rev.parent_ids[0],
222
 
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
 
236
           b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
223
237
 
224
238
    def test_unpack_inventory_5(self):
225
239
        """Unpack canned new-style inventory"""
227
241
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
228
242
        eq = self.assertEqual
229
243
        eq(len(inv), 4)
230
 
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
 
244
        ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
231
245
        eq(ie.kind, 'file')
232
 
        eq(ie.revision, 'mbp@foo-00')
 
246
        eq(ie.revision, b'mbp@foo-00')
233
247
        eq(ie.name, 'bar')
234
 
        eq(inv[ie.parent_id].kind, 'directory')
 
248
        eq(inv.get_entry(ie.parent_id).kind, 'directory')
235
249
 
236
250
    def test_unpack_basis_inventory_5(self):
237
251
        """Unpack canned new-style inventory"""
238
 
        inp = BytesIO(_basis_inv_v5)
239
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
 
252
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
 
253
            breezy.osutils.split_lines(_basis_inv_v5))
240
254
        eq = self.assertEqual
241
255
        eq(len(inv), 4)
242
 
        eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
243
 
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
 
256
        eq(inv.revision_id,
 
257
           b'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
 
258
        ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
244
259
        eq(ie.kind, 'file')
245
 
        eq(ie.revision, 'mbp@foo-00')
 
260
        eq(ie.revision, b'mbp@foo-00')
246
261
        eq(ie.name, 'bar')
247
 
        eq(inv[ie.parent_id].kind, 'directory')
 
262
        eq(inv.get_entry(ie.parent_id).kind, 'directory')
248
263
 
249
264
    def test_unpack_inventory_5a(self):
250
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
251
 
                _inventory_v5a, revision_id='test-rev-id')
252
 
        self.assertEqual('test-rev-id', inv.root.revision)
 
265
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
 
266
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id')
 
267
        self.assertEqual(b'test-rev-id', inv.root.revision)
253
268
 
254
269
    def test_unpack_inventory_5a_cache_and_copy(self):
255
270
        # Passing an entry_cache should get populated with the objects
256
271
        # But the returned objects should be copies if return_from_cache is
257
272
        # False
258
273
        entry_cache = fifo_cache.FIFOCache()
259
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
260
 
            _inventory_v5a, revision_id='test-rev-id',
 
274
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
 
275
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id',
261
276
            entry_cache=entry_cache, return_from_cache=False)
262
277
        for entry in inv.iter_just_entries():
263
278
            key = (entry.file_id, entry.revision)
272
287
        # The returned objects should be exact if return_from_cache is
273
288
        # True
274
289
        entry_cache = fifo_cache.FIFOCache()
275
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
276
 
            _inventory_v5a, revision_id='test-rev-id',
 
290
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
 
291
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id',
277
292
            entry_cache=entry_cache, return_from_cache=True)
278
293
        for entry in inv.iter_just_entries():
279
294
            key = (entry.file_id, entry.revision)
284
299
                self.assertIs(entry, entry_cache[key])
285
300
 
286
301
    def test_unpack_inventory_5b(self):
287
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
288
 
                _inventory_v5b, revision_id='test-rev-id')
289
 
        self.assertEqual('a-rev-id', inv.root.revision)
 
302
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
 
303
            breezy.osutils.split_lines(_inventory_v5b), revision_id=b'test-rev-id')
 
304
        self.assertEqual(b'a-rev-id', inv.root.revision)
290
305
 
291
306
    def test_repack_inventory_5(self):
292
 
        inp = BytesIO(_committed_inv_v5)
293
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
 
307
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
 
308
            breezy.osutils.split_lines(_committed_inv_v5))
294
309
        outp = BytesIO()
295
310
        breezy.bzr.xml5.serializer_v5.write_inventory(inv, outp)
296
311
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
297
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(BytesIO(outp.getvalue()))
 
312
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
 
313
            breezy.osutils.split_lines(outp.getvalue()))
298
314
        self.assertEqual(inv, inv2)
299
315
 
300
316
    def assertRoundTrips(self, xml_string):
306
322
        lines = breezy.bzr.xml5.serializer_v5.write_inventory_to_lines(inv)
307
323
        outp.seek(0)
308
324
        self.assertEqual(outp.readlines(), lines)
309
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(BytesIO(outp.getvalue()))
 
325
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(
 
326
            BytesIO(outp.getvalue()))
310
327
        self.assertEqual(inv, inv2)
311
328
 
312
329
    def tests_serialize_inventory_v5_with_root(self):
316
333
        """Check that repacking a revision yields the same information"""
317
334
        inp = BytesIO(txt)
318
335
        rev = breezy.bzr.xml5.serializer_v5.read_revision(inp)
319
 
        outp = BytesIO()
320
 
        breezy.bzr.xml5.serializer_v5.write_revision(rev, outp)
321
 
        outfile_contents = outp.getvalue()
322
 
        rev2 = breezy.bzr.xml5.serializer_v5.read_revision(BytesIO(outfile_contents))
 
336
        outfile_contents = breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev)
 
337
        rev2 = breezy.bzr.xml5.serializer_v5.read_revision(
 
338
            BytesIO(outfile_contents))
323
339
        self.assertEqual(rev, rev2)
324
340
 
325
341
    def test_repack_revision_5(self):
332
348
    def test_pack_revision_5(self):
333
349
        """Pack revision to XML v5"""
334
350
        # fixed 20051025, revisions should have final newline
335
 
        rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(_revision_v5)
336
 
        outp = BytesIO()
337
 
        breezy.bzr.xml5.serializer_v5.write_revision(rev, outp)
338
 
        outfile_contents = outp.getvalue()
339
 
        self.assertEqual(outfile_contents[-1], '\n')
340
 
        self.assertEqualDiff(outfile_contents, breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev))
 
351
        rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(
 
352
            _revision_v5)
 
353
        outfile_contents = breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev)
 
354
        self.assertEqual(outfile_contents[-1:], b'\n')
 
355
        self.assertEqualDiff(
 
356
            outfile_contents,
 
357
            b''.join(breezy.bzr.xml5.serializer_v5.write_revision_to_lines(rev)))
341
358
        self.assertEqualDiff(outfile_contents, _expected_rev_v5)
342
359
 
343
360
    def test_empty_property_value(self):
344
361
        """Create an empty property value check that it serializes correctly"""
345
362
        s_v5 = breezy.bzr.xml5.serializer_v5
346
363
        rev = s_v5.read_revision_from_string(_revision_v5)
347
 
        outp = BytesIO()
348
 
        props = {'empty':'', 'one':'one'}
 
364
        props = {'empty': '', 'one': 'one'}
349
365
        rev.properties = props
350
 
        txt = s_v5.write_revision_to_string(rev)
 
366
        txt = b''.join(s_v5.write_revision_to_lines(rev))
351
367
        new_rev = s_v5.read_revision_from_string(txt)
352
368
        self.assertEqual(props, new_rev.properties)
353
369
 
354
370
    def get_sample_inventory(self):
355
 
        inv = Inventory('tree-root-321', revision_id='rev_outer')
356
 
        inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
357
 
        inv.add(inventory.InventoryDirectory('dir-id', 'dir',
358
 
                                             'tree-root-321'))
359
 
        inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
360
 
        inv['tree-root-321'].revision = 'rev_outer'
361
 
        inv['dir-id'].revision = 'rev_outer'
362
 
        inv['file-id'].revision = 'rev_outer'
363
 
        inv['file-id'].text_sha1 = 'A'
364
 
        inv['file-id'].text_size = 1
365
 
        inv['link-id'].revision = 'rev_outer'
366
 
        inv['link-id'].symlink_target = 'a'
 
371
        inv = Inventory(b'tree-root-321', revision_id=b'rev_outer')
 
372
        inv.add(inventory.InventoryFile(b'file-id', 'file', b'tree-root-321'))
 
373
        inv.add(inventory.InventoryDirectory(b'dir-id', 'dir',
 
374
                                             b'tree-root-321'))
 
375
        inv.add(inventory.InventoryLink(b'link-id', 'link', b'tree-root-321'))
 
376
        inv.get_entry(b'tree-root-321').revision = b'rev_outer'
 
377
        inv.get_entry(b'dir-id').revision = b'rev_outer'
 
378
        inv.get_entry(b'file-id').revision = b'rev_outer'
 
379
        inv.get_entry(b'file-id').text_sha1 = b'A'
 
380
        inv.get_entry(b'file-id').text_size = 1
 
381
        inv.get_entry(b'link-id').revision = b'rev_outer'
 
382
        inv.get_entry(b'link-id').symlink_target = 'a'
367
383
        return inv
368
384
 
369
385
    def test_roundtrip_inventory_v7(self):
370
386
        inv = self.get_sample_inventory()
371
 
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
372
 
                                        'rev_outer', 'rev_inner'))
373
 
        txt = xml7.serializer_v7.write_inventory_to_string(inv)
 
387
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
 
388
                                        b'rev_outer', b'rev_inner'))
374
389
        lines = xml7.serializer_v7.write_inventory_to_lines(inv)
375
 
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
376
 
        self.assertEqualDiff(_expected_inv_v7, txt)
377
 
        inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
 
390
        self.assertEqualDiff(_expected_inv_v7, b''.join(lines))
 
391
        inv2 = xml7.serializer_v7.read_inventory_from_lines(lines)
378
392
        self.assertEqual(5, len(inv2))
379
393
        for path, ie in inv.iter_entries():
380
 
            self.assertEqual(ie, inv2[ie.file_id])
 
394
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
381
395
 
382
396
    def test_roundtrip_inventory_v6(self):
383
397
        inv = self.get_sample_inventory()
384
 
        txt = xml6.serializer_v6.write_inventory_to_string(inv)
385
398
        lines = xml6.serializer_v6.write_inventory_to_lines(inv)
386
 
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
387
 
        self.assertEqualDiff(_expected_inv_v6, txt)
388
 
        inv2 = xml6.serializer_v6.read_inventory_from_string(txt)
 
399
        self.assertEqualDiff(_expected_inv_v6, b''.join(lines))
 
400
        inv2 = xml6.serializer_v6.read_inventory_from_lines(lines)
389
401
        self.assertEqual(4, len(inv2))
390
402
        for path, ie in inv.iter_entries():
391
 
            self.assertEqual(ie, inv2[ie.file_id])
 
403
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
392
404
 
393
405
    def test_wrong_format_v7(self):
394
406
        """Can't accidentally open a file with wrong serializer"""
395
407
        s_v6 = breezy.bzr.xml6.serializer_v6
396
408
        s_v7 = xml7.serializer_v7
397
409
        self.assertRaises(errors.UnexpectedInventoryFormat,
398
 
                          s_v7.read_inventory_from_string, _expected_inv_v5)
 
410
                          s_v7.read_inventory_from_lines,
 
411
                          breezy.osutils.split_lines(_expected_inv_v5))
399
412
        self.assertRaises(errors.UnexpectedInventoryFormat,
400
 
                          s_v6.read_inventory_from_string, _expected_inv_v7)
 
413
                          s_v6.read_inventory_from_lines,
 
414
                          breezy.osutils.split_lines(_expected_inv_v7))
401
415
 
402
416
    def test_tree_reference(self):
403
417
        s_v5 = breezy.bzr.xml5.serializer_v5
404
418
        s_v6 = breezy.bzr.xml6.serializer_v6
405
419
        s_v7 = xml7.serializer_v7
406
 
        inv = Inventory('tree-root-321', revision_id='rev-outer')
407
 
        inv.root.revision = 'root-rev'
408
 
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
409
 
                                        'rev-outer', 'rev-inner'))
410
 
        self.assertRaises(errors.UnsupportedInventoryKind,
411
 
                          s_v5.write_inventory_to_string, inv)
412
 
        self.assertRaises(errors.UnsupportedInventoryKind,
413
 
                          s_v6.write_inventory_to_string, inv)
414
 
        txt = s_v7.write_inventory_to_string(inv)
415
 
        lines = s_v7.write_inventory_to_lines(inv)
416
 
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
417
 
        inv2 = s_v7.read_inventory_from_string(txt)
418
 
        self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
419
 
        self.assertEqual('rev-outer', inv2['nested-id'].revision)
420
 
        self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
 
420
        inv = Inventory(b'tree-root-321', revision_id=b'rev-outer')
 
421
        inv.root.revision = b'root-rev'
 
422
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
 
423
                                        b'rev-outer', b'rev-inner'))
 
424
        self.assertRaises(errors.UnsupportedInventoryKind,
 
425
                          s_v5.write_inventory_to_lines, inv)
 
426
        self.assertRaises(errors.UnsupportedInventoryKind,
 
427
                          s_v6.write_inventory_to_lines, inv)
 
428
        lines = s_v7.write_inventory_to_chunks(inv)
 
429
        inv2 = s_v7.read_inventory_from_lines(lines)
 
430
        self.assertEqual(b'tree-root-321',
 
431
                         inv2.get_entry(b'nested-id').parent_id)
 
432
        self.assertEqual(b'rev-outer', inv2.get_entry(b'nested-id').revision)
 
433
        self.assertEqual(
 
434
            b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
421
435
 
422
436
    def test_roundtrip_inventory_v8(self):
423
437
        inv = self.get_sample_inventory()
424
 
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
425
 
        inv2 = xml8.serializer_v8.read_inventory_from_string(txt)
 
438
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
 
439
        inv2 = xml8.serializer_v8.read_inventory_from_lines(lines)
426
440
        self.assertEqual(4, len(inv2))
427
441
        for path, ie in inv.iter_entries():
428
 
            self.assertEqual(ie, inv2[ie.file_id])
 
442
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
429
443
 
430
444
    def test_inventory_text_v8(self):
431
445
        inv = self.get_sample_inventory()
432
 
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
433
446
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
434
 
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
435
 
        self.assertEqualDiff(_expected_inv_v8, txt)
 
447
        self.assertEqualDiff(_expected_inv_v8, b''.join(lines))
436
448
 
437
449
    def test_revision_text_v6(self):
438
450
        """Pack revision to XML v6"""
439
451
        rev = breezy.bzr.xml6.serializer_v6.read_revision_from_string(
440
452
            _expected_rev_v5)
441
 
        serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_string(rev)
442
 
        self.assertEqualDiff(serialized, _expected_rev_v5)
 
453
        serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_lines(
 
454
            rev)
 
455
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
443
456
 
444
457
    def test_revision_text_v7(self):
445
458
        """Pack revision to XML v7"""
446
459
        rev = breezy.bzr.xml7.serializer_v7.read_revision_from_string(
447
460
            _expected_rev_v5)
448
 
        serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_string(rev)
449
 
        self.assertEqualDiff(serialized, _expected_rev_v5)
 
461
        serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_lines(
 
462
            rev)
 
463
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
450
464
 
451
465
    def test_revision_text_v8(self):
452
466
        """Pack revision to XML v8"""
453
467
        rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
454
468
            _expected_rev_v8)
455
 
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_string(rev)
456
 
        self.assertEqualDiff(serialized, _expected_rev_v8)
 
469
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
 
470
            rev)
 
471
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v8)
 
472
 
 
473
    def test_revision_text_v8_complex(self):
 
474
        """Pack revision to XML v8"""
 
475
        rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
 
476
            _expected_rev_v8_complex)
 
477
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
 
478
            rev)
 
479
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v8_complex)
457
480
 
458
481
    def test_revision_ids_are_utf8(self):
459
482
        """Parsed revision_ids should all be utf-8 strings, not unicode."""
460
483
        s_v5 = breezy.bzr.xml5.serializer_v5
461
484
        rev = s_v5.read_revision_from_string(_revision_utf8_v5)
462
 
        self.assertEqual('erik@b\xc3\xa5gfors-02', rev.revision_id)
463
 
        self.assertIsInstance(rev.revision_id, str)
464
 
        self.assertEqual(['erik@b\xc3\xa5gfors-01'], rev.parent_ids)
 
485
        self.assertEqual(b'erik@b\xc3\xa5gfors-02', rev.revision_id)
 
486
        self.assertIsInstance(rev.revision_id, bytes)
 
487
        self.assertEqual([b'erik@b\xc3\xa5gfors-01'], rev.parent_ids)
465
488
        for parent_id in rev.parent_ids:
466
 
            self.assertIsInstance(parent_id, str)
 
489
            self.assertIsInstance(parent_id, bytes)
467
490
        self.assertEqual(u'Include \xb5nicode characters\n', rev.message)
468
 
        self.assertIsInstance(rev.message, unicode)
 
491
        self.assertIsInstance(rev.message, str)
469
492
 
470
493
        # ie.revision should either be None or a utf-8 revision id
471
 
        inv = s_v5.read_inventory_from_string(_inventory_utf8_v5)
 
494
        inv = s_v5.read_inventory_from_lines(breezy.osutils.split_lines(_inventory_utf8_v5))
472
495
        rev_id_1 = u'erik@b\xe5gfors-01'.encode('utf8')
473
496
        rev_id_2 = u'erik@b\xe5gfors-02'.encode('utf8')
474
497
        fid_root = u'TRE\xe9_ROOT'.encode('utf8')
479
502
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
480
503
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
481
504
                    (u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
482
 
                   ]
 
505
                    ]
483
506
        self.assertEqual(rev_id_2, inv.revision_id)
484
 
        self.assertIsInstance(inv.revision_id, str)
 
507
        self.assertIsInstance(inv.revision_id, bytes)
485
508
 
486
509
        actual = list(inv.iter_entries_by_dir())
487
510
        for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),
488
511
             (act_path, act_ie)) in zip(expected, actual):
489
512
            self.assertEqual(exp_path, act_path)
490
 
            self.assertIsInstance(act_path, unicode)
 
513
            self.assertIsInstance(act_path, str)
491
514
            self.assertEqual(exp_file_id, act_ie.file_id)
492
 
            self.assertIsInstance(act_ie.file_id, str)
 
515
            self.assertIsInstance(act_ie.file_id, bytes)
493
516
            self.assertEqual(exp_parent_id, act_ie.parent_id)
494
517
            if exp_parent_id is not None:
495
 
                self.assertIsInstance(act_ie.parent_id, str)
 
518
                self.assertIsInstance(act_ie.parent_id, bytes)
496
519
            self.assertEqual(exp_rev_id, act_ie.revision)
497
520
            if exp_rev_id is not None:
498
 
                self.assertIsInstance(act_ie.revision, str)
 
521
                self.assertIsInstance(act_ie.revision, bytes)
499
522
 
500
523
        self.assertEqual(len(expected), len(actual))
501
524
 
 
525
    def test_serialization_error(self):
 
526
        s_v5 = breezy.bzr.xml5.serializer_v5
 
527
        e = self.assertRaises(
 
528
            errors.UnexpectedInventoryFormat,
 
529
            s_v5.read_inventory_from_lines, [b"<Notquitexml"])
 
530
        self.assertEqual(str(e), "unclosed token: line 1, column 0")
 
531
 
502
532
 
503
533
class TestEncodeAndEscape(TestCase):
504
534
    """Whitebox testing of the _encode_and_escape function."""
514
544
        # are being used in xml attributes, and by returning it now, we have to
515
545
        # do fewer string operations later.
516
546
        val = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
517
 
        self.assertEqual('foo bar"', val)
 
547
        self.assertEqual(b'foo bar', val)
518
548
        # The second time should be cached
519
549
        val2 = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
520
550
        self.assertIs(val2, val)
521
551
 
522
552
    def test_ascii_with_xml(self):
523
 
        self.assertEqual('&amp;&apos;&quot;&lt;&gt;"',
 
553
        self.assertEqual(b'&amp;&apos;&quot;&lt;&gt;',
524
554
                         breezy.bzr.xml_serializer.encode_and_escape('&\'"<>'))
525
555
 
526
556
    def test_utf8_with_xml(self):
527
557
        # u'\xb5\xe5&\u062c'
528
 
        utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
529
 
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
 
558
        utf8_str = b'\xc2\xb5\xc3\xa5&\xd8\xac'
 
559
        self.assertEqual(b'&#181;&#229;&amp;&#1580;',
530
560
                         breezy.bzr.xml_serializer.encode_and_escape(utf8_str))
531
561
 
532
562
    def test_unicode(self):
533
563
        uni_str = u'\xb5\xe5&\u062c'
534
 
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
 
564
        self.assertEqual(b'&#181;&#229;&amp;&#1580;',
535
565
                         breezy.bzr.xml_serializer.encode_and_escape(uni_str))
536
566
 
537
567
 
539
569
 
540
570
    def test_unescape_xml(self):
541
571
        """We get some kind of error when malformed entities are passed"""
542
 
        self.assertRaises(KeyError, breezy.bzr.xml8._unescape_xml, 'foo&bar;')
 
572
        self.assertRaises(KeyError, breezy.bzr.xml8._unescape_xml, b'foo&bar;')