/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

merge bzr.dev.

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
22
    xml7,
23
 
    xml_serializer,
 
23
    xml8,
 
24
    serializer,
24
25
    )
25
26
from bzrlib.tests import TestCase
26
27
from bzrlib.inventory import Inventory, InventoryEntry
79
80
"""
80
81
 
81
82
_committed_inv_v5 = """<inventory>
82
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
83
 
      name="bar" parent_id="TREE_ROOT" 
84
 
      revision="mbp@foo-123123"/>
 
83
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
 
84
      name="bar" parent_id="TREE_ROOT"
 
85
      revision="mbp@foo-123123"
 
86
      text_sha1="A" text_size="1"/>
85
87
<directory name="subdir"
86
88
           file_id="foo-20050801201819-4139aa4a272f4250"
87
 
           parent_id="TREE_ROOT" 
 
89
           parent_id="TREE_ROOT"
88
90
           revision="mbp@foo-00"/>
89
 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" 
90
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
91
 
      revision="mbp@foo-00"/>
 
91
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134"
 
92
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
 
93
      revision="mbp@foo-00"
 
94
      text_sha1="B" text_size="0"/>
92
95
</inventory>
93
96
"""
94
97
 
95
98
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
96
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
97
 
      name="bar" parent_id="TREE_ROOT" 
 
99
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
 
100
      name="bar" parent_id="TREE_ROOT"
98
101
      revision="mbp@foo-123123"/>
99
102
<directory name="subdir"
100
103
           file_id="foo-20050801201819-4139aa4a272f4250"
101
 
           parent_id="TREE_ROOT" 
 
104
           parent_id="TREE_ROOT"
102
105
           revision="mbp@foo-00"/>
103
 
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
104
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 
106
<file file_id="bar-20050824000535-6bc48cfad47ed134"
 
107
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250"
105
108
      revision="mbp@foo-00"/>
106
109
</inventory>
107
110
"""
121
124
 
122
125
# DO NOT REFLOW THIS. Its the exact inventory we want.
123
126
_expected_inv_v5 = """<inventory format="5">
124
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" />
 
127
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
125
128
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" revision="mbp@foo-00" />
126
 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
 
129
<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" />
127
130
</inventory>
128
131
"""
129
132
 
130
133
 
131
134
_expected_inv_v5_root = """<inventory file_id="f&lt;" format="5" revision_id="mother!">
132
 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f&lt;" revision="mbp@foo-123123" />
 
135
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f&lt;" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
133
136
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" parent_id="f&lt;" revision="mbp@foo-00" />
134
 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
 
137
<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" />
 
138
<symlink file_id="link-1" name="link" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" symlink_target="a" />
135
139
</inventory>
136
140
"""
137
141
 
138
142
_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
139
143
<directory file_id="tree-root-321" name="" revision="rev_outer" />
140
144
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
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" />
 
145
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
 
146
<symlink file_id="link-id" name="link" parent_id="tree-root-321" revision="rev_outer" symlink_target="a" />
143
147
<tree-reference file_id="nested-id" name="nested" parent_id="tree-root-321" revision="rev_outer" reference_revision="rev_inner" />
144
148
</inventory>
145
149
"""
146
150
 
 
151
_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">
 
152
<message>- start splitting code for xml (de)serialization away from objects
 
153
  preparatory to supporting multiple formats by a single library
 
154
</message>
 
155
<parents>
 
156
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" />
 
157
</parents>
 
158
</revision>
 
159
"""
 
160
 
 
161
_expected_inv_v8 = """<inventory format="8" revision_id="rev_outer">
 
162
<directory file_id="tree-root-321" name="" revision="rev_outer" />
 
163
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
 
164
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
 
165
<symlink file_id="link-id" name="link" parent_id="tree-root-321" revision="rev_outer" symlink_target="a" />
 
166
</inventory>
 
167
"""
 
168
 
147
169
_revision_utf8_v5 = """<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;"
148
170
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
149
171
    revision_id="erik@b&#229;gfors-02"
172
194
</inventory>
173
195
"""
174
196
 
 
197
# Before revision_id was always stored as an attribute
 
198
_inventory_v5a = """<inventory format="5">
 
199
</inventory>
 
200
"""
 
201
 
 
202
# Before revision_id was always stored as an attribute
 
203
_inventory_v5b = """<inventory format="5" revision_id="a-rev-id">
 
204
</inventory>
 
205
"""
 
206
 
175
207
 
176
208
class TestSerializer(TestCase):
177
209
    """Test XML serialization"""
 
210
 
178
211
    def test_canned_inventory(self):
179
212
        """Test unpacked a canned inventory v4 file."""
180
213
        inp = StringIO(_working_inventory_v4)
243
276
        eq(ie.name, 'bar')
244
277
        eq(inv[ie.parent_id].kind, 'directory')
245
278
 
 
279
    def test_unpack_inventory_5a(self):
 
280
        inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
 
281
                _inventory_v5a, revision_id='test-rev-id')
 
282
        self.assertEqual('test-rev-id', inv.root.revision)
 
