← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

(vila) Revise legal option names to be less drastic. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
26
26
    )
27
27
from bzrlib.tests import TestCase
28
28
from bzrlib.inventory import Inventory
29
 
from bzrlib.xml4 import serializer_v4
30
29
import bzrlib.xml5
31
30
 
32
 
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
33
 
<entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_id="TREE_ROOT" />
34
 
<entry file_id="foo-20050801201819-4139aa4a272f4250" kind="directory" name="foo" parent_id="TREE_ROOT" />
35
 
<entry file_id="bar-20050824000535-6bc48cfad47ed134" kind="file" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" />
36
 
</inventory>"""
37
 
 
38
 
 
39
 
_revision_v4 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
40
 
    inventory_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
41
 
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
42
 
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
43
 
    timestamp="1125907235.212"
44
 
    timezone="36000">
45
 
<message>- start splitting code for xml (de)serialization away from objects
46
 
  preparatory to supporting multiple formats by a single library
47
 
</message>
48
 
<parents>
49
 
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" revision_sha1="7bdf4cc8c5bdac739f8cf9b10b78cf4b68f915ff" />
50
 
</parents>
51
 
</revision>
52
 
"""
53
 
 
54
31
_revision_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
55
32
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
56
33
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
217
194
class TestSerializer(TestCase):
218
195
    """Test XML serialization"""
219
196
 
220
 
    def test_canned_inventory(self):
221
 
        """Test unpacked a canned inventory v4 file."""
222
 
        inp = StringIO(_working_inventory_v4)
223
 
        inv = serializer_v4.read_inventory(inp)
224
 
        self.assertEqual(len(inv), 4)
225
 
        self.assert_('bar-20050901064931-73b4b1138abc9cd2' in inv)
226
 
 
227
 
    def test_unpack_revision(self):
228
 
        """Test unpacking a canned revision v4"""
229
 
        inp = StringIO(_revision_v4)
230
 
        rev = serializer_v4.read_revision(inp)
231
 
        eq = self.assertEqual
232
 
        eq(rev.committer,
233
 
           "Martin Pool <mbp@sourcefrog.net>")
234
 
        eq(rev.inventory_id,
235
 
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
236
 
        eq(len(rev.parent_ids), 1)
237
 
        eq(rev.parent_ids[0],
238
 
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
239
 
 
240
197
    def test_unpack_revision_5(self):
241
198
        """Test unpacking a canned revision v5"""
242
199
        inp = StringIO(_revision_v5)
457
414
        self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
458
415
        self.assertEqual('rev-outer', inv2['nested-id'].revision)
459
416
        self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
460
 
        self.assertRaises(errors.UnsupportedInventoryKind,
461
 
                          s_v6.read_inventory_from_string,
462
 
                          txt.replace('format="7"', 'format="6"'))
463
 
        self.assertRaises(errors.UnsupportedInventoryKind,
464
 
                          s_v5.read_inventory_from_string,
465
 
                          txt.replace('format="7"', 'format="5"'))
466
417
 
467
418
    def test_roundtrip_inventory_v8(self):
468
419
        inv = self.get_sample_inventory()
549
500
    """Whitebox testing of the _encode_and_escape function."""
550
501
 
551
502
    def setUp(self):
552
 
        TestCase.setUp(self)
 
503
        super(TestEncodeAndEscape, self).setUp()
553
504
        # 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)
 
505
        bzrlib.xml_serializer._clear_cache()
 
506
        self.addCleanup(bzrlib.xml_serializer._clear_cache)
557
507
 
558
508
    def test_simple_ascii(self):
559
509
        # _encode_and_escape always appends a final ", because these parameters
560
510
        # are being used in xml attributes, and by returning it now, we have to
561
511
        # do fewer string operations later.
562
 
        val = bzrlib.xml8._encode_and_escape('foo bar')
 
512
        val = bzrlib.xml_serializer.encode_and_escape('foo bar')
563
513
        self.assertEqual('foo bar"', val)
564
514
        # The second time should be cached
565
 
        val2 = bzrlib.xml8._encode_and_escape('foo bar')
 
515
        val2 = bzrlib.xml_serializer.encode_and_escape('foo bar')
566
516
        self.assertIs(val2, val)
567
517
 
568
518
    def test_ascii_with_xml(self):
569
519
        self.assertEqual('&amp;&apos;&quot;&lt;&gt;"',
570
 
                         bzrlib.xml8._encode_and_escape('&\'"<>'))
 
520
                         bzrlib.xml_serializer.encode_and_escape('&\'"<>'))
571
521
 
572
522
    def test_utf8_with_xml(self):
573
523
        # u'\xb5\xe5&\u062c'
574
524
        utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
575
525
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
576
 
                         bzrlib.xml8._encode_and_escape(utf8_str))
 
526
                         bzrlib.xml_serializer.encode_and_escape(utf8_str))
577
527
 
578
528
    def test_unicode(self):
579
529
        uni_str = u'\xb5\xe5&\u062c'
580
530
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
581
 
                         bzrlib.xml8._encode_and_escape(uni_str))
 
531
                         bzrlib.xml_serializer.encode_and_escape(uni_str))
582
532
 
583
533
 
584
534
class TestMisc(TestCase):