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