← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_mutabletree.py

  • Committer: Martin von Gagern
  • Date: 2010-04-20 08:47:38 UTC
  • mfrom: (5167 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5195.
  • Revision ID: martin.vgagern@gmx.net-20100420084738-ygymnqmdllzrhpfn
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_mutabletree.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for MutableTree.
18
18
 
19
19
Most functionality of MutableTree is tested as part of WorkingTree.
20
20
"""
21
21
 
22
 
from bzrlib.tests import TestCase
23
 
from bzrlib.mutabletree import MutableTree, MutableTreeHooks
24
 
 
25
 
class TestHooks(TestCase):
 
22
from bzrlib import (
 
23
    mutabletree,
 
24
    tests,
 
25
    )
 
26
 
 
27
 
 
28
class TestHooks(tests.TestCase):
26
29
 
27
30
    def test_constructor(self):
28
 
        """Check that creating a MutableTreeHooks instance has the right 
 
31
        """Check that creating a MutableTreeHooks instance has the right
29
32
        defaults."""
30
 
        hooks = MutableTreeHooks()
31
 
        self.assertTrue("start_commit" in hooks, 
 
33
        hooks = mutabletree.MutableTreeHooks()
 
34
        self.assertTrue("start_commit" in hooks,
32
35
                        "start_commit not in %s" % hooks)
 
36
        self.assertTrue("post_commit" in hooks,
 
37
                        "post_commit not in %s" % hooks)
33
38
 
34
39
    def test_installed_hooks_are_MutableTreeHooks(self):
35
40
        """The installed hooks object should be a MutableTreeHooks."""
36
41
        # the installed hooks are saved in self._preserved_hooks.
37
 
        self.assertIsInstance(self._preserved_hooks[MutableTree], 
38
 
                              MutableTreeHooks)
39
 
 
40
 
 
 
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())