← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_cache_utf8.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_cache_utf8.py
31
31
 
32
32
    def check_encode(self, rev_id):
33
33
        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)
 
34
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
35
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
36
36
 
37
37
        # After a single encode, the mapping should exist for
38
38
        # both directions
39
39
        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)
 
40
        self.assertTrue(rev_id in cache_utf8._unicode_to_utf8_map)
 
41
        self.assertTrue(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
42
42
 
43
43
        self.assertEqual(rev_id, cache_utf8.decode(rev_id_utf8))
44
44
 
45
45
        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)
 
46
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
47
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
48
48
 
49
49
    def check_decode(self, rev_id):
50
50
        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)
 
51
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
52
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
53
53
 
54
54
        # After a single decode, the mapping should exist for
55
55
        # both directions
56
56
        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)
 
57
        self.assertTrue(rev_id in cache_utf8._unicode_to_utf8_map)
 
58
        self.assertTrue(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
59
59
 
60
60
        self.assertEqual(rev_id_utf8, cache_utf8.encode(rev_id))
61
61
        cache_utf8.clear_encoding_cache()
62
62
 
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)
 
63
        self.assertFalse(rev_id in cache_utf8._unicode_to_utf8_map)
 
64
        self.assertFalse(rev_id_utf8 in cache_utf8._utf8_to_unicode_map)
65
65
 
66
66
    def test_ascii(self):
67
67
        self.check_decode(u'all_ascii_characters123123123')
74
74
    def test_cached_unicode(self):
75
75
        x = u'\xb5yy' + u'\xe5zz'
76
76
        y = u'\xb5yy' + u'\xe5zz'
77
 
        self.failIf(x is y)
 
77
        self.assertFalse(x is y)
78
78
        xp = cache_utf8.get_cached_unicode(x)
79
79
        yp = cache_utf8.get_cached_unicode(y)
80
80
 
84
84
    def test_cached_utf8(self):
85
85
        x = u'\xb5yy\xe5zz'.encode('utf8')
86
86
        y = u'\xb5yy\xe5zz'.encode('utf8')
87
 
        self.failIf(x is y)
 
87
        self.assertFalse(x is y)
88
88
        xp = cache_utf8.get_cached_utf8(x)
89
89
        yp = cache_utf8.get_cached_utf8(y)
90
90
 
94
94
    def test_cached_ascii(self):
95
95
        x = '%s %s' % ('simple', 'text')
96
96
        y = '%s %s' % ('simple', 'text')
97
 
        self.failIf(x is y)
 
97
        self.assertFalse(x is y)
98
98
        xp = cache_utf8.get_cached_ascii(x)
99
99
        yp = cache_utf8.get_cached_ascii(y)
100
100