/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_cache_utf8.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_cache_utf8.py
16
16
 
17
17
"""Tests for utf8 caching."""
18
18
 
19
 
from bzrlib import (
 
19
from .. import (
20
20
    cache_utf8,
21
21
    )
22
 
from bzrlib.tests import TestCase
 
22
from ..sixish import text_type
 
23
from . import TestCase
23
24
 
24
25
 
25
26
class TestEncodeCache(TestCase):
31
32
 
32
33
    def check_encode(self, rev_id):
33
34
        rev_id_utf8 = rev_id.encode('utf-8')
34
 
        self.failIf(rev_id in cache_utf8._unicode_to_utf8_map)
35
 
        self.failIf(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
 
35
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
36
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
36
37
 
37
38
        # After a single encode, the mapping should exist for
38
39
        # both directions
39
40
        self.assertEqual(rev_id_utf8, cache_utf8.encode(rev_id))
40
 
        self.failUnless(rev_id in cache_utf8._unicode_to_utf8_map)
41
 
        self.failUnless(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
 
41
        self.assertTrue(rev_id in cache_utf8._unicode_to_utf8_map)
 
42
        self.assertTrue(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
42
43
 
43
44
        self.assertEqual(rev_id, cache_utf8.decode(rev_id_utf8))
44
45
 
45
46
        cache_utf8.clear_encoding_cache()
46
 
        self.failIf(rev_id in cache_utf8._unicode_to_utf8_map)
47
 
        self.failIf(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
 
47
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
48
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
48
49
 
49
50
    def check_decode(self, rev_id):
50
51
        rev_id_utf8 = rev_id.encode('utf-8')
51
 
        self.failIf(rev_id in cache_utf8._unicode_to_utf8_map)
52
 
        self.failIf(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
 
52
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
53
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
53
54
 
54
55
        # After a single decode, the mapping should exist for
55
56
        # both directions
56
57
        self.assertEqual(rev_id, cache_utf8.decode(rev_id_utf8))
57
 
        self.failUnless(rev_id in cache_utf8._unicode_to_utf8_map)
58
 
        self.failUnless(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
 
58
        self.assertTrue(rev_id in cache_utf8._unicode_to_utf8_map)
 
59
        self.assertTrue(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
59
60
 
60
61
        self.assertEqual(rev_id_utf8, cache_utf8.encode(rev_id))
61
62
        cache_utf8.clear_encoding_cache()
62
63
 
63
 
        self.failIf(rev_id in cache_utf8._unicode_to_utf8_map)
64
 
        self.failIf(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
 
64
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
65
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
65
66
 
66
67
    def test_ascii(self):
67
68
        self.check_decode(u'all_ascii_characters123123123')
74
75
    def test_cached_unicode(self):
75
76
        x = u'\xb5yy' + u'\xe5zz'
76
77
        y = u'\xb5yy' + u'\xe5zz'
77
 
        self.failIf(x is y)
 
78
        self.assertFalse(x is y)
78
79
        xp = cache_utf8.get_cached_unicode(x)
79
80
        yp = cache_utf8.get_cached_unicode(y)
80
81
 
84
85
    def test_cached_utf8(self):
85
86
        x = u'\xb5yy\xe5zz'.encode('utf8')
86
87
        y = u'\xb5yy\xe5zz'.encode('utf8')
87
 
        self.failIf(x is y)
 
88
        self.assertFalse(x is y)
88
89
        xp = cache_utf8.get_cached_utf8(x)
89
90
        yp = cache_utf8.get_cached_utf8(y)
90
91
 
94
95
    def test_cached_ascii(self):
95
96
        x = '%s %s' % ('simple', 'text')
96
97
        y = '%s %s' % ('simple', 'text')
97
 
        self.failIf(x is y)
 
98
        self.assertFalse(x is y)
98
99
        xp = cache_utf8.get_cached_ascii(x)
99
100
        yp = cache_utf8.get_cached_ascii(y)
100
101
 
105
106
        # objects.
106
107
        uni_x = cache_utf8.decode(x)
107
108
        self.assertEqual(u'simple text', uni_x)
108
 
        self.assertIsInstance(uni_x, unicode)
 
109
        self.assertIsInstance(uni_x, text_type)
109
110
 
110
111
        utf8_x = cache_utf8.encode(uni_x)
111
112
        self.assertIs(utf8_x, x)