← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

  • Committer: Ian Clatworthy
  • Date: 2007-08-14 03:59:22 UTC
  • mto: (2733.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2734.
  • Revision ID: ian.clatworthy@internode.on.net-20070814035922-siavg542cwvkf4r5
Fix pretty doc generation so works for all html docs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from cStringIO import StringIO
18
18
 
19
19
from bzrlib import (
20
 
    errors,
21
 
    fifo_cache,
22
 
    inventory,
23
 
    xml6,
 
20
    errors, 
 
21
    inventory, 
24
22
    xml7,
25
 
    xml8,
26
 
    serializer,
 
23
    xml_serializer,
27
24
    )
28
25
from bzrlib.tests import TestCase
29
26
from bzrlib.inventory import Inventory, InventoryEntry
82
79
"""
83
80
 
84
81
_committed_inv_v5 = """<inventory>
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"/>
 
82
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
 
83
      name="bar" parent_id="TREE_ROOT" 
 
84
      revision="mbp@foo-123123"/>
89
85
<directory name="subdir"
90
86
           file_id="foo-20050801201819-4139aa4a272f4250"
91
 
           parent_id="TREE_ROOT"
 
87
           parent_id="TREE_ROOT" 
92
88
           revision="mbp@foo-00"/>
93
 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134"
94
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
95
 
      revision="mbp@foo-00"
96
 
      text_sha1="B" text_size="0"/>
 
89
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" 
 
90
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 
91
      revision="mbp@foo-00"/>
97
92
</inventory>
98
93
"""
99
94
 
100
95
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
101
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
102
 
      name="bar" parent_id="TREE_ROOT"
 
96
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
 
97
      name="bar" parent_id="TREE_ROOT" 
103
98
      revision="mbp@foo-123123"/>
104
99
<directory name="subdir"
105
100
           file_id="foo-20050801201819-4139aa4a272f4250"
106
 
           parent_id="TREE_ROOT"
 
101
           parent_id="TREE_ROOT" 
107
102
           revision="mbp@foo-00"/>
108
 
<file file_id="bar-20050824000535-6bc48cfad47ed134"
109
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
 
103
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
 
104
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
110
105
      revision="mbp@foo-00"/>
111
106
</inventory>
112
107
"""
126
121
 
127
122
# DO NOT REFLOW THIS. Its the exact inventory we want.
128
123
_expected_inv_v5 = """<inventory format="5">
129
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
 
124
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" />
130
125
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" 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" />
 
126
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
132
127
</inventory>
133
128
"""
134
129
 
135
130
 
136
131
_expected_inv_v5_root = """<inventory file_id="f&lt;" format="5" revision_id="mother!">
137
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f&lt;" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
 
132
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f&lt;" revision="mbp@foo-123123" />
138
133
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" parent_id="f&lt;" 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" />
141
 
</inventory>
142
 
"""
143
 
 
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" />
 
134
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
149
135
</inventory>
150
136
"""
151
137
 
152
138
_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
153
139
<directory file_id="tree-root-321" name="" revision="rev_outer" />
154
140
<directory file_id="dir-id" name="dir" 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" />
 
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" />
157
143
<tree-reference file_id="nested-id" name="nested" parent_id="tree-root-321" revision="rev_outer" reference_revision="rev_inner" />
158
144
</inventory>
159
145
"""
160
146
 
161
 
_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">
162
 
<message>- start splitting code for xml (de)serialization away from objects
163
 
  preparatory to supporting multiple formats by a single library
164
 
</message>
165
 
<parents>
166
 
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" />
167
 
</parents>
168
 
</revision>
169
 
"""
170
 
 
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" />
176
 
</inventory>
177
 
"""
178
 
 
179
147
_revision_utf8_v5 = """<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;"
180
148
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
181
149
    revision_id="erik@b&#229;gfors-02"
204
172
</inventory>
205
173
"""
206
174
 
207
 
# Before revision_id was always stored as an attribute
208
 
_inventory_v5a = """<inventory format="5">
209
 
</inventory>
210
 
"""
211
 
 
212
 
# Before revision_id was always stored as an attribute
213
 
_inventory_v5b = """<inventory format="5" revision_id="a-rev-id">
214
 
</inventory>
215
 
"""
216
 
 
217
175
 
218
176
class TestSerializer(TestCase):
219
177
    """Test XML serialization"""
220
 
 
221
178
    def test_canned_inventory(self):
222
179
        """Test unpacked a canned inventory v4 file."""
223
180
        inp = StringIO(_working_inventory_v4)
286
243
        eq(ie.name, 'bar')
287
244
        eq(inv[ie.parent_id].kind, 'directory')
288
245
 
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)
293
 
 
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
297
 
        # False
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)
307
 
            else:
