151
_expected_rev_v8 = """<revision committer="Martin Pool <mbp@sourcefrog.net>" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
152
<message>- start splitting code for xml (de)serialization away from objects
153
preparatory to supporting multiple formats by a single library
156
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" />
161
_expected_inv_v8 = """<inventory format="8" revision_id="rev_outer">
162
<directory file_id="tree-root-321" name="" revision="rev_outer" />
163
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
164
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
165
<symlink file_id="link-id" name="link" parent_id="tree-root-321" revision="rev_outer" symlink_target="a" />
169
150
_revision_utf8_v5 = """<revision committer="Erik Bågfors <erik@foo.net>"
170
151
inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
171
152
revision_id="erik@bågfors-02"
197
# Before revision_id was always stored as an attribute
198
_inventory_v5a = """<inventory format="5">
202
# Before revision_id was always stored as an attribute
203
_inventory_v5b = """<inventory format="5" revision_id="a-rev-id">
208
179
class TestSerializer(TestCase):
209
180
"""Test XML serialization"""
276
247
eq(ie.name, 'bar')
277
248
eq(inv[ie.parent_id].kind, 'directory')
279
def test_unpack_inventory_5a(self):
280
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
281
_inventory_v5a, revision_id='test-rev-id')
282
self.assertEqual('test-rev-id', inv.root.revision)
284
def test_unpack_inventory_5b(self):
285
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
286
_inventory_v5b, revision_id='test-rev-id')
287
self.assertEqual('a-rev-id', inv.root.revision)
289
250
def test_repack_inventory_5(self):
290
251
inp = StringIO(_committed_inv_v5)
291
252
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
349
310
new_rev = s_v5.read_revision_from_string(txt)
350
311
self.assertEqual(props, new_rev.properties)
352
def get_sample_inventory(self):
313
def test_roundtrip_inventory_v7(self):
353
314
inv = Inventory('tree-root-321', revision_id='rev_outer')
315
inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
316
'rev_outer', 'rev_inner'))
354
317
inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
355
318
inv.add(inventory.InventoryDirectory('dir-id', 'dir',
356
319
'tree-root-321'))
362
325
inv['file-id'].text_size = 1
363
326
inv['link-id'].revision = 'rev_outer'
364
327
inv['link-id'].symlink_target = 'a'
367
def test_roundtrip_inventory_v7(self):
368
inv = self.get_sample_inventory()
369
inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
370
'rev_outer', 'rev_inner'))
371
328
txt = xml7.serializer_v7.write_inventory_to_string(inv)
372
329
lines = xml7.serializer_v7.write_inventory_to_lines(inv)
373
330
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
412
369
s_v5.read_inventory_from_string,
413
370
txt.replace('format="7"', 'format="5"'))
415
def test_roundtrip_inventory_v8(self):
416
inv = self.get_sample_inventory()
417
txt = xml8.serializer_v8.write_inventory_to_string(inv)
418
inv2 = xml8.serializer_v8.read_inventory_from_string(txt)
419
self.assertEqual(4, len(inv2))
420
for path, ie in inv.iter_entries():
421
self.assertEqual(ie, inv2[ie.file_id])
423
def test_inventory_text_v8(self):
424
inv = self.get_sample_inventory()
425
txt = xml8.serializer_v8.write_inventory_to_string(inv)
426
lines = xml8.serializer_v8.write_inventory_to_lines(inv)
427
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
428
self.assertEqualDiff(_expected_inv_v8, txt)
430
def test_revision_text_v6(self):
431
"""Pack revision to XML v6"""
432
rev = bzrlib.xml6.serializer_v6.read_revision_from_string(
434
serialized = bzrlib.xml6.serializer_v6.write_revision_to_string(rev)
435
self.assertEqualDiff(serialized, _expected_rev_v5)
437
def test_revision_text_v7(self):
438
"""Pack revision to XML v7"""
439
rev = bzrlib.xml7.serializer_v7.read_revision_from_string(
441
serialized = bzrlib.xml7.serializer_v7.write_revision_to_string(rev)
442
self.assertEqualDiff(serialized, _expected_rev_v5)
444
def test_revision_text_v8(self):
445
"""Pack revision to XML v8"""
446
rev = bzrlib.xml8.serializer_v8.read_revision_from_string(
448
serialized = bzrlib.xml8.serializer_v8.write_revision_to_string(rev)
449
self.assertEqualDiff(serialized, _expected_rev_v8)
451
372
def test_revision_ids_are_utf8(self):
452
373
"""Parsed revision_ids should all be utf-8 strings, not unicode."""
453
374
s_v5 = bzrlib.xml5.serializer_v5
501
422
xml_serializer.format_registry.get('6'))
502
423
self.assertIs(bzrlib.xml7.serializer_v7,
503
424
xml_serializer.format_registry.get('7'))
504
self.assertIs(bzrlib.xml8.serializer_v8,
505
xml_serializer.format_registry.get('8'))
508
427
class TestEncodeAndEscape(TestCase):
512
431
# Keep the cache clear before and after the test
513
bzrlib.xml8._ensure_utf8_re()
514
bzrlib.xml8._clear_cache()
515
self.addCleanup(bzrlib.xml8._clear_cache)
432
bzrlib.xml5._ensure_utf8_re()
433
bzrlib.xml5._clear_cache()
434
self.addCleanup(bzrlib.xml5._clear_cache)
517
436
def test_simple_ascii(self):
518
437
# _encode_and_escape always appends a final ", because these parameters
519
438
# are being used in xml attributes, and by returning it now, we have to
520
439
# do fewer string operations later.
521
val = bzrlib.xml8._encode_and_escape('foo bar')
440
val = bzrlib.xml5._encode_and_escape('foo bar')
522
441
self.assertEqual('foo bar"', val)
523
442
# The second time should be cached
524
val2 = bzrlib.xml8._encode_and_escape('foo bar')
443
val2 = bzrlib.xml5._encode_and_escape('foo bar')
525
444
self.assertIs(val2, val)
527
446
def test_ascii_with_xml(self):
528
447
self.assertEqual('&'"<>"',
529
bzrlib.xml8._encode_and_escape('&\'"<>'))
448
bzrlib.xml5._encode_and_escape('&\'"<>'))
531
450
def test_utf8_with_xml(self):
532
451
# u'\xb5\xe5&\u062c'
533
452
utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
534
453
self.assertEqual('µå&ج"',
535
bzrlib.xml8._encode_and_escape(utf8_str))
454
bzrlib.xml5._encode_and_escape(utf8_str))
537
456
def test_unicode(self):
538
457
uni_str = u'\xb5\xe5&\u062c'
539
458
self.assertEqual('µå&ج"',
540
bzrlib.xml8._encode_and_escape(uni_str))
459
bzrlib.xml5._encode_and_escape(uni_str))
added
removed
bzrlib/tests/test_xml.py
