← 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: John Arbash Meinel
  • Date: 2010-07-13 07:44:02 UTC
  • mto: This revision was merged to the branch mainline in revision 5342.
  • Revision ID: john@arbash-meinel.com-20100713074402-wp3oh7cyx76fkvmm
Bump trunk to 2.3-dev1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
 
19
19
from bzrlib import (
20
20
    errors,
 
21
    fifo_cache,
21
22
    inventory,
 
23
    xml6,
22
24
    xml7,
23
25
    xml8,
24
26
    serializer,
139
141
</inventory>
140
142
"""
141
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" />
 
149
</inventory>
 
150
"""
 
151
 
142
152
_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
143
153
<directory file_id="tree-root-321" name="" revision="rev_outer" />
144
154
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
281
291
                _inventory_v5a, revision_id='test-rev-id')
282
292
        self.assertEqual('test-rev-id', inv.root.revision)
283
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
 
284
326
    def test_unpack_inventory_5b(self):
285
327
        inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
286
328
                _inventory_v5b, revision_id='test-rev-id')
377
419
        for path, ie in inv.iter_entries():
378
420
            self.assertEqual(ie, inv2[ie.file_id])
379
421
 
 
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
 
380
433
    def test_wrong_format_v7(self):
381
434
        """Can't accidentally open a file with wrong serializer"""
382
435
        s_v6 = bzrlib.xml6.serializer_v6