← 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: John Arbash Meinel
  • Date: 2009-10-20 19:46:46 UTC
  • mfrom: (4759 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4771.
  • Revision ID: john@arbash-meinel.com-20091020194646-wnqpd15qs19y28z7
Merge bzr.dev 4759, bringing in static_tuple and streaming improvements.

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.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
31
        """Check that creating a MutableTreeHooks instance has the right
29
32
        defaults."""
30
 
        hooks = MutableTreeHooks()
 
33
        hooks = mutabletree.MutableTreeHooks()
31
34
        self.assertTrue("start_commit" in hooks,
32
35
                        "start_commit not in %s" % hooks)
33
36
        self.assertTrue("post_commit" in hooks,
36
39
    def test_installed_hooks_are_MutableTreeHooks(self):
37
40
        """The installed hooks object should be a MutableTreeHooks."""
38
41
        # the installed hooks are saved in self._preserved_hooks.
39
 
        self.assertIsInstance(self._preserved_hooks[MutableTree][1],
40
 
                              MutableTreeHooks)
41
 
 
42
 
 
 
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())