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
17
from cStringIO import StringIO
28
from bzrlib.tests import TestCase
29
from bzrlib.inventory import Inventory, InventoryEntry
30
from bzrlib.xml4 import serializer_v4
33
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
34
<entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_id="TREE_ROOT" />
35
<entry file_id="foo-20050801201819-4139aa4a272f4250" kind="directory" name="foo" parent_id="TREE_ROOT" />
36
<entry file_id="bar-20050824000535-6bc48cfad47ed134" kind="file" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" />
40
_revision_v4 = """<revision committer="Martin Pool <mbp@sourcefrog.net>"
41
inventory_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
42
inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
43
revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
44
timestamp="1125907235.212"
46
<message>- start splitting code for xml (de)serialization away from objects
47
preparatory to supporting multiple formats by a single library
50
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" revision_sha1="7bdf4cc8c5bdac739f8cf9b10b78cf4b68f915ff" />
55
_revision_v5 = """<revision committer="Martin Pool <mbp@sourcefrog.net>"
28
from ..sixish import (
32
from ..bzr.inventory import Inventory
33
from . import TestCase
34
import breezy.bzr.xml5
36
_revision_v5 = b"""<revision committer="Martin Pool <mbp@sourcefrog.net>"
56
37
inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
57
38
revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
58
39
timestamp="1125907235.212"
218
215
class TestSerializer(TestCase):
219
216
"""Test XML serialization"""
221
def test_canned_inventory(self):
222
"""Test unpacked a canned inventory v4 file."""
223
inp = StringIO(_working_inventory_v4)
224
inv = serializer_v4.read_inventory(inp)
225
self.assertEqual(len(inv), 4)
226
self.assert_('bar-20050901064931-73b4b1138abc9cd2' in inv)
228
def test_unpack_revision(self):
229
"""Test unpacking a canned revision v4"""
230
inp = StringIO(_revision_v4)
231
rev = serializer_v4.read_revision(inp)
232
eq = self.assertEqual
234
"Martin Pool <mbp@sourcefrog.net>")
236
"mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
237
eq(len(rev.parent_ids), 1)
238
eq(rev.parent_ids[0],
239
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
241
218
def test_unpack_revision_5(self):
242
219
"""Test unpacking a canned revision v5"""
243
inp = StringIO(_revision_v5)
244
rev = bzrlib.xml5.serializer_v5.read_revision(inp)
220
inp = BytesIO(_revision_v5)
221
rev = breezy.bzr.xml5.serializer_v5.read_revision(inp)
245
222
eq = self.assertEqual
246
223
eq(rev.committer,
247
224
"Martin Pool <mbp@sourcefrog.net>")
248
225
eq(len(rev.parent_ids), 1)
249
226
eq(rev.timezone, 36000)
250
227
eq(rev.parent_ids[0],
251
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
228
b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
253
230
def test_unpack_revision_5_utc(self):
254
inp = StringIO(_revision_v5_utc)
255
rev = bzrlib.xml5.serializer_v5.read_revision(inp)
231
inp = BytesIO(_revision_v5_utc)
232
rev = breezy.bzr.xml5.serializer_v5.read_revision(inp)
256
233
eq = self.assertEqual
257
234
eq(rev.committer,
258
235
"Martin Pool <mbp@sourcefrog.net>")
259
236
eq(len(rev.parent_ids), 1)
260
237
eq(rev.timezone, 0)
261
238
eq(rev.parent_ids[0],
262
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
239
b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
264
241
def test_unpack_inventory_5(self):
265
242
"""Unpack canned new-style inventory"""
266
inp = StringIO(_committed_inv_v5)
267
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
243
inp = BytesIO(_committed_inv_v5)
244
inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
268
245
eq = self.assertEqual
270
ie = inv['bar-20050824000535-6bc48cfad47ed134']
247
ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
271
248
eq(ie.kind, 'file')
272
eq(ie.revision, 'mbp@foo-00')
249
eq(ie.revision, b'mbp@foo-00')
273
250
eq(ie.name, 'bar')
274
eq(inv[ie.parent_id].kind, 'directory')
251
eq(inv.get_entry(ie.parent_id).kind, 'directory')
276
253
def test_unpack_basis_inventory_5(self):
277
254
"""Unpack canned new-style inventory"""
278
inp = StringIO(_basis_inv_v5)
279
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
255
inp = BytesIO(_basis_inv_v5)
256
inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
280
257
eq = self.assertEqual
282
eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
283
ie = inv['bar-20050824000535-6bc48cfad47ed134']
260
b'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
261
ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
284
262
eq(ie.kind, 'file')
285
eq(ie.revision, 'mbp@foo-00')
263
eq(ie.revision, b'mbp@foo-00')
286
264
eq(ie.name, 'bar')
287
eq(inv[ie.parent_id].kind, 'directory')
265
eq(inv.get_entry(ie.parent_id).kind, 'directory')
289
267
def test_unpack_inventory_5a(self):
290
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
291
_inventory_v5a, revision_id='test-rev-id')
292
self.assertEqual('test-rev-id', inv.root.revision)
268
inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
269
_inventory_v5a, revision_id=b'test-rev-id')
270
self.assertEqual(b'test-rev-id', inv.root.revision)
294
272
def test_unpack_inventory_5a_cache_and_copy(self):
295
273
# Passing an entry_cache should get populated with the objects
296
274
# But the returned objects should be copies if return_from_cache is
298
276
entry_cache = fifo_cache.FIFOCache()
299
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
300
_inventory_v5a, revision_id='test-rev-id',
277
inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
278
_inventory_v5a, revision_id=b'test-rev-id',
301
279
entry_cache=entry_cache, return_from_cache=False)
302
280
for entry in inv.iter_just_entries():
303
281
key = (entry.file_id, entry.revision)
324
302
self.assertIs(entry, entry_cache[key])
326
304
def test_unpack_inventory_5b(self):
327
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
328
_inventory_v5b, revision_id='test-rev-id')
329
self.assertEqual('a-rev-id', inv.root.revision)
305
inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_string(
306
_inventory_v5b, revision_id=b'test-rev-id')
307
self.assertEqual(b'a-rev-id', inv.root.revision)
331
309
def test_repack_inventory_5(self):
332
inp = StringIO(_committed_inv_v5)
333
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
335
bzrlib.xml5.serializer_v5.write_inventory(inv, outp)
310
inp = BytesIO(_committed_inv_v5)
311
inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
313
breezy.bzr.xml5.serializer_v5.write_inventory(inv, outp)
336
314
self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
337
inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
315
inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(
316
BytesIO(outp.getvalue()))
338
317
self.assertEqual(inv, inv2)
340
319
def assertRoundTrips(self, xml_string):
341
inp = StringIO(xml_string)
342
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
344
bzrlib.xml5.serializer_v5.write_inventory(inv, outp)
320
inp = BytesIO(xml_string)
321
inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
323
breezy.bzr.xml5.serializer_v5.write_inventory(inv, outp)
345
324
self.assertEqualDiff(xml_string, outp.getvalue())
346
lines = bzrlib.xml5.serializer_v5.write_inventory_to_lines(inv)
325
lines = breezy.bzr.xml5.serializer_v5.write_inventory_to_lines(inv)
348
327
self.assertEqual(outp.readlines(), lines)
349
inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
328
inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(
329
BytesIO(outp.getvalue()))
350
330
self.assertEqual(inv, inv2)
352
332
def tests_serialize_inventory_v5_with_root(self):
372
351
def test_pack_revision_5(self):
373
352
"""Pack revision to XML v5"""
374
353
# fixed 20051025, revisions should have final newline
375
rev = bzrlib.xml5.serializer_v5.read_revision_from_string(_revision_v5)
377
bzrlib.xml5.serializer_v5.write_revision(rev, outp)
378
outfile_contents = outp.getvalue()
379
self.assertEqual(outfile_contents[-1], '\n')
380
self.assertEqualDiff(outfile_contents, bzrlib.xml5.serializer_v5.write_revision_to_string(rev))
354
rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(
356
outfile_contents = breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev)
357
self.assertEqual(outfile_contents[-1:], b'\n')
358
self.assertEqualDiff(
360
b''.join(breezy.bzr.xml5.serializer_v5.write_revision_to_lines(rev)))
381
361
self.assertEqualDiff(outfile_contents, _expected_rev_v5)
383
363
def test_empty_property_value(self):
384
364
"""Create an empty property value check that it serializes correctly"""
385
s_v5 = bzrlib.xml5.serializer_v5
365
s_v5 = breezy.bzr.xml5.serializer_v5
386
366
rev = s_v5.read_revision_from_string(_revision_v5)
388
props = {'empty':'', 'one':'one'}
367
props = {'empty': '', 'one': 'one'}
389
368
rev.properties = props
390
txt = s_v5.write_revision_to_string(rev)
369
txt = b''.join(s_v5.write_revision_to_lines(rev))
391
370
new_rev = s_v5.read_revision_from_string(txt)
392
371
self.assertEqual(props, new_rev.properties)
394
373
def get_sample_inventory(self):
395
inv = Inventory('tree-root-321', revision_id='rev_outer')
396
inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
397
inv.add(inventory.InventoryDirectory('dir-id', 'dir',
399
inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
400
inv['tree-root-321'].revision = 'rev_outer'
401
inv['dir-id'].revision = 'rev_outer'
402
inv['file-id'].revision = 'rev_outer'
403
inv['file-id'].text_sha1 = 'A'
404
inv['file-id'].text_size = 1
405
inv['link-id'].revision = 'rev_outer'
406
inv['link-id'].symlink_target = 'a'
374
inv = Inventory(b'tree-root-321', revision_id=b'rev_outer')
375
inv.add(inventory.InventoryFile(b'file-id', 'file', b'tree-root-321'))
376
inv.add(inventory.InventoryDirectory(b'dir-id', 'dir',
378
inv.add(inventory.InventoryLink(b'link-id', 'link', b'tree-root-321'))
379
inv.get_entry(b'tree-root-321').revision = b'rev_outer'
380
inv.get_entry(b'dir-id').revision = b'rev_outer'
381
inv.get_entry(b'file-id').revision = b'rev_outer'
382
inv.get_entry(b'file-id').text_sha1 = b'A'
383
inv.get_entry(b'file-id').text_size = 1
384
inv.get_entry(b'link-id').revision = b'rev_outer'
385
inv.get_entry(b'link-id').symlink_target = 'a'
409
388
def test_roundtrip_inventory_v7(self):
410
389
inv = self.get_sample_inventory()
411
inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
412
'rev_outer', 'rev_inner'))
390
inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
391
b'rev_outer', b'rev_inner'))
413
392
txt = xml7.serializer_v7.write_inventory_to_string(inv)
414
393
lines = xml7.serializer_v7.write_inventory_to_lines(inv)
415
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
394
self.assertEqual(breezy.osutils.split_lines(txt), lines)
416
395
self.assertEqualDiff(_expected_inv_v7, txt)
417
396
inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
418
397
self.assertEqual(5, len(inv2))
419
398
for path, ie in inv.iter_entries():
420
self.assertEqual(ie, inv2[ie.file_id])
399
self.assertEqual(ie, inv2.get_entry(ie.file_id))
422
401
def test_roundtrip_inventory_v6(self):
423
402
inv = self.get_sample_inventory()
424
403
txt = xml6.serializer_v6.write_inventory_to_string(inv)
425
404
lines = xml6.serializer_v6.write_inventory_to_lines(inv)
426
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
405
self.assertEqual(breezy.osutils.split_lines(txt), lines)
427
406
self.assertEqualDiff(_expected_inv_v6, txt)
428
407
inv2 = xml6.serializer_v6.read_inventory_from_string(txt)
429
408
self.assertEqual(4, len(inv2))
430
409
for path, ie in inv.iter_entries():
431
self.assertEqual(ie, inv2[ie.file_id])
410
self.assertEqual(ie, inv2.get_entry(ie.file_id))
433
412
def test_wrong_format_v7(self):
434
413
"""Can't accidentally open a file with wrong serializer"""
435
s_v6 = bzrlib.xml6.serializer_v6
414
s_v6 = breezy.bzr.xml6.serializer_v6
436
415
s_v7 = xml7.serializer_v7
437
416
self.assertRaises(errors.UnexpectedInventoryFormat,
438
417
s_v7.read_inventory_from_string, _expected_inv_v5)
440
419
s_v6.read_inventory_from_string, _expected_inv_v7)
442
421
def test_tree_reference(self):
443
s_v5 = bzrlib.xml5.serializer_v5
444
s_v6 = bzrlib.xml6.serializer_v6
422
s_v5 = breezy.bzr.xml5.serializer_v5
423
s_v6 = breezy.bzr.xml6.serializer_v6
445
424
s_v7 = xml7.serializer_v7
446
inv = Inventory('tree-root-321', revision_id='rev-outer')
447
inv.root.revision = 'root-rev'
448
inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
449
'rev-outer', 'rev-inner'))
425
inv = Inventory(b'tree-root-321', revision_id=b'rev-outer')
426
inv.root.revision = b'root-rev'
427
inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
428
b'rev-outer', b'rev-inner'))
450
429
self.assertRaises(errors.UnsupportedInventoryKind,
451
430
s_v5.write_inventory_to_string, inv)
452
431
self.assertRaises(errors.UnsupportedInventoryKind,
453
432
s_v6.write_inventory_to_string, inv)
454
433
txt = s_v7.write_inventory_to_string(inv)
455
434
lines = s_v7.write_inventory_to_lines(inv)
456
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
435
self.assertEqual(breezy.osutils.split_lines(txt), lines)
457
436
inv2 = s_v7.read_inventory_from_string(txt)
458
self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
459
self.assertEqual('rev-outer', inv2['nested-id'].revision)
460
self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
461
self.assertRaises(errors.UnsupportedInventoryKind,
462
s_v6.read_inventory_from_string,
463
txt.replace('format="7"', 'format="6"'))
464
self.assertRaises(errors.UnsupportedInventoryKind,
465
s_v5.read_inventory_from_string,
466
txt.replace('format="7"', 'format="5"'))
437
self.assertEqual(b'tree-root-321',
438
inv2.get_entry(b'nested-id').parent_id)
439
self.assertEqual(b'rev-outer', inv2.get_entry(b'nested-id').revision)
441
b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
468
443
def test_roundtrip_inventory_v8(self):
469
444
inv = self.get_sample_inventory()
471
446
inv2 = xml8.serializer_v8.read_inventory_from_string(txt)
472
447
self.assertEqual(4, len(inv2))
473
448
for path, ie in inv.iter_entries():
474
self.assertEqual(ie, inv2[ie.file_id])
449
self.assertEqual(ie, inv2.get_entry(ie.file_id))
476
451
def test_inventory_text_v8(self):
477
452
inv = self.get_sample_inventory()
478
453
txt = xml8.serializer_v8.write_inventory_to_string(inv)
479
454
lines = xml8.serializer_v8.write_inventory_to_lines(inv)
480
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
455
self.assertEqual(breezy.osutils.split_lines(txt), lines)
481
456
self.assertEqualDiff(_expected_inv_v8, txt)
483
458
def test_revision_text_v6(self):
484
459
"""Pack revision to XML v6"""
485
rev = bzrlib.xml6.serializer_v6.read_revision_from_string(
460
rev = breezy.bzr.xml6.serializer_v6.read_revision_from_string(
486
461
_expected_rev_v5)
487
serialized = bzrlib.xml6.serializer_v6.write_revision_to_string(rev)
488
self.assertEqualDiff(serialized, _expected_rev_v5)
462
serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_lines(
464
self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
490
466
def test_revision_text_v7(self):
491
467
"""Pack revision to XML v7"""
492
rev = bzrlib.xml7.serializer_v7.read_revision_from_string(
468
rev = breezy.bzr.xml7.serializer_v7.read_revision_from_string(
493
469
_expected_rev_v5)
494
serialized = bzrlib.xml7.serializer_v7.write_revision_to_string(rev)
495
self.assertEqualDiff(serialized, _expected_rev_v5)
470
serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_lines(
472
self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
497
474
def test_revision_text_v8(self):
498
475
"""Pack revision to XML v8"""
499
rev = bzrlib.xml8.serializer_v8.read_revision_from_string(
476
rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
500
477
_expected_rev_v8)
501
serialized = bzrlib.xml8.serializer_v8.write_revision_to_string(rev)
502
self.assertEqualDiff(serialized, _expected_rev_v8)
478
serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
480
self.assertEqualDiff(b''.join(serialized), _expected_rev_v8)
482
def test_revision_text_v8_complex(self):
483
"""Pack revision to XML v8"""
484
rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
485
_expected_rev_v8_complex)
486
serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
488
self.assertEqualDiff(b''.join(serialized), _expected_rev_v8_complex)
504
490
def test_revision_ids_are_utf8(self):
505
491
"""Parsed revision_ids should all be utf-8 strings, not unicode."""
506
s_v5 = bzrlib.xml5.serializer_v5
492
s_v5 = breezy.bzr.xml5.serializer_v5
507
493
rev = s_v5.read_revision_from_string(_revision_utf8_v5)
508
self.assertEqual('erik@b\xc3\xa5gfors-02', rev.revision_id)
509
self.assertIsInstance(rev.revision_id, str)
510
self.assertEqual(['erik@b\xc3\xa5gfors-01'], rev.parent_ids)
494
self.assertEqual(b'erik@b\xc3\xa5gfors-02', rev.revision_id)
495
self.assertIsInstance(rev.revision_id, bytes)
496
self.assertEqual([b'erik@b\xc3\xa5gfors-01'], rev.parent_ids)
511
497
for parent_id in rev.parent_ids:
512
self.assertIsInstance(parent_id, str)
498
self.assertIsInstance(parent_id, bytes)
513
499
self.assertEqual(u'Include \xb5nicode characters\n', rev.message)
514
self.assertIsInstance(rev.message, unicode)
500
self.assertIsInstance(rev.message, text_type)
516
502
# ie.revision should either be None or a utf-8 revision id
517
503
inv = s_v5.read_inventory_from_string(_inventory_utf8_v5)
525
511
(u'b\xe5r', fid_bar1, fid_root, rev_id_1),
526
512
(u's\xb5bdir', fid_sub, fid_root, rev_id_1),
527
513
(u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
529
515
self.assertEqual(rev_id_2, inv.revision_id)
530
self.assertIsInstance(inv.revision_id, str)
516
self.assertIsInstance(inv.revision_id, bytes)
532
518
actual = list(inv.iter_entries_by_dir())
533
519
for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),
534
520
(act_path, act_ie)) in zip(expected, actual):
535
521
self.assertEqual(exp_path, act_path)
536
self.assertIsInstance(act_path, unicode)
522
self.assertIsInstance(act_path, text_type)
537
523
self.assertEqual(exp_file_id, act_ie.file_id)
538
self.assertIsInstance(act_ie.file_id, str)
524
self.assertIsInstance(act_ie.file_id, bytes)
539
525
self.assertEqual(exp_parent_id, act_ie.parent_id)
540
526
if exp_parent_id is not None:
541
self.assertIsInstance(act_ie.parent_id, str)
527
self.assertIsInstance(act_ie.parent_id, bytes)
542
528
self.assertEqual(exp_rev_id, act_ie.revision)
543
529
if exp_rev_id is not None:
544
self.assertIsInstance(act_ie.revision, str)
530
self.assertIsInstance(act_ie.revision, bytes)
546
532
self.assertEqual(len(expected), len(actual))
534
def test_serialization_error(self):
535
s_v5 = breezy.bzr.xml5.serializer_v5
536
e = self.assertRaises(
537
errors.UnexpectedInventoryFormat,
538
s_v5.read_inventory_from_string, b"<Notquitexml")
539
self.assertEqual(str(e), "unclosed token: line 1, column 0")
549
542
class TestEncodeAndEscape(TestCase):
550
543
"""Whitebox testing of the _encode_and_escape function."""
546
super(TestEncodeAndEscape, self).setUp()
554
547
# Keep the cache clear before and after the test
555
bzrlib.xml8._ensure_utf8_re()
556
bzrlib.xml8._clear_cache()
557
self.addCleanup(bzrlib.xml8._clear_cache)
548
breezy.bzr.xml_serializer._clear_cache()
549
self.addCleanup(breezy.bzr.xml_serializer._clear_cache)
559
551
def test_simple_ascii(self):
560
552
# _encode_and_escape always appends a final ", because these parameters
561
553
# are being used in xml attributes, and by returning it now, we have to
562
554
# do fewer string operations later.
563
val = bzrlib.xml8._encode_and_escape('foo bar')
564
self.assertEqual('foo bar"', val)
555
val = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
556
self.assertEqual(b'foo bar', val)
565
557
# The second time should be cached
566
val2 = bzrlib.xml8._encode_and_escape('foo bar')
558
val2 = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
567
559
self.assertIs(val2, val)
569
561
def test_ascii_with_xml(self):
570
self.assertEqual('&'"<>"',
571
bzrlib.xml8._encode_and_escape('&\'"<>'))
562
self.assertEqual(b'&'"<>',
563
breezy.bzr.xml_serializer.encode_and_escape('&\'"<>'))
573
565
def test_utf8_with_xml(self):
574
566
# u'\xb5\xe5&\u062c'
575
utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
576
self.assertEqual('µå&ج"',
577
bzrlib.xml8._encode_and_escape(utf8_str))
567
utf8_str = b'\xc2\xb5\xc3\xa5&\xd8\xac'
568
self.assertEqual(b'µå&ج',
569
breezy.bzr.xml_serializer.encode_and_escape(utf8_str))
579
571
def test_unicode(self):
580
572
uni_str = u'\xb5\xe5&\u062c'
581
self.assertEqual('µå&ج"',
582
bzrlib.xml8._encode_and_escape(uni_str))
573
self.assertEqual(b'µå&ج',
574
breezy.bzr.xml_serializer.encode_and_escape(uni_str))
577
class TestMisc(TestCase):
579
def test_unescape_xml(self):
580
"""We get some kind of error when malformed entities are passed"""
581
self.assertRaises(KeyError, breezy.bzr.xml8._unescape_xml, b'foo&bar;')
added
removed
breezy/tests/test_xml.py
