/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 breezy/tests/test_xml.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_xml.py
16
16
 
17
17
from cStringIO import StringIO
18
18
 
19
 
from brzlib import (
 
19
from breezy import (
20
20
    errors,
21
21
    fifo_cache,
22
22
    inventory,
24
24
    xml7,
25
25
    xml8,
26
26
    )
27
 
from brzlib.tests import TestCase
28
 
from brzlib.inventory import Inventory
29
 
import brzlib.xml5
 
27
from breezy.tests import TestCase
 
28
from breezy.inventory import Inventory
 
29
import breezy.xml5
30
30
 
31
31
_revision_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
32
32
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
197
197
    def test_unpack_revision_5(self):
198
198
        """Test unpacking a canned revision v5"""
199
199
        inp = StringIO(_revision_v5)
200
 
        rev = brzlib.xml5.serializer_v5.read_revision(inp)
 
200
        rev = breezy.xml5.serializer_v5.read_revision(inp)
201
201
        eq = self.assertEqual
202
202
        eq(rev.committer,
203
203
           "Martin Pool <mbp@sourcefrog.net>")
208
208
 
209
209
    def test_unpack_revision_5_utc(self):
210
210
        inp = StringIO(_revision_v5_utc)
211
 
        rev = brzlib.xml5.serializer_v5.read_revision(inp)
 
211
        rev = breezy.xml5.serializer_v5.read_revision(inp)
212
212
        eq = self.assertEqual
213
213
        eq(rev.committer,
214
214
           "Martin Pool <mbp@sourcefrog.net>")
220
220
    def test_unpack_inventory_5(self):
221
221
        """Unpack canned new-style inventory"""
222
222
        inp = StringIO(_committed_inv_v5)
223
 
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
 
223
        inv = breezy.xml5.serializer_v5.read_inventory(inp)
224
224
        eq = self.assertEqual
225
225
        eq(len(inv), 4)
226
226
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
232
232
    def test_unpack_basis_inventory_5(self):
233
233
        """Unpack canned new-style inventory"""
234
234
        inp = StringIO(_basis_inv_v5)
235
 
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
 
235
        inv = breezy.xml5.serializer_v5.read_inventory(inp)
236
236
        eq = self.assertEqual
237
237
        eq(len(inv), 4)
238
238
        eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
243
243
        eq(inv[ie.parent_id].kind, 'directory')
244
244
 
245
245
    def test_unpack_inventory_5a(self):
246
 
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
246
        inv = breezy.xml5.serializer_v5.read_inventory_from_string(
247
247
                _inventory_v5a, revision_id='test-rev-id')
248
248
        self.assertEqual('test-rev-id', inv.root.revision)
249
249
 
252
252
        # But the returned objects should be copies if return_from_cache is
253
253
        # False
254
254
        entry_cache = fifo_cache.FIFOCache()
255
 
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
255
        inv = breezy.xml5.serializer_v5.read_inventory_from_string(
256
256
            _inventory_v5a, revision_id='test-rev-id',
257
257
            entry_cache=entry_cache, return_from_cache=False)
258
258
        for entry in inv.iter_just_entries():
268
268
        # The returned objects should be exact if return_from_cache is
269
269
        # True
270
270
        entry_cache = fifo_cache.FIFOCache()
271
 
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
271
        inv = breezy.xml5.serializer_v5.read_inventory_from_string(
272
272
            _inventory_v5a, revision_id='test-rev-id',
273
273
            entry_cache=entry_cache, return_from_cache=True)
274
274
        for entry in inv.iter_just_entries():
280
280
                self.assertIs(entry, entry_cache[key])
281
281
 
282
282
    def test_unpack_inventory_5b(self):
283
 
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
283
        inv = breezy.xml5.serializer_v5.read_inventory_from_string(
284
284
                _inventory_v5b, revision_id='test-rev-id')
285
285
        self.assertEqual('a-rev-id', inv.root.revision)
286
286
 
287
287
    def test_repack_inventory_5(self):
288
288
        inp = StringIO(_committed_inv_v5)
289
 
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
 
289
        inv = breezy.xml5.serializer_v5.read_inventory(inp)
290
290
        outp = StringIO()
291
 
        brzlib.xml5.serializer_v5.write_inventory(inv, outp)
 
291
        breezy.xml5.serializer_v5.write_inventory(inv, outp)
292
292
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
293
 
        inv2 = brzlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
 
293
        inv2 = breezy.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
294
294
        self.assertEqual(inv, inv2)
295
295
 
296
296
    def assertRoundTrips(self, xml_string):
297
297
        inp = StringIO(xml_string)
298
 
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
 
298
        inv = breezy.xml5.serializer_v5.read_inventory(inp)
299
299
        outp = StringIO()
300
 
        brzlib.xml5.serializer_v5.write_inventory(inv, outp)
 
300
        breezy.xml5.serializer_v5.write_inventory(inv, outp)
301
301
        self.assertEqualDiff(xml_string, outp.getvalue())
302
 
        lines = brzlib.xml5.serializer_v5.write_inventory_to_lines(inv)
 
302
        lines = breezy.xml5.serializer_v5.write_inventory_to_lines(inv)
303
303
        outp.seek(0)
304
304
        self.assertEqual(outp.readlines(), lines)
305
 
        inv2 = brzlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
 
305
        inv2 = breezy.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
306
306
        self.assertEqual(inv, inv2)
307
307
 
308
308
    def tests_serialize_inventory_v5_with_root(self):
311
311
    def check_repack_revision(self, txt):
312
312
        """Check that repacking a revision yields the same information"""
313
313
        inp = StringIO(txt)
314
 
        rev = brzlib.xml5.serializer_v5.read_revision(inp)
 
314
        rev = breezy.xml5.serializer_v5.read_revision(inp)
315
315
        outp = StringIO()
316
 
        brzlib.xml5.serializer_v5.write_revision(rev, outp)
 
316
        breezy.xml5.serializer_v5.write_revision(rev, outp)
317
317
        outfile_contents = outp.getvalue()
318
 
        rev2 = brzlib.xml5.serializer_v5.read_revision(StringIO(outfile_contents))
 
318
        rev2 = breezy.xml5.serializer_v5.read_revision(StringIO(outfile_contents))
319
319
        self.assertEqual(rev, rev2)
320
320
 
321
321
    def test_repack_revision_5(self):
328
328
    def test_pack_revision_5(self):
329
329
        """Pack revision to XML v5"""
330
330
        # fixed 20051025, revisions should have final newline
331
 
        rev = brzlib.xml5.serializer_v5.read_revision_from_string(_revision_v5)
 
331
        rev = breezy.xml5.serializer_v5.read_revision_from_string(_revision_v5)
332
332
        outp = StringIO()
333
 
        brzlib.xml5.serializer_v5.write_revision(rev, outp)
 
333
        breezy.xml5.serializer_v5.write_revision(rev, outp)
334
334
        outfile_contents = outp.getvalue()
335
335
        self.assertEqual(outfile_contents[-1], '\n')
336
 
        self.assertEqualDiff(outfile_contents, brzlib.xml5.serializer_v5.write_revision_to_string(rev))
 
336
        self.assertEqualDiff(outfile_contents, breezy.xml5.serializer_v5.write_revision_to_string(rev))
337
337
        self.assertEqualDiff(outfile_contents, _expected_rev_v5)
338
338
 
339
339
    def test_empty_property_value(self):
340
340
        """Create an empty property value check that it serializes correctly"""
341
 
        s_v5 = brzlib.xml5.serializer_v5
 
341
        s_v5 = breezy.xml5.serializer_v5
342
342
        rev = s_v5.read_revision_from_string(_revision_v5)
343
343
        outp = StringIO()
344
344
        props = {'empty':'', 'one':'one'}
368
368
                                        'rev_outer', 'rev_inner'))