283
 
 
284
    def test_unpack_inventory_5b(self):
 
285
        inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(
 
286
                _inventory_v5b, revision_id='test-rev-id')
 
287
        self.assertEqual('a-rev-id', inv.root.revision)
 
288
 
246
289
    def test_repack_inventory_5(self):
247
290
        inp = StringIO(_committed_inv_v5)
248
291
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
251
294
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
252
295
        inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
253
296
        self.assertEqual(inv, inv2)
254
 
    
 
297
 
255
298
    def assertRoundTrips(self, xml_string):
256
299
        inp = StringIO(xml_string)
257
300
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
258
301
        outp = StringIO()
259
302
        bzrlib.xml5.serializer_v5.write_inventory(inv, outp)
260
303
        self.assertEqualDiff(xml_string, outp.getvalue())
 
304
        lines = bzrlib.xml5.serializer_v5.write_inventory_to_lines(inv)
 
305
        outp.seek(0)
 
306
        self.assertEqual(outp.readlines(), lines)
261
307
        inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
262
308
        self.assertEqual(inv, inv2)
263
309
 
303
349
        new_rev = s_v5.read_revision_from_string(txt)
304
350
        self.assertEqual(props, new_rev.properties)
305
351
 
306
 
    def test_roundtrip_inventory_v7(self):
 
352
    def get_sample_inventory(self):
307
353
        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'))
310
354
        inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
311
 
        inv.add(inventory.InventoryDirectory('dir-id', 'dir', 
 
355
        inv.add(inventory.InventoryDirectory('dir-id', 'dir',
312
356
                                             'tree-root-321'))
313
357
        inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
314
358
        inv['tree-root-321'].revision = 'rev_outer'
315
359
        inv['dir-id'].revision = 'rev_outer'
316
360
        inv['file-id'].revision = 'rev_outer'
 
361
        inv['file-id'].text_sha1 = 'A'
 
362
        inv['file-id'].text_size = 1
317
363
        inv['link-id'].revision = 'rev_outer'
 
364
        inv['link-id'].symlink_target = 'a'
 
365
        return inv
 
366
 
 
367
    def test_roundtrip_inventory_v7(self):
 
368
        inv = self.get_sample_inventory()
 
369
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
 
370
                                        'rev_outer', 'rev_inner'))
318
371
        txt = xml7.serializer_v7.write_inventory_to_string(inv)
 
372
        lines = xml7.serializer_v7.write_inventory_to_lines(inv)
 
373
        self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
319
374
        self.assertEqualDiff(_expected_inv_v7, txt)
320
375
        inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
321
376
        self.assertEqual(5, len(inv2))
326
381
        """Can't accidentally open a file with wrong serializer"""
327
382
        s_v6 = bzrlib.xml6.serializer_v6
328
383
        s_v7 = xml7.serializer_v7
329
 
        self.assertRaises(errors.UnexpectedInventoryFormat, 
 
384
        self.assertRaises(errors.UnexpectedInventoryFormat,
330
385
                          s_v7.read_inventory_from_string, _expected_inv_v5)
331
 
        self.assertRaises(errors.UnexpectedInventoryFormat, 
 
386
        self.assertRaises(errors.UnexpectedInventoryFormat,
332
387
                          s_v6.read_inventory_from_string, _expected_inv_v7)
333
388
 
334
389
    def test_tree_reference(self):
335
390
        s_v5 = bzrlib.xml5.serializer_v5
336
391
        s_v6 = bzrlib.xml6.serializer_v6
337
392
        s_v7 = xml7.serializer_v7
338
 
        inv = Inventory('tree-root-321')
 
393
        inv = Inventory('tree-root-321', revision_id='rev-outer')
 
394
        inv.root.revision = 'root-rev'
339
395
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
340
396
                                        'rev-outer', 'rev-inner'))
