← Back to branch summary

~jelmer/ubuntu/maverick/bzr/2.2.5

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_tree.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2009-03-10 14:11:59 UTC
  • mfrom: (1.2.1 upstream) (3.1.68 jaunty)
  • Revision ID: james.westby@ubuntu.com-20090310141159-lwzzo5c1fwrtzgj4
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
16
16
 
17
17
from bzrlib import (
18
18
    errors,
 
19
    conflicts,
 
20
    osutils,
 
21
    revisiontree,
19
22
    tests,
20
 
    conflicts,
 
23
    workingtree_4,
21
24
    )
22
25
from bzrlib.tests import TestSkipped
23
26
from bzrlib.tests.tree_implementations import TestCaseWithTree
56
59
        tree_b.lock_read()
57
60
        self.addCleanup(tree_b.unlock)
58
61
        self.assertEqual([
 
62
            ('killed-a', 'a\n'),
59
63
            ('killed-b', 'b\n'),
60
 
            ('killed-a', 'a\n'),
61
64
            ('unchanged', 'c\n'),
62
65
            ('unchanged', 'd\n'),
63
66
            ('new-a', 'e\n'),
69
72
 
70
73
    def skip_if_no_reference(self, tree):
71
74
        if not getattr(tree, 'supports_tree_reference', lambda: False)():
72
 
            raise tests.TestSkipped('Tree references not supported')
 
75
            raise tests.TestNotApplicable('Tree references not supported')
73
76
 
74
77
    def create_nested(self):
75
78
        work_tree = self.make_branch_and_tree('wt')
88
91
 
89
92
    def test_get_reference_revision(self):
90
93
        tree = self.create_nested()
 
94
        tree.lock_read()
 
95
        self.addCleanup(tree.unlock)
91
96
        path = tree.id2path('sub-root')
92
97
        self.assertEqual('sub-1', tree.get_reference_revision('sub-root', path))
93
98
 
96
101
        tree.lock_read()
97
102
        self.addCleanup(tree.unlock)
98
103
        entry = tree.inventory['sub-root']
99
 
        self.assertEqual([(tree.abspath('subtree'), 'sub-root')],
 
104
        self.assertEqual([(u'subtree', 'sub-root')],
100
105
            list(tree.iter_references()))
101
106
 
102
107
    def test_get_root_id(self):
158
163
        finally:
159
164
            tree.unlock()
160
165
 
 
166
    def test_get_file_text(self):
 
167
        work_tree = self.make_branch_and_tree('wt')
 
168
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
 
169
        tree.lock_read()
 
170
        self.addCleanup(tree.unlock)
 
171
        # test read by file-id
 
172
        self.assertEqual('foobar\n', tree.get_file_text('a-id'))
 
173
        # test read by path
 
174
        self.assertEqual('foobar\n', tree.get_file_text('a-id', path='a'))
 
175
 
 
176
    def test_get_file_lines(self):
 
177
        work_tree = self.make_branch_and_tree('wt')
 
178
        tree = self.get_tree_no_parents_abc_content_2(work_tree)
 
179
        tree.lock_read()
 
180
        self.addCleanup(tree.unlock)
 
181
        # test read by file-id
 
182
        self.assertEqual(['foobar\n'], tree.get_file_lines('a-id'))
 
183
        # test read by path
 
184
        self.assertEqual(['foobar\n'], tree.get_file_lines('a-id', path='a'))
 
185
 
 
186
    def test_get_file_lines_multi_line_breaks(self):
 
187
        work_tree = self.make_branch_and_tree('wt')
 
188
        self.build_tree_contents([('wt/foobar', 'a\rb\nc\r\nd')])
 
189
        work_tree.add('foobar', 'foobar-id')
 
190
        tree = self._convert_tree(work_tree)
 
191
        tree.lock_read()
 
192
        self.addCleanup(tree.unlock)
 
193
        self.assertEqual(['a\rb\n', 'c\r\n', 'd'],
 
194
                         tree.get_file_lines('foobar-id'))
 
195
 
161
196
 
162
197
class TestExtractFilesBytes(TestCaseWithTree):
163
198
 
189
224
        work_tree = self.make_branch_and_tree('wt')
190
225
        tree = self._convert_tree(work_tree)
191
226
        self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)
 
227
 
 
228
 
 
229
class TestIterEntriesByDir(TestCaseWithTree):
 
230
 
 
231
    def test_iteration_order(self):
 
232
        work_tree = self.make_branch_and_tree('.')
 
233
        self.build_tree(['a/', 'a/b/', 'a/b/c', 'a/d/', 'a/d/e', 'f/', 'f/g'])
 
234
        work_tree.add(['a', 'a/b', 'a/b/c', 'a/d', 'a/d/e', 'f', 'f/g'])
 
235
        tree = self._convert_tree(work_tree)
 
236
        output_order = [p for p, e in tree.iter_entries_by_dir()]
 
237
        self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
 
238
                         output_order)
 
239
 
 
240
 
 
241
class TestHasId(TestCaseWithTree):
 
242
 
 
243
    def test_has_id(self):
 
244
        work_tree = self.make_branch_and_tree('tree')
 
245
        self.build_tree(['tree/file'])
 
246
        work_tree.add('file', 'file-id')
 
247
        tree = self._convert_tree(work_tree)
 
248
        tree.lock_read()
 
249
        self.addCleanup(tree.unlock)
 
250
        self.assertTrue(tree.has_id('file-id'))
 
251
        self.assertFalse(tree.has_id('dir-id'))
 
252
 
 
253
    def test___contains__(self):
 
254
        work_tree = self.make_branch_and_tree('tree')
 
255
        self.build_tree(['tree/file'])
 
256
        work_tree.add('file', 'file-id')
 
257
        tree = self._convert_tree(work_tree)
 
258
        tree.lock_read()
 
259
        self.addCleanup(tree.unlock)
 
260
        self.assertTrue('file-id' in tree)
 
261
        self.assertFalse('dir-id' in tree)
 
262
 
 
263
 
 
264
class TestExtras(TestCaseWithTree):
 
265
 
 
266
    def test_extras(self):
 
267
        work_tree = self.make_branch_and_tree('tree')
 
268
        self.build_tree(['tree/file', 'tree/versioned-file'])
 
269
        work_tree.add(['file', 'versioned-file'])
 
270
        work_tree.commit('add files')
 
271
        work_tree.remove('file')
 
272
        tree = self._convert_tree(work_tree)
 
273
        if isinstance(tree,
 
274
                      (revisiontree.RevisionTree,
 
275
                       workingtree_4.DirStateRevisionTree)):
 
276
            expected = []
 
277
        else:
 
278
            expected = ['file']
 
279
        tree.lock_read()
 
280
        self.addCleanup(tree.unlock)
 
281
        self.assertEqual(expected, list(tree.extras()))
 
282
 
 
283
 
 
284
class TestGetFileSha1(TestCaseWithTree):
 
285
 
 
286
    def test_get_file_sha1(self):
 
287
        work_tree = self.make_branch_and_tree('tree')
 
288
        self.build_tree_contents([('tree/file', 'file content')])
 
289
        work_tree.add('file', 'file-id')
 
290
        tree = self._convert_tree(work_tree)
 
291
        tree.lock_read()
 
292
        self.addCleanup(tree.unlock)
 
293
        expected = osutils.sha_strings('file content')
 
294
        self.assertEqual(expected, tree.get_file_sha1('file-id'))