369
369
        txt = xml7.serializer_v7.write_inventory_to_string(inv)
370
370
        lines = xml7.serializer_v7.write_inventory_to_lines(inv)
371
 
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
371
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
372
372
        self.assertEqualDiff(_expected_inv_v7, txt)
373
373
        inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
374
374
        self.assertEqual(5, len(inv2))
379
379
        inv = self.get_sample_inventory()
380
380
        txt = xml6.serializer_v6.write_inventory_to_string(inv)
381
381
        lines = xml6.serializer_v6.write_inventory_to_lines(inv)
382
 
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
382
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
383
383
        self.assertEqualDiff(_expected_inv_v6, txt)
384
384
        inv2 = xml6.serializer_v6.read_inventory_from_string(txt)
385
385
        self.assertEqual(4, len(inv2))
388
388
 
389
389
    def test_wrong_format_v7(self):
390
390
        """Can't accidentally open a file with wrong serializer"""
391
 
        s_v6 = brzlib.xml6.serializer_v6
 
391
        s_v6 = breezy.xml6.serializer_v6
392
392
        s_v7 = xml7.serializer_v7
393
393
        self.assertRaises(errors.UnexpectedInventoryFormat,
394
394
                          s_v7.read_inventory_from_string, _expected_inv_v5)
396
396
                          s_v6.read_inventory_from_string, _expected_inv_v7)
397
397
 
398
398
    def test_tree_reference(self):
399
 
        s_v5 = brzlib.xml5.serializer_v5
400
 
        s_v6 = brzlib.xml6.serializer_v6
 
399
        s_v5 = breezy.xml5.serializer_v5
 
400
        s_v6 = breezy.xml6.serializer_v6
401
401
        s_v7 = xml7.serializer_v7
402
402
        inv = Inventory('tree-root-321', revision_id='rev-outer')
403
403
        inv.root.revision = 'root-rev'
409
409
                          s_v6.write_inventory_to_string, inv)
410
410
        txt = s_v7.write_inventory_to_string(inv)
411
411
        lines = s_v7.write_inventory_to_lines(inv)
412
 
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
412
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
413
413
        inv2 = s_v7.read_inventory_from_string(txt)
414
414
        self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
415
415
        self.assertEqual('rev-outer', inv2['nested-id'].revision)
