/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mutabletree.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mutabletree.py
19
19
Most functionality of MutableTree is tested as part of WorkingTree.
20
20
"""
21
21
 
22
 
from bzrlib import (
23
 
    mutabletree,
24
 
    tests,
25
 
    )
26
 
 
27
 
 
28
 
class TestHooks(tests.TestCase):
 
22
from bzrlib.tests import TestCase
 
23
from bzrlib.mutabletree import MutableTree, MutableTreeHooks
 
24
 
 
25
class TestHooks(TestCase):
29
26
 
30
27
    def test_constructor(self):
31
28
        """Check that creating a MutableTreeHooks instance has the right
32
29
        defaults."""
33
 
        hooks = mutabletree.MutableTreeHooks()
 
30
        hooks = MutableTreeHooks()
34
31
        self.assertTrue("start_commit" in hooks,
35
32
                        "start_commit not in %s" % hooks)
36
 
        self.assertTrue("post_commit" in hooks,
37
 
                        "post_commit not in %s" % hooks)
38
33
 
39
34
    def test_installed_hooks_are_MutableTreeHooks(self):
40
35
        """The installed hooks object should be a MutableTreeHooks."""
41
36
        # the installed hooks are saved in self._preserved_hooks.
42
 
        self.assertIsInstance(self._preserved_hooks[mutabletree.MutableTree][1],
43
 
                              mutabletree.MutableTreeHooks)
44
 
 
45
 
 
46
 
class TestHasChanges(tests.TestCaseWithTransport):
47
 
 
48
 
    def setUp(self):
49
 
        super(TestHasChanges, self).setUp()
50
 
        self.tree = self.make_branch_and_tree('tree')
51
 
 
52
 
    def test_with_uncommitted_changes(self):
53
 
        self.build_tree(['tree/file'])
54
 
        self.tree.add('file')
55
 
        self.assertTrue(self.tree.has_changes())
56
 
 
57
 
    def test_with_pending_merges(self):
58
 
        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
59
 
        self.build_tree(['other/file'])
60
 
        other_tree.add('file')
61
 
        other_tree.commit('added file')
62
 
        self.tree.merge_from_branch(other_tree.branch)
63
 
        self.assertTrue(self.tree.has_changes())
 
37
        self.assertIsInstance(self._preserved_hooks[MutableTree][1],
 
38
                              MutableTreeHooks)
 
39
 
 
40