341
 
        self.assertRaises(errors.UnsupportedInventoryKind, 
 
397
        self.assertRaises(errors.UnsupportedInventoryKind,
342
398
                          s_v5.write_inventory_to_string, inv)
343
 
        self.assertRaises(errors.UnsupportedInventoryKind, 
 
399
        self.assertRaises(errors.UnsupportedInventoryKind,
344
400
                          s_v6.write_inventory_to_string, inv)
345
401
        txt = s_v7.write_inventory_to_string(inv)
 
402
        lines = s_v7.write_inventory_to_lines(inv)
 
403
        self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
346
404
        inv2 = s_v7.read_inventory_from_string(txt)
347
405
        self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
348
406
        self.assertEqual('rev-outer', inv2['nested-id'].revision)
349
407
        self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
350
 
        self.assertRaises(errors.UnsupportedInventoryKind, 
 
408
        self.assertRaises(errors.UnsupportedInventoryKind,
351
409
                          s_v6.read_inventory_from_string,
352
410
                          txt.replace('format="7"', 'format="6"'))
353
 
        self.assertRaises(errors.UnsupportedInventoryKind, 
 
411
        self.assertRaises(errors.UnsupportedInventoryKind,
354
412
                          s_v5.read_inventory_from_string,
355
413
                          txt.replace('format="7"', 'format="5"'))
356
414
 
 
415
    def test_roundtrip_inventory_v8(self):
 
416
        inv = self.get_sample_inventory()
 
417
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
 
418
        inv2 = xml8.serializer_v8.read_inventory_from_string(txt)
 
419
        self.assertEqual(4, len(inv2))
 
420
        for path, ie in inv.iter_entries():
 
421
            self.assertEqual(ie, inv2[ie.file_id])
 
422
 
 
423
    def test_inventory_text_v8(self):
 
424
        inv = self.get_sample_inventory()
 
425
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
 
426
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
 
427
        self.assertEqual(bzrlib.osutils.split_lines(txt), lines)
 
428
        self.assertEqualDiff(_expected_inv_v8, txt)
 
429
 
 
430
    def test_revision_text_v6(self):
 
431
        """Pack revision to XML v6"""
 
432
        rev = bzrlib.xml6.serializer_v6.read_revision_from_string(
 
433
            _expected_rev_v5)
 
434
        serialized = bzrlib.xml6.serializer_v6.write_revision_to_string(rev)
 
435
        self.assertEqualDiff(serialized, _expected_rev_v5)
 
436
 
 
437
    def test_revision_text_v7(self):
 
438
        """Pack revision to XML v7"""
 
439
        rev = bzrlib.xml7.serializer_v7.read_revision_from_string(
 
440
            _expected_rev_v5)
 
441
        serialized = bzrlib.xml7.serializer_v7.write_revision_to_string(rev)
 
442
        self.assertEqualDiff(serialized, _expected_rev_v5)
 
443
 
 
444
    def test_revision_text_v8(self):
 
445
        """Pack revision to XML v8"""
 
446
        rev = bzrlib.xml8.serializer_v8.read_revision_from_string(
 
447
            _expected_rev_v8)
 
448
        serialized = bzrlib.xml8.serializer_v8.write_revision_to_string(rev)
 
449
        self.assertEqualDiff(serialized, _expected_rev_v8)
 
450
 
357
451
    def test_revision_ids_are_utf8(self):
358
452
        """Parsed revision_ids should all be utf-8 strings, not unicode."""
359
453
        s_v5 = bzrlib.xml5.serializer_v5
374
468
        fid_bar1 = u'b\xe5r-01'.encode('utf8')
375
469
        fid_sub = u's\xb5bdir-01'.encode('utf8')
376
470
        fid_bar2 = u'b\xe5r-02'.encode('utf8')
377
 
        expected = [(u'', fid_root, None, None),
 
471
        expected = [(u'', fid_root, None, rev_id_2),
378
472
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
379
473
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
380
474
                    (u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
398
492
 
399
493
        self.assertEqual(len(expected), len(actual))
400
494
 
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
 
 
411
495
 
412
496
class TestEncodeAndEscape(TestCase):
413
497
    """Whitebox testing of the _encode_and_escape function."""
414
498
 
415
499
    def setUp(self):
 
500
        TestCase.setUp(self)
416
501
        # Keep the cache clear before and after the test
417
 
        bzrlib.xml5._ensure_utf8_re()
418
 
        bzrlib.xml5._clear_cache()
419
 
        self.addCleanup(bzrlib.xml5._clear_cache)
 
502
        bzrlib.xml8._ensure_utf8_re()
 
503
        bzrlib.xml8._clear_cache()
 
504
        self.addCleanup(bzrlib.xml8._clear_cache)
420
505
 
421
506
    def test_simple_ascii(self):
422
507
        # _encode_and_escape always appends a final ", because these parameters
423
508
        # are being used in xml attributes, and by returning it now, we have to
424
509
        # do fewer string operations later.
425
 
        val = bzrlib.xml5._encode_and_escape('foo bar')
 
510
        val = bzrlib.xml8._encode_and_escape('foo bar')
426
511
        self.assertEqual('foo bar"', val)
427
512
        # The second time should be cached
428
 
        val2 = bzrlib.xml5._encode_and_escape('foo bar')
 
513
        val2 = bzrlib.xml8._encode_and_escape('foo bar')
429
514
        self.assertIs(val2, val)
430
515
 
431
516
    def test_ascii_with_xml(self):
432
517
        self.assertEqual('&amp;&apos;&quot;&lt;&gt;"',
433
 
                         bzrlib.xml5._encode_and_escape('&\'"<>'))
 
518
                         bzrlib.xml8._encode_and_escape('&\'"<>'))
434
519
 
435
520
    def test_utf8_with_xml(self):
436
521
        # u'\xb5\xe5&\u062c'
437
522
        utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
438
523
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
439
 
                         bzrlib.xml5._encode_and_escape(utf8_str))
 
524
                         bzrlib.xml8._encode_and_escape(utf8_str))
440
525
 
441
526
    def test_unicode(self):
442
527
        uni_str = u'\xb5\xe5&\u062c'
443
528
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
444
 
                         bzrlib.xml5._encode_and_escape(uni_str))
 
529
                         bzrlib.xml8._encode_and_escape(uni_str))