427
427
        inv = self.get_sample_inventory()
428
428
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
429
429
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
430
 
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
430
        self.assertEqual(breezy.osutils.split_lines(txt), lines)
431
431
        self.assertEqualDiff(_expected_inv_v8, txt)
432
432
 
433
433
    def test_revision_text_v6(self):
434
434
        """Pack revision to XML v6"""
435
 
        rev = brzlib.xml6.serializer_v6.read_revision_from_string(
 
435
        rev = breezy.xml6.serializer_v6.read_revision_from_string(
436
436
            _expected_rev_v5)
437
 
        serialized = brzlib.xml6.serializer_v6.write_revision_to_string(rev)
 
437
        serialized = breezy.xml6.serializer_v6.write_revision_to_string(rev)
438
438
        self.assertEqualDiff(serialized, _expected_rev_v5)
439
439
 
440
440
    def test_revision_text_v7(self):
441
441
        """Pack revision to XML v7"""
442
 
        rev = brzlib.xml7.serializer_v7.read_revision_from_string(
 
442
        rev = breezy.xml7.serializer_v7.read_revision_from_string(
443
443
            _expected_rev_v5)
444
 
        serialized = brzlib.xml7.serializer_v7.write_revision_to_string(rev)
 
444
        serialized = breezy.xml7.serializer_v7.write_revision_to_string(rev)
445
445
        self.assertEqualDiff(serialized, _expected_rev_v5)
446
446
 
447
447
    def test_revision_text_v8(self):
448
448
        """Pack revision to XML v8"""
449
 
        rev = brzlib.xml8.serializer_v8.read_revision_from_string(
 
449
        rev = breezy.xml8.serializer_v8.read_revision_from_string(
450
450
            _expected_rev_v8)
451
 
        serialized = brzlib.xml8.serializer_v8.write_revision_to_string(rev)
 
451
        serialized = breezy.xml8.serializer_v8.write_revision_to_string(rev)
452
452
        self.assertEqualDiff(serialized, _expected_rev_v8)
453
453
 
454
454
    def test_revision_ids_are_utf8(self):
455
455
        """Parsed revision_ids should all be utf-8 strings, not unicode."""
456
 
        s_v5 = brzlib.xml5.serializer_v5
 
456
        s_v5 = breezy.xml5.serializer_v5
457
457
        rev = s_v5.read_revision_from_string(_revision_utf8_v5)
458
458
        self.assertEqual('erik@b\xc3\xa5gfors-02', rev.revision_id)
459
459
        self.assertIsInstance(rev.revision_id, str)
502
502
    def setUp(self):
503
503
        super(TestEncodeAndEscape, self).setUp()
504
504
        # Keep the cache clear before and after the test
505
 
        brzlib.xml_serializer._clear_cache()
506
 
        self.addCleanup(brzlib.xml_serializer._clear_cache)
 
505
        breezy.xml_serializer._clear_cache()
 
506
        self.addCleanup(breezy.xml_serializer._clear_cache)
507
507
 
508
508
    def test_simple_ascii(self):
509
509
        # _encode_and_escape always appends a final ", because these parameters
510
510
        # are being used in xml attributes, and by returning it now, we have to
511
511
        # do fewer string operations later.
512
 
        val = brzlib.xml_serializer.encode_and_escape('foo bar')
 
512
        val = breezy.xml_serializer.encode_and_escape('foo bar')
513
513
        self.assertEqual('foo bar"', val)
514
514
        # The second time should be cached
515
 
        val2 = brzlib.xml_serializer.encode_and_escape('foo bar')
 
515
        val2 = breezy.xml_serializer.encode_and_escape('foo bar')
516
516
        self.assertIs(val2, val)
517
517
 
518
518
    def test_ascii_with_xml(self):
519
519
        self.assertEqual('&amp;&apos;&quot;&lt;&gt;"',
520
 
                         brzlib.xml_serializer.encode_and_escape('&\'"<>'))
 
520
                         breezy.xml_serializer.encode_and_escape('&\'"<>'))
521
521
 
522
522
    def test_utf8_with_xml(self):
523
523
        # u'\xb5\xe5&\u062c'
524
524
        utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
525
525
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
526
 
                         brzlib.xml_serializer.encode_and_escape(utf8_str))
 
526
                         breezy.xml_serializer.encode_and_escape(utf8_str))
527
527
 
528
528
    def test_unicode(self):
529
529
        uni_str = u'\xb5\xe5&\u062c'
530
530
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
531
 
                         brzlib.xml_serializer.encode_and_escape(uni_str))
 
531
                         breezy.xml_serializer.encode_and_escape(uni_str))
532
532
 
533
533
 
534
534
class TestMisc(TestCase):
535
535
 
536
536
    def test_unescape_xml(self):
537
537
        """We get some kind of error when malformed entities are passed"""
538
 
        self.assertRaises(KeyError, brzlib.xml8._unescape_xml, 'foo&bar;')
 
538
        self.assertRaises(KeyError, breezy.xml8._unescape_xml, 'foo&bar;')