Rev 4732: Fixed as per John's review. in file:///home/vila/src/bzr/bugs/440631-has-changes-no-param/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/440631-has-changes-no-param/

------------------------------------------------------------
revno: 4732
revision-id: v.ladeuil+lp at free.fr-20091006163448-2bsmz0y3undr1xki
parent: v.ladeuil+lp at free.fr-20091006144037-o76rgosv9hj3td0y
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 440631-has-changes-no-param
timestamp: Tue 2009-10-06 18:34:48 +0200
message:
  Fixed as per John's review.
  
  * bzrlib/tests/test_mutabletree.py:
  (TestHasChanges): Add true unit tests for the no-parameter usage
  of has_changes.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_mutabletree.py'
--- a/bzrlib/tests/test_mutabletree.py	2009-09-07 23:14:05 +0000
+++ b/bzrlib/tests/test_mutabletree.py	2009-10-06 16:34:48 +0000
@@ -19,15 +19,18 @@
 Most functionality of MutableTree is tested as part of WorkingTree.
 """
 
-from bzrlib.tests import TestCase
-from bzrlib.mutabletree import MutableTree, MutableTreeHooks
-
-class TestHooks(TestCase):
+from bzrlib import (
+    mutabletree,
+    tests,
+    )
+
+
+class TestHooks(tests.TestCase):
 
     def test_constructor(self):
         """Check that creating a MutableTreeHooks instance has the right
         defaults."""
-        hooks = MutableTreeHooks()
+        hooks = mutabletree.MutableTreeHooks()
         self.assertTrue("start_commit" in hooks,
                         "start_commit not in %s" % hooks)
         self.assertTrue("post_commit" in hooks,
@@ -36,7 +39,25 @@
     def test_installed_hooks_are_MutableTreeHooks(self):
         """The installed hooks object should be a MutableTreeHooks."""
         # the installed hooks are saved in self._preserved_hooks.
-        self.assertIsInstance(self._preserved_hooks[MutableTree][1],
-                              MutableTreeHooks)
-
-
+        self.assertIsInstance(self._preserved_hooks[mutabletree.MutableTree][1],
+                              mutabletree.MutableTreeHooks)
+
+
+class TestHasChanges(tests.TestCaseWithTransport):
+
+    def setUp(self):
+        super(TestHasChanges, self).setUp()
+        self.tree = self.make_branch_and_tree('tree')
+
+    def test_with_uncommitted_changes(self):
+        self.build_tree(['tree/file'])
+        self.tree.add('file')
+        self.assertTrue(self.tree.has_changes())
+
+    def test_with_pending_merges(self):
+        other_tree = self.tree.bzrdir.sprout('other').open_workingtree()
+        self.build_tree(['other/file'])
+        other_tree.add('file')
+        other_tree.commit('added file')
+        self.tree.merge_from_branch(other_tree.branch)
+        self.assertTrue(self.tree.has_changes())