← 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: Canonical.com Patch Queue Manager
  • Date: 2009-08-24 21:25:26 UTC
  • mfrom: (4641.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090824212526-5j41jw5zsciji66e
(robertc) Back out draft documentation change landed as 'selftest
        improvements'. (Robert Collins)

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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from cStringIO import StringIO
18
18
 
19
19
from bzrlib import (
20
 
    errors, 
21
 
    inventory, 
 
20
    errors,
 
21
    inventory,
 
22
    xml6,
22
23
    xml7,
23
24
    xml8,
24
 
    xml_serializer,
 
25
    serializer,
25
26
    )
26
27
from bzrlib.tests import TestCase
27
28
from bzrlib.inventory import Inventory, InventoryEntry
80
81
"""
81
82
 
82
83
_committed_inv_v5 = """<inventory>
83
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
84
 
      name="bar" parent_id="TREE_ROOT" 
 
84
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
 
85
      name="bar" parent_id="TREE_ROOT"
85
86
      revision="mbp@foo-123123"
86
87
      text_sha1="A" text_size="1"/>
87
88
<directory name="subdir"
88
89
           file_id="foo-20050801201819-4139aa4a272f4250"
89
 
           parent_id="TREE_ROOT" 
 
90
           parent_id="TREE_ROOT"
90
91
           revision="mbp@foo-00"/>
91
 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" 
92
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 
92
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134"
 
93
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
93
94
      revision="mbp@foo-00"
94
95
      text_sha1="B" text_size="0"/>
95
96
</inventory>
96
97
"""
97
98
 
98
99
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
99
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
100
 
      name="bar" parent_id="TREE_ROOT" 
 
100
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
 
101
      name="bar" parent_id="TREE_ROOT"
101
102
      revision="mbp@foo-123123"/>
102
103
<directory name="subdir"
103
104
           file_id="foo-20050801201819-4139aa4a272f4250"
104
 
           parent_id="TREE_ROOT" 
 
105
           parent_id="TREE_ROOT"
105
106
           revision="mbp@foo-00"/>
106
 
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
107
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 
107
<file file_id="bar-20050824000535-6bc48cfad47ed134"
 
108
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
108
109
      revision="mbp@foo-00"/>
109
110
</inventory>
110
111
"""
139
140
</inventory>
140
141
"""
141
142
 
 
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" />
 
148
</inventory>
 
149
"""
 
150
 
142
151
_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
143
152
<directory file_id="tree-root-321" name="" revision="rev_outer" />
144
153
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
294
303
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
295
304
        inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
296
305
        self.assertEqual(inv, inv2)
297
 
    
 
306
 
298
307
    def assertRoundTrips(self, xml_string):
299
308
        inp = StringIO(xml_string)
300
309
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
352
361
    def get_sample_inventory(self):
353
362
        inv = Inventory('tree-root-321', revision_id='rev_outer')
354
363
        inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
355
 
        inv.add(inventory.InventoryDirectory('dir-id', 'dir', 
 
364
        inv.add(inventory.InventoryDirectory('dir-id', 'dir',
356
365
                                             'tree-root-321'))
357
366
        inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
358
367
        inv['tree-root-321'].revision = 'rev_outer'
377
386
        for path, ie in inv.iter_entries():
378
387
            self.assertEqual(ie, inv2[ie.file_id])
379
388
 
 
389
    def test_roundtrip_inventory_v6(self):
 
390
        inv = self.get_sample_inventory()
 
391
        txt = xml6.serializer_v6.write_inventory_to_string(inv)
 
392
        lines = xml6.serializer_v6.write_inventory_to_lines(inv)
 
393
        self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
 
394
        self.assertEqualDiff(_expected_inv_v6, txt)
 
395
        inv2 = xml6.serializer_v6.read_inventory_from_string(txt)
 
396
        self.assertEqual(4, len(inv2))
 
397
        for path, ie in inv.iter_entries():
 
398
            self.assertEqual(ie, inv2[ie.file_id])
 
399
 
380
400
    def test_wrong_format_v7(self):
381
401
        """Can't accidentally open a file with wrong serializer"""
382
402
        s_v6 = bzrlib.xml6.serializer_v6
383
403
        s_v7 = xml7.serializer_v7
384
 
        self.assertRaises(errors.UnexpectedInventoryFormat, 
 
404
        self.assertRaises(errors.UnexpectedInventoryFormat,
385
405
                          s_v7.read_inventory_from_string, _expected_inv_v5)
386
 
        self.assertRaises(errors.UnexpectedInventoryFormat, 
 
406
        self.assertRaises(errors.UnexpectedInventoryFormat,
387
407
                          s_v6.read_inventory_from_string, _expected_inv_v7)
388
408
 
389
409
    def test_tree_reference(self):
405
425
        self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
406
426
        self.assertEqual('rev-outer', inv2['nested-id'].revision)
407
427
        self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
408
 
        self.assertRaises(errors.UnsupportedInventoryKind, 
 
428
        self.assertRaises(errors.UnsupportedInventoryKind,
409
429
                          s_v6.read_inventory_from_string,
410
430
                          txt.replace('format="7"', 'format="6"'))
411
 
        self.assertRaises(errors.UnsupportedInventoryKind, 
 
431
        self.assertRaises(errors.UnsupportedInventoryKind,
412
432
                          s_v5.read_inventory_from_string,
413
433
                          txt.replace('format="7"', 'format="5"'))
414
434
 
492
512
 
493
513
        self.assertEqual(len(expected), len(actual))
494
514
 
495
 
    def test_registry(self):
496
 
        self.assertIs(serializer_v4,
497
 
                      xml_serializer.format_registry.get('4'))
498
 
        self.assertIs(bzrlib.xml5.serializer_v5,
499
 
                      xml_serializer.format_registry.get('5'))
500
 
        self.assertIs(bzrlib.xml6.serializer_v6,
501
 
                      xml_serializer.format_registry.get('6'))
502
 
        self.assertIs(bzrlib.xml7.serializer_v7,
503
 
                      xml_serializer.format_registry.get('7'))
504
 
        self.assertIs(bzrlib.xml8.serializer_v8,
505
 
                      xml_serializer.format_registry.get('8'))
506
 
 
507
515
 
508
516
class TestEncodeAndEscape(TestCase):
509
517
    """Whitebox testing of the _encode_and_escape function."""
510
518
 
511
519
    def setUp(self):
 
520
        TestCase.setUp(self)
512
521
        # Keep the cache clear before and after the test
513
522
        bzrlib.xml8._ensure_utf8_re()
514
523
        bzrlib.xml8._clear_cache()