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

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_cache_utf8.py
16
16
 
17
17
"""Tests for utf8 caching."""
18
18
 
19
 
from .. import (
 
19
from bzrlib import (
20
20
    cache_utf8,
21
21
    )
22
 
from ..sixish import text_type
23
 
from . import TestCase
 
22
from bzrlib.tests import TestCase
24
23
 
25
24
 
26
25
class TestEncodeCache(TestCase):
32
31
 
33
32
    def check_encode(self, rev_id):
34
33
        rev_id_utf8 = rev_id.encode('utf-8')
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)
 
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)
37
36
 
38
37
        # After a single encode, the mapping should exist for
39
38
        # both directions
40
39
        self.assertEqual(rev_id_utf8, cache_utf8.encode(rev_id))
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)
 
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)
43
42
 
44
43
        self.assertEqual(rev_id, cache_utf8.decode(rev_id_utf8))
45
44
 
46
45
        cache_utf8.clear_encoding_cache()
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)
 
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)
49
48
 
50
49
    def check_decode(self, rev_id):
51
50
        rev_id_utf8 = rev_id.encode('utf-8')
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)
 
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)
54
53
 
55
54
        # After a single decode, the mapping should exist for
56
55
        # both directions
57
56
        self.assertEqual(rev_id, cache_utf8.decode(rev_id_utf8))
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)
 
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)
60
59
 
61
60
        self.assertEqual(rev_id_utf8, cache_utf8.encode(rev_id))
62
61
        cache_utf8.clear_encoding_cache()
63
62
 
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)
 
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)
66
65
 
67
66
    def test_ascii(self):
68
67
        self.check_decode(u'all_ascii_characters123123123')
73
72
        self.check_decode(u'some_\xb5_unicode_\xe5_chars')
74
73
 
75
74
    def test_cached_unicode(self):
76
 
        # Note that this is intentionally split, to prevent Python from
77
 
        # assigning x and y to the same object
78
 
        z = u'\xe5zz'
79
 
        x = u'\xb5yy' + z
80
 
        y = u'\xb5yy' + z
81
 
        self.assertIsNot(x, y)
 
75
        x = u'\xb5yy' + u'\xe5zz'
 
76
        y = u'\xb5yy' + u'\xe5zz'
 
77
        self.failIf(x is y)
82
78
        xp = cache_utf8.get_cached_unicode(x)
83
79
        yp = cache_utf8.get_cached_unicode(y)
84
80
 
88
84
    def test_cached_utf8(self):
89
85
        x = u'\xb5yy\xe5zz'.encode('utf8')
90
86
        y = u'\xb5yy\xe5zz'.encode('utf8')
91
 
        self.assertFalse(x is y)
 
87
        self.failIf(x is y)
92
88
        xp = cache_utf8.get_cached_utf8(x)
93
89
        yp = cache_utf8.get_cached_utf8(y)
94
90
 
96
92
        self.assertIs(xp, yp)
97
93
 
98
94
    def test_cached_ascii(self):
99
 
        x = b'%s %s' % (b'simple', b'text')
100
 
        y = b'%s %s' % (b'simple', b'text')
101
 
        self.assertIsNot(x, y)
 
95
        x = '%s %s' % ('simple', 'text')
 
96
        y = '%s %s' % ('simple', 'text')
 
97
        self.failIf(x is y)
102
98
        xp = cache_utf8.get_cached_ascii(x)
103
99
        yp = cache_utf8.get_cached_ascii(y)
104
100
 
109
105
        # objects.
110
106
        uni_x = cache_utf8.decode(x)
111
107
        self.assertEqual(u'simple text', uni_x)
112
 
        self.assertIsInstance(uni_x, text_type)
 
108
        self.assertIsInstance(uni_x, unicode)
113
109
 
114
110
        utf8_x = cache_utf8.encode(uni_x)
115
111
        self.assertIs(utf8_x, x)
116
112
 
117
113
    def test_decode_with_None(self):
118
114
        self.assertEqual(None, cache_utf8._utf8_decode_with_None(None))
119
 
        self.assertEqual(u'foo', cache_utf8._utf8_decode_with_None(b'foo'))
 
115
        self.assertEqual(u'foo', cache_utf8._utf8_decode_with_None('foo'))
120
116
        self.assertEqual(u'f\xb5',
121
 
                         cache_utf8._utf8_decode_with_None(b'f\xc2\xb5'))
 
117
                         cache_utf8._utf8_decode_with_None('f\xc2\xb5'))