← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_nested_specifics.py

Merge bzr.dev, update to use new hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_nested_specifics.py
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
 
 
19
from bzrlib import (
 
20
    inventory,
 
21
    )
19
22
from bzrlib.tests import TestNotApplicable
20
23
from bzrlib.transform import TreeTransform
21
24
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
65
68
 
66
69
    def test_comparison_data_does_not_autodetect_subtree(self):
67
70
        tree = self.prepare_with_subtree()
68
 
        entry = tree.iter_entries_by_dir(['subtree-id']).next()[1]
 
71
        ie = inventory.InventoryDirectory('subtree-id', 'subtree',
 
72
                                          tree.path2id(''))
69
73
        self.assertEqual('directory',
70
 
                         tree._comparison_data(entry, 'subtree')[0])
 
74
                         tree._comparison_data(ie, 'subtree')[0])
 
75
 
 
76
    def test_inventory_does_not_autodetect_subtree(self):
 
77
        tree = self.prepare_with_subtree()
 
78
        ie = tree.inventory['subtree-id']
 
79
        self.assertEqual('directory', ie.kind)
 
80
 
 
81
    def test_iter_entries_by_dir_autodetects_subtree(self):
 
82
        tree = self.prepare_with_subtree()
 
83
        path, ie = tree.iter_entries_by_dir(['subtree-id']).next()
 
84
        self.assertEqual('tree-reference', ie.kind)