← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_nonascii.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_nonascii.py
17
17
"""Test that various operations work in a non-ASCII environment."""
18
18
 
19
19
import os
20
 
import sys
21
 
from unicodedata import normalize
22
20
 
23
 
from bzrlib.osutils import pathjoin, normalizes_filenames, unicode_filename
 
21
from bzrlib.osutils import pathjoin
24
22
from bzrlib.tests import TestCaseWithTransport, TestSkipped
25
23
from bzrlib.workingtree import WorkingTree
26
24
 
37
35
            return
38
36
        file(pathjoin(br_dir, "a"), "w").write("hello")
39
37
        wt.add(["a"], ["a-id"])
40
 
 
41
 
 
42
 
a_circle_c = u'\xe5'
43
 
a_dots_c = u'\xe4'
44
 
a_circle_d = u'a\u030a'
45
 
a_dots_d = u'a\u0308'
46
 
z_umlat_c = u'\u017d'
47
 
z_umlat_d = u'Z\u030c'
48
 
 
49
 
 
50
 
class UnicodeFilename(TestCaseWithTransport):
51
 
    """Test that UnicodeFilename returns the expected values."""
52
 
 
53
 
    def test_a_circle(self):
54
 
        self.assertEqual(a_circle_d, normalize('NFKD', a_circle_c))
55
 
        self.assertEqual(a_circle_c, normalize('NFKC', a_circle_d))
56
 
 
57
 
        self.assertEqual((a_circle_c, True), unicode_filename(a_circle_c))
58
 
        if normalizes_filenames():
59
 
            self.assertEqual((a_circle_c, True), unicode_filename(a_circle_d))
60
 
        else:
61
 
            self.assertEqual((a_circle_d, False), unicode_filename(a_circle_d))
62
 
 
63
 
    def test_platform(self):
64
 
        try:
65
 
            self.build_tree([a_circle_c, a_dots_c, z_umlat_c])
66
 
        except UnicodeError:
67
 
            raise TestSkipped("filesystem cannot create unicode files")
68
 
 
69
 
        if sys.platform == 'darwin':
70
 
            expected = sorted([a_circle_d, a_dots_d, z_umlat_d])
71
 
        else:
72
 
            expected = sorted([a_circle_c, a_dots_c, z_umlat_c])
73
 
 
74
 
        present = sorted(os.listdir(u'.'))
75
 
        self.assertEqual(expected, present)
76
 
 
77
 
    def test_access(self):
78
 
        # We should always be able to access files by the path returned
79
 
        # from unicode_filename
80
 
        files = [a_circle_c, a_dots_c, z_umlat_c]
81
 
        try:
82
 
            self.build_tree(files)
83
 
        except UnicodeError:
84
 
            raise TestSkipped("filesystem cannot create unicode files")
85
 
 
86
 
        for fname in files:
87
 
            path = unicode_filename(fname)[0]
88
 
            # We should get an exception if we can't open the file at
89
 
            # this location.
90
 
            f = open(path, 'rb')
91
 
            f.close()
92
 
 
93