← 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-10-06 20:45:48 UTC
  • mfrom: (4728.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091006204548-bjnc3z4k256ppimz
MutableTree.has_changes() does not require a tree parameter anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
19
19
from bzrlib import (
20
20
    errors,
21
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
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" />
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
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."""