/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005 Canonical Ltd
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests for the urlutils wrapper."""
18
19
import os
1830.3.17 by John Arbash Meinel
list_files() with wrong normalized_filename code raises exceptions. Fix this
20
import re
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
21
import sys
22
1830.3.13 by John Arbash Meinel
Add a test that urlutils creates normalized paths
23
from bzrlib import osutils, urlutils
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
24
import bzrlib
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
25
from bzrlib.errors import InvalidURL, InvalidURLJoin
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
26
from bzrlib.tests import TestCaseInTempDir, TestCase, TestSkipped
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
27
28
29
class TestUrlToPath(TestCase):
30
    
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
31
    def test_basename(self):
32
        # bzrlib.urlutils.basename
33
        # Test bzrlib.urlutils.split()
34
        basename = urlutils.basename
35
        if sys.platform == 'win32':
36
            self.assertRaises(InvalidURL, basename, 'file:///path/to/foo')
37
            self.assertEqual('foo', basename('file:///C|/foo'))
1685.1.78 by Wouter van Heyst
more code cleanup
38
            self.assertEqual('foo', basename('file:///C:/foo'))
39
            self.assertEqual('', basename('file:///C:/'))
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
40
        else:
41
            self.assertEqual('foo', basename('file:///foo'))
42
            self.assertEqual('', basename('file:///'))
43
44
        self.assertEqual('foo', basename('http://host/path/to/foo'))
45
        self.assertEqual('foo', basename('http://host/path/to/foo/'))
46
        self.assertEqual('',
47
            basename('http://host/path/to/foo/', exclude_trailing_slash=False))
48
        self.assertEqual('path', basename('http://host/path'))
49
        self.assertEqual('', basename('http://host/'))
50
        self.assertEqual('', basename('http://host'))
51
        self.assertEqual('path', basename('http:///nohost/path'))
52
53
        self.assertEqual('path', basename('random+scheme://user:pass@ahost:port/path'))
54
        self.assertEqual('path', basename('random+scheme://user:pass@ahost:port/path/'))
55
        self.assertEqual('', basename('random+scheme://user:pass@ahost:port/'))
56
57
        # relative paths
58
        self.assertEqual('foo', basename('path/to/foo'))
59
        self.assertEqual('foo', basename('path/to/foo/'))
60
        self.assertEqual('', basename('path/to/foo/',
61
            exclude_trailing_slash=False))
62
        self.assertEqual('foo', basename('path/../foo'))
63
        self.assertEqual('foo', basename('../path/foo'))
64
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
65
    def test_normalize_url_files(self):
66
        # Test that local paths are properly normalized
67
        normalize_url = urlutils.normalize_url
68
69
        def norm_file(expected, path):
70
            url = normalize_url(path)
71
            self.assertStartsWith(url, 'file:///')
72
            if sys.platform == 'win32':
73
                url = url[len('file:///C:'):]
74
            else:
75
                url = url[len('file://'):]
76
1685.1.53 by John Arbash Meinel
Updated normalize_url
77
            self.assertEndsWith(url, expected)
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
78
79
        norm_file('path/to/foo', 'path/to/foo')
80
        norm_file('/path/to/foo', '/path/to/foo')
81
        norm_file('path/to/foo', '../path/to/foo')
82
83
        # Local paths are assumed to *not* be escaped at all
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
84
        try:
85
            u'uni/\xb5'.encode(bzrlib.user_encoding)
86
        except UnicodeError:
87
            # locale cannot handle unicode 
88
            pass
89
        else:
90
            norm_file('uni/%C2%B5', u'uni/\xb5')
91
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
92
        norm_file('uni/%25C2%25B5', u'uni/%C2%B5')
93
        norm_file('uni/%20b', u'uni/ b')
94
        # All the crazy characters get escaped in local paths => file:/// urls
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
95
        # The ' ' character must not be at the end, because on win32
96
        # it gets stripped off by ntpath.abspath
97
        norm_file('%27%20%3B/%3F%3A%40%26%3D%2B%24%2C%23', "' ;/?:@&=+$,#")
1685.1.51 by John Arbash Meinel
Working on getting normalize_url working.
98
99
    def test_normalize_url_hybrid(self):
100
        # Anything with a scheme:// should be treated as a hybrid url
101
        # which changes what characters get escaped.
102
        normalize_url = urlutils.normalize_url
103
104
        eq = self.assertEqual
105
        eq('file:///foo/', normalize_url(u'file:///foo/'))
106
        eq('file:///foo/%20', normalize_url(u'file:///foo/ '))
107
        eq('file:///foo/%20', normalize_url(u'file:///foo/%20'))
108
        # Don't escape reserved characters
109
        eq('file:///ab_c.d-e/%f:?g&h=i+j;k,L#M$',
110
            normalize_url('file:///ab_c.d-e/%f:?g&h=i+j;k,L#M$'))
111
        eq('http://ab_c.d-e/%f:?g&h=i+j;k,L#M$',
112
            normalize_url('http://ab_c.d-e/%f:?g&h=i+j;k,L#M$'))
113
114
        # Escape unicode characters, but not already escaped chars
115
        eq('http://host/ab/%C2%B5/%C2%B5',
116
            normalize_url(u'http://host/ab/%C2%B5/\xb5'))
117
118
        # Normalize verifies URLs when they are not unicode
119
        # (indicating they did not come from the user)
120
        self.assertRaises(InvalidURL, normalize_url, 'http://host/\xb5')
121
        self.assertRaises(InvalidURL, normalize_url, 'http://host/ ')
1685.1.50 by John Arbash Meinel
Added an re for handling scheme paths.
122
123
    def test_url_scheme_re(self):
124
        # Test paths that may be URLs
125
        def test_one(url, scheme_and_path):
126
            """Assert that _url_scheme_re correctly matches
