81
84
_committed_inv_v5 = """<inventory>
82
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
83
name="bar" parent_id="TREE_ROOT"
84
revision="mbp@foo-123123"/>
85
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
86
name="bar" parent_id="TREE_ROOT"
87
revision="mbp@foo-123123"
88
text_sha1="A" text_size="1"/>
85
89
<directory name="subdir"
86
90
file_id="foo-20050801201819-4139aa4a272f4250"
88
92
revision="mbp@foo-00"/>
89
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134"
90
name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
91
revision="mbp@foo-00"/>
93
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134"
94
name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
96
text_sha1="B" text_size="0"/>
95
100
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
96
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
97
name="bar" parent_id="TREE_ROOT"
101
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
102
name="bar" parent_id="TREE_ROOT"
98
103
revision="mbp@foo-123123"/>
99
104
<directory name="subdir"
100
105
file_id="foo-20050801201819-4139aa4a272f4250"
101
parent_id="TREE_ROOT"
106
parent_id="TREE_ROOT"
102
107
revision="mbp@foo-00"/>
103
<file file_id="bar-20050824000535-6bc48cfad47ed134"
104
name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
108
<file file_id="bar-20050824000535-6bc48cfad47ed134"
109
name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
105
110
revision="mbp@foo-00"/>
122
127
# DO NOT REFLOW THIS. Its the exact inventory we want.
123
128
_expected_inv_v5 = """<inventory format="5">
124
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" />
129
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
125
130
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" revision="mbp@foo-00" />
126
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
131
<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" />
131
136
_expected_inv_v5_root = """<inventory file_id="f<" format="5" revision_id="mother!">
132
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f<" revision="mbp@foo-123123" />
137
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f<" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
133
138
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" parent_id="f<" revision="mbp@foo-00" />
134
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
139
<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" />
140
<symlink file_id="link-1" name="link" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" symlink_target="a" />
144
_expected_inv_v6 = """<inventory format="6" revision_id="rev_outer">
145
<directory file_id="tree-root-321" name="" revision="rev_outer" />
146
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
147
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
148
<symlink file_id="link-id" name="link" parent_id="tree-root-321" revision="rev_outer" symlink_target="a" />
138
152
_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
139
153
<directory file_id="tree-root-321" name="" revision="rev_outer" />
140
154
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
141
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" />
142
<symlink file_id="link-id" name="link" parent_id="tree-root-321" revision="rev_outer" />
155
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
156
<symlink file_id="link-id" name="link" parent_id="tree-root-321" revision="rev_outer" symlink_target="a" />
143
157
<tree-reference file_id="nested-id" name="nested" parent_id="tree-root-321" revision="rev_outer" reference_revision="rev_inner" />
161
_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">
162
<message>- start splitting code for xml (de)serialization away from objects
163
preparatory to supporting multiple formats by a single library
166
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" />
171
_expected_inv_v8 = """<inventory format="8" revision_id="rev_outer">
172
<directory file_id="tree-root-321" name="" revision="rev_outer" />
173
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
174
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
175
<symlink file_id="link-id" name="link" parent_id="tree-root-321" revision="rev_outer" symlink_target="a" />
147
179
_revision_utf8_v5 = """<revision committer="Erik Bågfors <erik@foo.net>"
148
180
inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
149
181
revision_id="erik@bågfors-02"
243
286
eq(ie.name, 'bar')
244
287
eq(inv[ie.parent_id].kind, 'directory')
289
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)
294
def test_unpack_inventory_5a_cache_and_copy(self):
295
# Passing an entry_cache should get populated with the objects
296
# But the returned objects should be copies if return_from_cache is
298
entry_cache = fifo_cache.FIFOCache()
299
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
300
_inventory_v5a, revision_id='test-rev-id',
301
entry_cache=entry_cache, return_from_cache=False)
302
for entry in inv.iter_just_entries():
303
key = (entry.file_id, entry.revision)
304
if entry.file_id is inv.root.file_id:
305
# The root id is inferred for xml v5
306
self.assertFalse(key in entry_cache)
308
self.assertIsNot(entry, entry_cache[key])
310
def test_unpack_inventory_5a_cache_no_copy(self):
311
# Passing an entry_cache should get populated with the objects
312
# The returned objects should be exact if return_from_cache is
314
entry_cache = fifo_cache.FIFOCache()
315
inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
316
_inventory_v5a, revision_id='test-rev-id',
317
entry_cache=entry_cache, return_from_cache=True)
318
for entry in inv.iter_just_entries():
319
key = (entry.file_id, entry.revision)
320
if entry.file_id is inv.root.file_id:
321
# The root id is inferred for xml v5
322
self.assertFalse(key in entry_cache)
324
self.assertIs(entry, entry_cache[key])
326
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)
246
331
def test_repack_inventory_5(self):
247
332
inp = StringIO(_committed_inv_v5)
248
333
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
303
391
new_rev = s_v5.read_revision_from_string(txt)
304
392
self.assertEqual(props, new_rev.properties)
306
def test_roundtrip_inventory_v7(self):
394
def get_sample_inventory(self):
307
395
inv = Inventory('tree-root-321', revision_id='rev_outer')
308
inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
309
'rev_outer', 'rev_inner'))
310
396
inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
311
inv.add(inventory.InventoryDirectory('dir-id', 'dir',
397
inv.add(inventory.InventoryDirectory('dir-id', 'dir',
312
398
'tree-root-321'))
313
399
inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
314
400
inv['tree-root-321'].revision = 'rev_outer'
315
401
inv['dir-id'].revision = 'rev_outer'
316
402
inv['file-id'].revision = 'rev_outer'
403
inv['file-id'].text_sha1 = 'A'
404
inv['file-id'].text_size = 1
317
405
inv['link-id'].revision = 'rev_outer'
406
inv['link-id'].symlink_target = 'a'
409
def test_roundtrip_inventory_v7(self):
410
inv = self.get_sample_inventory()
411
inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
412
'rev_outer', 'rev_inner'))
318
413
txt = xml7.serializer_v7.write_inventory_to_string(inv)
414
lines = xml7.serializer_v7.write_inventory_to_lines(inv)
415
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
319
416
self.assertEqualDiff(_expected_inv_v7, txt)
320
417
inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
321
418
self.assertEqual(5, len(inv2))
322
419
for path, ie in inv.iter_entries():
323
420
self.assertEqual(ie, inv2[ie.file_id])
422
def test_roundtrip_inventory_v6(self):
423
inv = self.get_sample_inventory()
424
txt = xml6.serializer_v6.write_inventory_to_string(inv)
425
lines = xml6.serializer_v6.write_inventory_to_lines(inv)
426
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
427
self.assertEqualDiff(_expected_inv_v6, txt)
428
inv2 = xml6.serializer_v6.read_inventory_from_string(txt)
429
self.assertEqual(4, len(inv2))
430
for path, ie in inv.iter_entries():
431
self.assertEqual(ie, inv2[ie.file_id])
325
433
def test_wrong_format_v7(self):
326
434
"""Can't accidentally open a file with wrong serializer"""
327
435
s_v6 = bzrlib.xml6.serializer_v6
328
436
s_v7 = xml7.serializer_v7
329
self.assertRaises(errors.UnexpectedInventoryFormat,
437
self.assertRaises(errors.UnexpectedInventoryFormat,
330
438
s_v7.read_inventory_from_string, _expected_inv_v5)
331
self.assertRaises(errors.UnexpectedInventoryFormat,
439
self.assertRaises(errors.UnexpectedInventoryFormat,
332
440
s_v6.read_inventory_from_string, _expected_inv_v7)
334
442
def test_tree_reference(self):
335
443
s_v5 = bzrlib.xml5.serializer_v5
336
444
s_v6 = bzrlib.xml6.serializer_v6
337
445
s_v7 = xml7.serializer_v7
338
inv = Inventory('tree-root-321')
446
inv = Inventory('tree-root-321', revision_id='rev-outer')
447
inv.root.revision = 'root-rev'
339
448
inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
340
449
'rev-outer', 'rev-inner'))
341
self.assertRaises(errors.UnsupportedInventoryKind,
450
self.assertRaises(errors.UnsupportedInventoryKind,
342
451
s_v5.write_inventory_to_string, inv)
343
self.assertRaises(errors.UnsupportedInventoryKind,
452
self.assertRaises(errors.UnsupportedInventoryKind,
344
453
s_v6.write_inventory_to_string, inv)
345
454
txt = s_v7.write_inventory_to_string(inv)
455
lines = s_v7.write_inventory_to_lines(inv)
456
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
346
457
inv2 = s_v7.read_inventory_from_string(txt)
347
458
self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
348
459
self.assertEqual('rev-outer', inv2['nested-id'].revision)
349
460
self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
350
self.assertRaises(errors.UnsupportedInventoryKind,
461
self.assertRaises(errors.UnsupportedInventoryKind,
351
462
s_v6.read_inventory_from_string,
352
463
txt.replace('format="7"', 'format="6"'))
353
self.assertRaises(errors.UnsupportedInventoryKind,
464
self.assertRaises(errors.UnsupportedInventoryKind,
354
465
s_v5.read_inventory_from_string,
355
466
txt.replace('format="7"', 'format="5"'))
468
def test_roundtrip_inventory_v8(self):
469
inv = self.get_sample_inventory()
470
txt = xml8.serializer_v8.write_inventory_to_string(inv)
471
inv2 = xml8.serializer_v8.read_inventory_from_string(txt)
472
self.assertEqual(4, len(inv2))
473
for path, ie in inv.iter_entries():
474
self.assertEqual(ie, inv2[ie.file_id])
476
def test_inventory_text_v8(self):
477
inv = self.get_sample_inventory()
478
txt = xml8.serializer_v8.write_inventory_to_string(inv)
479
lines = xml8.serializer_v8.write_inventory_to_lines(inv)
480
self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
481
self.assertEqualDiff(_expected_inv_v8, txt)
483
def test_revision_text_v6(self):
484
"""Pack revision to XML v6"""
485
rev = bzrlib.xml6.serializer_v6.read_revision_from_string(
487
serialized = bzrlib.xml6.serializer_v6.write_revision_to_string(rev)
488
self.assertEqualDiff(serialized, _expected_rev_v5)
490
def test_revision_text_v7(self):
491
"""Pack revision to XML v7"""
492
rev = bzrlib.xml7.serializer_v7.read_revision_from_string(
494
serialized = bzrlib.xml7.serializer_v7.write_revision_to_string(rev)
495
self.assertEqualDiff(serialized, _expected_rev_v5)
497
def test_revision_text_v8(self):
498
"""Pack revision to XML v8"""
499
rev = bzrlib.xml8.serializer_v8.read_revision_from_string(
501
serialized = bzrlib.xml8.serializer_v8.write_revision_to_string(rev)
502
self.assertEqualDiff(serialized, _expected_rev_v8)
357
504
def test_revision_ids_are_utf8(self):
358
505
"""Parsed revision_ids should all be utf-8 strings, not unicode."""
359
506
s_v5 = bzrlib.xml5.serializer_v5
399
546
self.assertEqual(len(expected), len(actual))
401
def test_registry(self):
402
self.assertIs(serializer_v4,
403
xml_serializer.format_registry.get('4'))
404
self.assertIs(bzrlib.xml5.serializer_v5,
405
xml_serializer.format_registry.get('5'))
406
self.assertIs(bzrlib.xml6.serializer_v6,
407
xml_serializer.format_registry.get('6'))
408
self.assertIs(bzrlib.xml7.serializer_v7,
409
xml_serializer.format_registry.get('7'))
412
549
class TestEncodeAndEscape(TestCase):
413
550
"""Whitebox testing of the _encode_and_escape function."""
416
554
# Keep the cache clear before and after the test
417
bzrlib.xml5._ensure_utf8_re()
418
bzrlib.xml5._clear_cache()
419
self.addCleanup(bzrlib.xml5._clear_cache)
555
bzrlib.xml8._ensure_utf8_re()
556
bzrlib.xml8._clear_cache()
557
self.addCleanup(bzrlib.xml8._clear_cache)
421
559
def test_simple_ascii(self):
422
560
# _encode_and_escape always appends a final ", because these parameters
423
561
# are being used in xml attributes, and by returning it now, we have to
424
562
# do fewer string operations later.
425
val = bzrlib.xml5._encode_and_escape('foo bar')
563
val = bzrlib.xml8._encode_and_escape('foo bar')
426
564
self.assertEqual('foo bar"', val)
427
565
# The second time should be cached
428
val2 = bzrlib.xml5._encode_and_escape('foo bar')
566
val2 = bzrlib.xml8._encode_and_escape('foo bar')
429
567
self.assertIs(val2, val)
431
569
def test_ascii_with_xml(self):
432
570
self.assertEqual('&'"<>"',
433
bzrlib.xml5._encode_and_escape('&\'"<>'))
571
bzrlib.xml8._encode_and_escape('&\'"<>'))
435
573
def test_utf8_with_xml(self):
436
574
# u'\xb5\xe5&\u062c'
437
575
utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
438
576
self.assertEqual('µå&ج"',
439
bzrlib.xml5._encode_and_escape(utf8_str))
577
bzrlib.xml8._encode_and_escape(utf8_str))
441
579
def test_unicode(self):
442
580
uni_str = u'\xb5\xe5&\u062c'
443
581
self.assertEqual('µå&ج"',
444
bzrlib.xml5._encode_and_escape(uni_str))
582
bzrlib.xml8._encode_and_escape(uni_str))
added
removed
bzrlib/tests/test_xml.py
