← 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: Vincent Ladeuil
  • Date: 2010-01-25 15:55:48 UTC
  • mto: (4985.1.4 add-attr-cleanup)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125155548-0l352pujvt5bzl5e
Deploy addAttrCleanup on the whole test suite.

Several use case worth mentioning:

- setting a module or any other object attribute is the majority
by far. In some cases the setting itself is deferred but most of
the time we want to set at the same time we add the cleanup.

- there multiple occurrences of protecting hooks or ui factory
which are now useless (the test framework takes care of that now),

- there was some lambda uses that can now be avoided.

That first cleanup already simplifies things a lot.

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)
 
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][1],
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())