← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2008-10-01 05:40:45 UTC
  • mfrom: (3753 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20081001054045-z50qc0d3p9qsc5im
Merge from bzr.dev; resolve osutils.py conflict by reverting my sha import hackery.

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
203
206
        output_order = [p for p, e in tree.iter_entries_by_dir()]
204
207
        self.assertEqual(['', 'a', 'f', 'a/b', 'a/d', 'a/b/c', 'a/d/e', 'f/g'],
205
208
                         output_order)
 
209
 
 
210
 
 
211
class TestHasId(TestCaseWithTree):
 
212
 
 
213
    def test_has_id(self):
 
214
        work_tree = self.make_branch_and_tree('tree')
 
215
        self.build_tree(['tree/file'])
 
216
        work_tree.add('file', 'file-id')
 
217
        tree = self._convert_tree(work_tree)
 
218
        tree.lock_read()
 
219
        self.addCleanup(tree.unlock)
 
220
        self.assertTrue(tree.has_id('file-id'))
 
221
        self.assertFalse(tree.has_id('dir-id'))
 
222
 
 
223
    def test___contains__(self):
 
224
        work_tree = self.make_branch_and_tree('tree')
 
225
        self.build_tree(['tree/file'])
 
226
        work_tree.add('file', 'file-id')
 
227
        tree = self._convert_tree(work_tree)
 
228
        tree.lock_read()
 
229
        self.addCleanup(tree.unlock)
 
230
        self.assertTrue('file-id' in tree)
 
231
        self.assertFalse('dir-id' in tree)
 
232
 
 
233
 
 
234
class TestExtras(TestCaseWithTree):
 
235
 
 
236
    def test_extras(self):
 
237
        work_tree = self.make_branch_and_tree('tree')
 
238
        self.build_tree(['tree/file', 'tree/versioned-file'])
 
239
        work_tree.add(['file', 'versioned-file'])
 
240
        work_tree.commit('add files')
 
241
        work_tree.remove('file')
 
242
        tree = self._convert_tree(work_tree)
 
243
        if isinstance(tree,
 
244
                      (revisiontree.RevisionTree,
 
245
                       workingtree_4.DirStateRevisionTree)):
 
246
            expected = []
 
247
        else:
 
248
            expected = ['file']
 
249
        tree.lock_read()
 
250
        self.addCleanup(tree.unlock)
 
251
        self.assertEqual(expected, list(tree.extras()))
 
252
 
 
253
 
 
254
class TestGetFileSha1(TestCaseWithTree):
 
255
 
 
256
    def test_get_file_sha1(self):
 
257
        work_tree = self.make_branch_and_tree('tree')
 
258
        self.build_tree_contents([('tree/file', 'file content')])
 
259
        work_tree.add('file', 'file-id')
 
260
        tree = self._convert_tree(work_tree)
 
261
        tree.lock_read()
 
262
        self.addCleanup(tree.unlock)
 
263
        expected = osutils.sha_strings('file content')
 
264
        self.assertEqual(expected, tree.get_file_sha1('file-id'))