308
 
                self.assertIsNot(entry, entry_cache[key])
309
 
 
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
313
 
        # True
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)
323
 
            else:
324
 
                self.assertIs(entry, entry_cache[key])
325
 
 
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)
330
 
 
331
246
    def test_repack_inventory_5(self):
332
247
        inp = StringIO(_committed_inv_v5)
333
248
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
336
251
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
337
252
        inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
338
253
        self.assertEqual(inv, inv2)
339
 
 
 
254
    
340
255
    def assertRoundTrips(self, xml_string):
341
256
        inp = StringIO(xml_string)
342
257
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
343
258
        outp = StringIO()
344
259
        bzrlib.xml5.serializer_v5.write_inventory(inv, outp)
345
260
        self.assertEqualDiff(xml_string, outp.getvalue())
346
 
        lines = bzrlib.xml5.serializer_v5.write_inventory_to_lines(inv)
347
 
        outp.seek(0)
348
 
        self.assertEqual(outp.readlines(), lines)
349
261
        inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
350
262
        self.assertEqual(inv, inv2)
351
263
 
391
303
        new_rev = s_v5.read_revision_from_string(txt)
392
304
        self.assertEqual(props, new_rev.properties)
393
305
 
394
 
    def get_sample_inventory(self):
 
306
    def test_roundtrip_inventory_v7(self):
395
307
        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'))
396
310
        inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
397
 
        inv.add(inventory.InventoryDirectory('dir-id', 'dir',
 
311
        inv.add(inventory.InventoryDirectory('dir-id', 'dir', 
398
312
                                             'tree-root-321'))
399
313
        inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
400
314
        inv['tree-root-321'].revision = 'rev_outer'
401
315
        inv['dir-id'].revision = 'rev_outer'
402
316
        inv['file-id'].revision = 'rev_outer'
403
 
        inv['file-id'].text_sha1 = 'A'
404
 
        inv['file-id'].text_size = 1
405
317
        inv['link-id'].revision = 'rev_outer'
406
 
        inv['link-id'].symlink_target = 'a'
407
 
        return inv
408
 
 
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'))
413
318
        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)
416
319
        self.assertEqualDiff(_expected_inv_v7, txt)
417
320
        inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
418
321
        self.assertEqual(5, len(inv2))
419
322
        for path, ie in inv.iter_entries():
420
323
            self.assertEqual(ie, inv2[ie.file_id])
421
324
 
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])
432
 
 
433
325
    def test_wrong_format_v7(self):
434
326
        """Can't accidentally open a file with wrong serializer"""
435
327
        s_v6 = bzrlib.xml6.serializer_v6
436
328
        s_v7 = xml7.serializer_v7
437
 
        self.assertRaises(errors.UnexpectedInventoryFormat,
 
329
        self.assertRaises(errors.UnexpectedInventoryFormat, 
438
330
                          s_v7.read_inventory_from_string, _expected_inv_v5)
439
 
        self.assertRaises(errors.UnexpectedInventoryFormat,
 
331
        self.assertRaises(errors.UnexpectedInventoryFormat, 
440
332
                          s_v6.read_inventory_from_string, _expected_inv_v7)
441
333
 
442
334
    def test_tree_reference(self):
443
335
        s_v5 = bzrlib.xml5.serializer_v5
444
336
        s_v6 = bzrlib.xml6.serializer_v6
445
337
        s_v7 = xml7.serializer_v7
446
 
        inv = Inventory('tree-root-321', revision_id='rev-outer')
447
 
        inv.root.revision = 'root-rev'
 
338
        inv = Inventory('tree-root-321')
448
339
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
449
340
                                        'rev-outer', 'rev-inner'))
450
 
        self.assertRaises(errors.UnsupportedInventoryKind,
 
341
        self.assertRaises(errors.UnsupportedInventoryKind, 
451
342
                          s_v5.write_inventory_to_string, inv)
452
 
        self.assertRaises(errors.UnsupportedInventoryKind,
 
343
        self.assertRaises(errors.UnsupportedInventoryKind, 
453
344
                          s_v6.write_inventory_to_string, inv)
454
345
        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)
457
346
        inv2 = s_v7.read_inventory_from_string(txt)
458
347
        self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
459
348
        self.assertEqual('rev-outer', inv2['nested-id'].revision)
460
349
        self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
461
 
        self.assertRaises(errors.UnsupportedInventoryKind,
 
350
        self.assertRaises(errors.UnsupportedInventoryKind, 
462
351
                          s_v6.read_inventory_from_string,
463
352
                          txt.replace('format="7"', 'format="6"'))
464
 
        self.assertRaises(errors.UnsupportedInventoryKind,
 
353
        self.assertRaises(errors.UnsupportedInventoryKind, 
465
354
                          s_v5.read_inventory_from_string,
466
355
                          txt.replace('format="7"', 'format="5"'))
467
356
 
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])
475
 
 
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)
482
 
 
483
 
    def test_revision_text_v6(self):