127
128
            :param scheme_and_path: The (scheme, path) that should be matched
129
                can be None, to indicate it should not match
130
            """
131
            m = urlutils._url_scheme_re.match(url)
132
            if scheme_and_path is None:
133
                self.assertEqual(None, m)
134
            else:
135
                self.assertEqual(scheme_and_path[0], m.group('scheme'))
136
                self.assertEqual(scheme_and_path[1], m.group('path'))
137
138
        # Local paths
139
        test_one('/path', None)
140
        test_one('C:/path', None)
141
        test_one('../path/to/foo', None)
142
        test_one(u'../path/to/fo\xe5', None)
143
144
        # Real URLS
145
        test_one('http://host/path/', ('http', 'host/path/'))
146
        test_one('sftp://host/path/to/foo', ('sftp', 'host/path/to/foo'))
147
        test_one('file:///usr/bin', ('file', '/usr/bin'))
148
        test_one('file:///C:/Windows', ('file', '/C:/Windows'))
149
        test_one('file:///C|/Windows', ('file', '/C|/Windows'))
150
        test_one(u'readonly+sftp://host/path/\xe5', ('readonly+sftp', u'host/path/\xe5'))
151
152
        # Weird stuff
153
        # Can't have slashes or colons in the scheme
154
        test_one('/path/to/://foo', None)
155
        test_one('path:path://foo', None)
156
        # Must have more than one character for scheme
157
        test_one('C://foo', None)
158
        test_one('ab://foo', ('ab', 'foo'))
159
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
160
    def test_dirname(self):
161
        # Test bzrlib.urlutils.dirname()
162
        dirname = urlutils.dirname
163
        if sys.platform == 'win32':
164
            self.assertRaises(InvalidURL, dirname, 'file:///path/to/foo')
165
            self.assertEqual('file:///C|/', dirname('file:///C|/foo'))
166
            self.assertEqual('file:///C|/', dirname('file:///C|/'))
167
        else:
168
            self.assertEqual('file:///', dirname('file:///foo'))
169
            self.assertEqual('file:///', dirname('file:///'))
170
171
        self.assertEqual('http://host/path/to', dirname('http://host/path/to/foo'))
172
        self.assertEqual('http://host/path/to', dirname('http://host/path/to/foo/'))
173
        self.assertEqual('http://host/path/to/foo',
174
            dirname('http://host/path/to/foo/', exclude_trailing_slash=False))
175
        self.assertEqual('http://host/', dirname('http://host/path'))
176
        self.assertEqual('http://host/', dirname('http://host/'))
177
        self.assertEqual('http://host', dirname('http://host'))
178
        self.assertEqual('http:///nohost', dirname('http:///nohost/path'))
179
180
        self.assertEqual('random+scheme://user:pass@ahost:port/',
181
            dirname('random+scheme://user:pass@ahost:port/path'))
182
        self.assertEqual('random+scheme://user:pass@ahost:port/',
183
            dirname('random+scheme://user:pass@ahost:port/path/'))
184
        self.assertEqual('random+scheme://user:pass@ahost:port/',
185
            dirname('random+scheme://user:pass@ahost:port/'))
186
187
        # relative paths
188
        self.assertEqual('path/to', dirname('path/to/foo'))
189
        self.assertEqual('path/to', dirname('path/to/foo/'))
190
        self.assertEqual('path/to/foo',
191
            dirname('path/to/foo/', exclude_trailing_slash=False))
192
        self.assertEqual('path/..', dirname('path/../foo'))
193
        self.assertEqual('../path', dirname('../path/foo'))
194
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
195
    def test_join(self):
196
        def test(expected, *args):
197
            joined = urlutils.join(*args)
198
            self.assertEqual(expected, joined)
199
200
        # Test a single element
201
        test('foo', 'foo')
202
203
        # Test relative path joining
204
        test('foo/bar', 'foo', 'bar')
205
        test('http://foo/bar', 'http://foo', 'bar')
206
        test('http://foo/bar', 'http://foo', '.', 'bar')
207
        test('http://foo/baz', 'http://foo', 'bar', '../baz')
208
        test('http://foo/bar/baz', 'http://foo', 'bar/baz')
209
        test('http://foo/baz', 'http://foo', 'bar/../baz')
210
211
        # Absolute paths
212
        test('http://bar', 'http://foo', 'http://bar')
213
        test('sftp://bzr/foo', 'http://foo', 'bar', 'sftp://bzr/foo')
214
        test('file:///bar', 'foo', 'file:///bar')
1711.2.49 by John Arbash Meinel
urlutils.join should work for root paths.
215
216
        # From a base path
217
        test('file:///foo', 'file:///', 'foo')
218
        test('file:///bar/foo', 'file:///bar/', 'foo')
219
        test('http://host/foo', 'http://host/', 'foo')
220
        test('http://host/', 'http://host', '')
1685.1.55 by John Arbash Meinel
Adding bzrlib.urlutils.join() to handle joining URLs
221
        
222
        # Invalid joinings
223
        # Cannot go above root
224
        self.assertRaises(InvalidURLJoin, urlutils.join,
225
                'http://foo', '../baz')
226
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
227
    def test_function_type(self):
228
        if sys.platform == 'win32':
229
            self.assertEqual(urlutils._win32_local_path_to_url, urlutils.local_path_to_url)
230
            self.assertEqual(urlutils._win32_local_path_from_url, urlutils.local_path_from_url)
231
        else:
232
            self.assertEqual(urlutils._posix_local_path_to_url, urlutils.local_path_to_url)
233
            self.assertEqual(urlutils._posix_local_path_from_url, urlutils.local_path_from_url)
234
235
    def test_posix_local_path_to_url(self):
236
        to_url = urlutils._posix_local_path_to_url
237
        self.assertEqual('file:///path/to/foo',
238
            to_url('/path/to/foo'))
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
239
240
        try:
241
            result = to_url(u'/path/to/r\xe4ksm\xf6rg\xe5s')
242
        except UnicodeError:
243
            raise TestSkipped("local encoding cannot handle unicode")
244
245
        self.assertEqual('file:///path/to/r%C3%A4ksm%C3%B6rg%C3%A5s', result)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
246
247
    def test_posix_local_path_from_url(self):
248
        from_url = urlutils._posix_local_path_from_url
249
        self.assertEqual('/path/to/foo',
250
            from_url('file:///path/to/foo'))
251
        self.assertEqual(u'/path/to/r\xe4ksm\xf6rg\xe5s',
252
            from_url('file:///path/to/r%C3%A4ksm%C3%B6rg%C3%A5s'))
253
        self.assertEqual(u'/path/to/r\xe4ksm\xf6rg\xe5s',
254
            from_url('file:///path/to/r%c3%a4ksm%c3%b6rg%c3%a5s'))
255
256
        self.assertRaises(InvalidURL, from_url, '/path/to/foo')
257
258
    def test_win32_local_path_to_url(self):
259
        to_url = urlutils._win32_local_path_to_url
1711.4.28 by John Arbash Meinel
Update the test suite for Alexander's patch.
260
        self.assertEqual('file:///C:/path/to/foo',
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
261
            to_url('C:/path/to/foo'))
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
262
        # BOGUS: on win32, ntpath.abspath will strip trailing
263
        #       whitespace, so this will always fail
264
        #       Though under linux, it fakes abspath support
265
        #       and thus will succeed
266
        # self.assertEqual('file:///C:/path/to/foo%20',
267
        #     to_url('C:/path/to/foo '))
1711.4.28 by John Arbash Meinel
Update the test suite for Alexander's patch.
268
        self.assertEqual('file:///C:/path/to/f%20oo',
1711.4.4 by John Arbash Meinel
Fix some broken tests because of stupid ntpath.abspath behavior
269
            to_url('C:/path/to/f oo'))
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
270
271
        try:
272
            result = to_url(u'd:/path/to/r\xe4ksm\xf6rg\xe5s')
273
        except UnicodeError:
274
            raise TestSkipped("local encoding cannot handle unicode")
275
1711.4.28 by John Arbash Meinel
Update the test suite for Alexander's patch.
276
        self.assertEqual('file:///D:/path/to/r%C3%A4ksm%C3%B6rg%C3%A5s', result)
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
277
2162.2.1 by Alexander Belchenko
Testing UNC path conversion
278
    def test_win32_unc_path_to_url(self):
279
        to_url = urlutils._win32_local_path_to_url
280
        self.assertEqual('file://///HOST/path',
281
            to_url(r'\\HOST\path'))
282
        self.assertEqual('file://///HOST/path',
283
            to_url('//HOST/path'))
284
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
285
    def test_win32_local_path_from_url(self):
286
        from_url = urlutils._win32_local_path_from_url
1711.4.28 by John Arbash Meinel
Update the test suite for Alexander's patch.
287
        self.assertEqual('C:/path/to/foo',
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
288
            from_url('file:///C|/path/to/foo'))
1711.4.28 by John Arbash Meinel
Update the test suite for Alexander's patch.
289
        self.assertEqual(u'D:/path/to/r\xe4ksm\xf6rg\xe5s',
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
290
            from_url('file:///d|/path/to/r%C3%A4ksm%C3%B6rg%C3%A5s'))
1711.4.28 by John Arbash Meinel
Update the test suite for Alexander's patch.
291
        self.assertEqual(u'D:/path/to/r\xe4ksm\xf6rg\xe5s',
1685.1.79 by Wouter van Heyst
cleanup urlutils
292
            from_url('file:///d:/path/to/r%c3%a4ksm%c3%b6rg%c3%a5s'))
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
293
294
        self.assertRaises(InvalidURL, from_url, '/path/to/foo')
295
        # Not a valid _win32 url, no drive letter
296
        self.assertRaises(InvalidURL, from_url, 'file:///path/to/foo')
297
2162.2.1 by Alexander Belchenko
Testing UNC path conversion
298
    def test_win32_unc_path_from_url(self):
299
        from_url = urlutils._win32_local_path_from_url
300
        self.assertEqual('//HOST/path', from_url('file://///HOST/path'))
301
        # despite IE allows 4, 5 and 6 slashes in URL to another machine
302
        # Firefox don't understand this
303
        self.assertRaises(InvalidURL, from_url, 'file:////HOST/path')
304
        self.assertRaises(InvalidURL, from_url, 'file://////HOST/path')
305
1711.2.43 by John Arbash Meinel
Split out win32 specific code so that it can be tested on all platforms.
306
    def test__win32_extract_drive_letter(self):
307
        extract = urlutils._win32_extract_drive_letter
308
        self.assertEqual(('file:///C:', '/foo'), extract('file://', '/C:/foo'))
309
        self.assertEqual(('file:///d|', '/path'), extract('file://', '/d|/path'))
310
        self.assertRaises(InvalidURL, extract, 'file://', '/path')
311
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
312
    def test_split(self):
313
        # Test bzrlib.urlutils.split()
314
        split = urlutils.split
315
        if sys.platform == 'win32':
316
            self.assertRaises(InvalidURL, split, 'file:///path/to/foo')
317
            self.assertEqual(('file:///C|/', 'foo'), split('file:///C|/foo'))
1685.1.79 by Wouter van Heyst
cleanup urlutils
318
            self.assertEqual(('file:///C:/', ''), split('file:///C:/'))
1685.1.49 by John Arbash Meinel
Added bzrlib.urlutils.split and basename + dirname
319
        else:
320
            self.assertEqual(('file:///', 'foo'), split('file:///foo'))
321
            self.assertEqual(('file:///', ''), split('file:///'))
322
323
        self.assertEqual(('http://host/path/to', 'foo'), split('http://host/path/to/foo'))
324
        self.assertEqual(('http://host/path/to', 'foo'), split('http://host/path/to/foo/'))
325
        self.assertEqual(('http://host/path/to/foo', ''),
326
            split('http://host/path/to/foo/', exclude_trailing_slash=False))
327
        self.assertEqual(('http://host/', 'path'), split('http://host/path'))
328
        self.assertEqual(('http://host/', ''), split('http://host/'))
329
        self.assertEqual(('http://host', ''), split('http://host'))
330
        self.assertEqual(('http:///nohost', 'path'), split('http:///nohost/path'))
331
332
        self.assertEqual(('random+scheme://user:pass@ahost:port/', 'path'),
333
            split('random+scheme://user:pass@ahost:port/path'))
334
        self.assertEqual(('random+scheme://user:pass@ahost:port/', 'path'),
335
            split('random+scheme://user:pass@ahost:port/path/'))
336
        self.assertEqual(('random+scheme://user:pass@ahost:port/', ''),
337
            split('random+scheme://user:pass@ahost:port/'))
338
339
        # relative paths
340
        self.assertEqual(('path/to', 'foo'), split('path/to/foo'))
341
        self.assertEqual(('path/to', 'foo'), split('path/to/foo/'))
342
        self.assertEqual(('path/to/foo', ''),
343
            split('path/to/foo/', exclude_trailing_slash=False))
344
        self.assertEqual(('path/..', 'foo'), split('path/../foo'))
345
        self.assertEqual(('../path', 'foo'), split('../path/foo'))
346
1711.2.44 by John Arbash Meinel
Factor out another win32 special case and add platform independent tests for it.
347
    def test__win32_strip_local_trailing_slash(self):
348
        strip = urlutils._win32_strip_local_trailing_slash
349
        self.assertEqual('file://', strip('file://'))
350
        self.assertEqual('file:///', strip('file:///'))
351
        self.assertEqual('file:///C', strip('file:///C'))
352
        self.assertEqual('file:///C:', strip('file:///C:'))
353
        self.assertEqual('file:///d|', strip('file:///d|'))
354
        self.assertEqual('file:///C:/', strip('file:///C:/'))
355
        self.assertEqual('file:///C:/a', strip('file:///C:/a/'))
356
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
357
    def test_strip_trailing_slash(self):
358
        sts = urlutils.strip_trailing_slash
359
        if sys.platform == 'win32':
360
            self.assertEqual('file:///C|/', sts('file:///C|/'))
1685.1.79 by Wouter van Heyst
cleanup urlutils
361
            self.assertEqual('file:///C:/foo', sts('file:///C:/foo'))
1685.1.48 by John Arbash Meinel
Updated strip_trailing_slash to support lots more url stuff, added tests
362
            self.assertEqual('file:///C|/foo', sts('file:///C|/foo/'))
363
        else:
364
            self.assertEqual('file:///', sts('file:///'))
365
            self.assertEqual('file:///foo', sts('file:///foo'))
366
            self.assertEqual('file:///foo', sts('file:///foo/'))
367
368
        self.assertEqual('http://host/', sts('http://host/'))
369
        self.assertEqual('http://host/foo', sts('http://host/foo'))
370
        self.assertEqual('http://host/foo', sts('http://host/foo/'))
371
372
        # No need to fail just because the slash is missing
373
        self.assertEqual('http://host', sts('http://host'))
374
        # TODO: jam 20060502 Should this raise InvalidURL?
375
        self.assertEqual('file://', sts('file://'))
376
377
        self.assertEqual('random+scheme://user:pass@ahost:port/path',
378
            sts('random+scheme://user:pass@ahost:port/path'))
379
        self.assertEqual('random+scheme://user:pass@ahost:port/path',
380
            sts('random+scheme://user:pass@ahost:port/path/'))
381
        self.assertEqual('random+scheme://user:pass@ahost:port/',
382
            sts('random+scheme://user:pass@ahost:port/'))
383
384
        # Make sure relative paths work too
385
        self.assertEqual('path/to/foo', sts('path/to/foo'))
386
        self.assertEqual('path/to/foo', sts('path/to/foo/'))
387
        self.assertEqual('../to/foo', sts('../to/foo/'))
388
        self.assertEqual('path/../foo', sts('path/../foo/'))
389
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
390
    def test_unescape_for_display_utf8(self):
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
391
        # Test that URLs are converted to nice unicode strings for display
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
392
        def test(expected, url, encoding='utf-8'):
393
            disp_url = urlutils.unescape_for_display(url, encoding=encoding)
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
394
            self.assertIsInstance(disp_url, unicode)
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
395
            self.assertEqual(expected, disp_url)
1685.1.79 by Wouter van Heyst
cleanup urlutils
396
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
397
        test('http://foo', 'http://foo')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
398
        if sys.platform == 'win32':
1711.7.13 by John Arbash Meinel
Fix expected value for urlutils tests
399
            test('C:/foo/path', 'file:///C|/foo/path')
400
            test('C:/foo/path', 'file:///C:/foo/path')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
401
        else:
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
402
            test('/foo/path', 'file:///foo/path')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
403
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
404
        test('http://foo/%2Fbaz', 'http://foo/%2Fbaz')
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
405
        test(u'http://host/r\xe4ksm\xf6rg\xe5s',
406
             'http://host/r%C3%A4ksm%C3%B6rg%C3%A5s')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
407
408
        # Make sure special escaped characters stay escaped
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
409
        test(u'http://host/%3B%2F%3F%3A%40%26%3D%2B%24%2C%23',
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
410
             'http://host/%3B%2F%3F%3A%40%26%3D%2B%24%2C%23')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
411
412
        # Can we handle sections that don't have utf-8 encoding?
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
413
        test(u'http://host/%EE%EE%EE/r\xe4ksm\xf6rg\xe5s',
414
             'http://host/%EE%EE%EE/r%C3%A4ksm%C3%B6rg%C3%A5s')
1685.1.54 by John Arbash Meinel
url_for_display now makes sure output can be properly encoded.
415
416
        # Test encoding into output that can handle some characters
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
417
        test(u'http://host/%EE%EE%EE/r\xe4ksm\xf6rg\xe5s',
418
             'http://host/%EE%EE%EE/r%C3%A4ksm%C3%B6rg%C3%A5s',
419
             encoding='iso-8859-1')
420
421
        # This one can be encoded into utf8
422
        test(u'http://host/\u062c\u0648\u062c\u0648',
423
             'http://host/%d8%ac%d9%88%d8%ac%d9%88',
424
             encoding='utf-8')
425
426
        # This can't be put into 8859-1 and so stays as escapes
427
        test(u'http://host/%d8%ac%d9%88%d8%ac%d9%88',
428
             'http://host/%d8%ac%d9%88%d8%ac%d9%88',
429
             encoding='iso-8859-1')
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
430
431
    def test_escape(self):
432
        self.assertEqual('%25', urlutils.escape('%'))
433
        self.assertEqual('%C3%A5', urlutils.escape(u'\xe5'))
434
435
    def test_unescape(self):
436
        self.assertEqual('%', urlutils.unescape('%25'))
437
        self.assertEqual(u'\xe5', urlutils.unescape('%C3%A5'))
438
439
        self.assertRaises(InvalidURL, urlutils.unescape, u'\xe5')
440
        self.assertRaises(InvalidURL, urlutils.unescape, '\xe5')
441
        self.assertRaises(InvalidURL, urlutils.unescape, '%E5')
442
443
    def test_escape_unescape(self):
444
        self.assertEqual(u'\xe5', urlutils.unescape(urlutils.escape(u'\xe5')))
445
        self.assertEqual('%', urlutils.unescape(urlutils.escape('%')))
446
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
447
    def test_relative_url(self):
448
        def test(expected, base, other):
449
            result = urlutils.relative_url(base, other)
450
            self.assertEqual(expected, result)
451
            
452
        test('a', 'http://host/', 'http://host/a')
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
453
        test('http://entirely/different', 'sftp://host/branch',
454
                    'http://entirely/different')
455
        test('../person/feature', 'http://host/branch/mainline',
456
                    'http://host/branch/person/feature')
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
457
        test('..', 'http://host/branch', 'http://host/')
458
        test('http://host2/branch', 'http://host1/branch', 'http://host2/branch')
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
459
        test('.', 'http://host1/branch', 'http://host1/branch')
460
        test('../../../branch/2b', 'file:///home/jelmer/foo/bar/2b',
461
                    'file:///home/jelmer/branch/2b')
462
        test('../../branch/2b', 'sftp://host/home/jelmer/bar/2b',
463
                    'sftp://host/home/jelmer/branch/2b')
1685.1.79 by Wouter van Heyst
cleanup urlutils
464
        test('../../branch/feature/%2b', 'http://host/home/jelmer/bar/%2b',
465
                    'http://host/home/jelmer/branch/feature/%2b')
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
466
        test('../../branch/feature/2b', 'http://host/home/jelmer/bar/2b/', 
467
                    'http://host/home/jelmer/branch/feature/2b')
468
        # relative_url should preserve a trailing slash
469
        test('../../branch/feature/2b/', 'http://host/home/jelmer/bar/2b/',
470
                    'http://host/home/jelmer/branch/feature/2b/')
471
        test('../../branch/feature/2b/', 'http://host/home/jelmer/bar/2b',
472
                    'http://host/home/jelmer/branch/feature/2b/')
473
474
        # TODO: treat http://host as http://host/
475
        #       relative_url is typically called from a branch.base or
476
        #       transport.base which always ends with a /
477
        #test('a', 'http://host', 'http://host/a')
478
        test('http://host/a', 'http://host', 'http://host/a')
479
        #test('.', 'http://host', 'http://host/')
480
        test('http://host/', 'http://host', 'http://host/')
481
        #test('.', 'http://host/', 'http://host')
482
        test('http://host', 'http://host/', 'http://host')
1830.3.13 by John Arbash Meinel
Add a test that urlutils creates normalized paths
483
484
485
class TestCwdToURL(TestCaseInTempDir):
486
    """Test that local_path_to_url works base on the cwd"""
487
488
    def test_dot(self):
489
        # This test will fail if getcwd is not ascii
1830.3.17 by John Arbash Meinel
list_files() with wrong normalized_filename code raises exceptions. Fix this
490
        os.mkdir('mytest')
491
        os.chdir('mytest')
1830.3.13 by John Arbash Meinel
Add a test that urlutils creates normalized paths
492
493
        url = urlutils.local_path_to_url('.')
1830.3.17 by John Arbash Meinel
list_files() with wrong normalized_filename code raises exceptions. Fix this
494
        self.assertEndsWith(url, '/mytest')
1830.3.13 by John Arbash Meinel
Add a test that urlutils creates normalized paths
495
496
    def test_non_ascii(self):
497
        try:
498
            os.mkdir(u'dod\xe9')
499
        except UnicodeError:
500
            raise TestSkipped('cannot create unicode directory')
501
502
        os.chdir(u'dod\xe9')
503
504
        # On Mac OSX this directory is actually: 
505
        #   u'/dode\u0301' => '/dode\xcc\x81
506
        # but we should normalize it back to 
507
        #   u'/dod\xe9' => '/dod\xc3\xa9'
508
        url = urlutils.local_path_to_url('.')
509
        self.assertEndsWith(url, '/dod%C3%A9')