484
 
        """Pack revision to XML v6"""
485
 
        rev = bzrlib.xml6.serializer_v6.read_revision_from_string(
486
 
            _expected_rev_v5)
487
 
        serialized = bzrlib.xml6.serializer_v6.write_revision_to_string(rev)
488
 
        self.assertEqualDiff(serialized, _expected_rev_v5)
489
 
 
490
 
    def test_revision_text_v7(self):
491
 
        """Pack revision to XML v7"""
492
 
        rev = bzrlib.xml7.serializer_v7.read_revision_from_string(
493
 
            _expected_rev_v5)
494
 
        serialized = bzrlib.xml7.serializer_v7.write_revision_to_string(rev)
495
 
        self.assertEqualDiff(serialized, _expected_rev_v5)
496
 
 
497
 
    def test_revision_text_v8(self):
498
 
        """Pack revision to XML v8"""
499
 
        rev = bzrlib.xml8.serializer_v8.read_revision_from_string(
500
 
            _expected_rev_v8)
501
 
        serialized = bzrlib.xml8.serializer_v8.write_revision_to_string(rev)
502
 
        self.assertEqualDiff(serialized, _expected_rev_v8)
503
 
 
504
357
    def test_revision_ids_are_utf8(self):
505
358
        """Parsed revision_ids should all be utf-8 strings, not unicode."""
506
359
        s_v5 = bzrlib.xml5.serializer_v5
521
374
        fid_bar1 = u'b\xe5r-01'.encode('utf8')
522
375
        fid_sub = u's\xb5bdir-01'.encode('utf8')
523
376
        fid_bar2 = u'b\xe5r-02'.encode('utf8')
524
 
        expected = [(u'', fid_root, None, rev_id_2),
 
377
        expected = [(u'', fid_root, None, None),
525
378
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
526
379
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
527
380
                    (u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
545
398
 
546
399
        self.assertEqual(len(expected), len(actual))
547
400
 
 
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'))
 
410
 
548
411
 
549
412
class TestEncodeAndEscape(TestCase):
550
413
    """Whitebox testing of the _encode_and_escape function."""
551
414
 
552
415
    def setUp(self):
553
 
        TestCase.setUp(self)
554
416
        # 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)
 
417
        bzrlib.xml5._ensure_utf8_re()
 
418
        bzrlib.xml5._clear_cache()
 
419
        self.addCleanup(bzrlib.xml5._clear_cache)
558
420
 
559
421
    def test_simple_ascii(self):
560
422
        # _encode_and_escape always appends a final ", because these parameters
561
423
        # are being used in xml attributes, and by returning it now, we have to
562
424
        # do fewer string operations later.
563
 
        val = bzrlib.xml8._encode_and_escape('foo bar')
 
425
        val = bzrlib.xml5._encode_and_escape('foo bar')
564
426
        self.assertEqual('foo bar"', val)
565
427
        # The second time should be cached
566
 
        val2 = bzrlib.xml8._encode_and_escape('foo bar')
 
428
        val2 = bzrlib.xml5._encode_and_escape('foo bar')
567
429
        self.assertIs(val2, val)
568
430
 
569
431
    def test_ascii_with_xml(self):
570
432
        self.assertEqual('&amp;&apos;&quot;&lt;&gt;"',
571
 
                         bzrlib.xml8._encode_and_escape('&\'"<>'))
 
433
                         bzrlib.xml5._encode_and_escape('&\'"<>'))
572
434
 
573
435
    def test_utf8_with_xml(self):
574
436
        # u'\xb5\xe5&\u062c'
575
437
        utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
576
438
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
577
 
                         bzrlib.xml8._encode_and_escape(utf8_str))
 
439
                         bzrlib.xml5._encode_and_escape(utf8_str))
578
440
 
579
441
    def test_unicode(self):
580
442
        uni_str = u'\xb5\xe5&\u062c'
581
443
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
582
 
                         bzrlib.xml8._encode_and_escape(uni_str))
 
444
                         bzrlib.xml5._encode_and_escape(uni_str))