Rev 2327: Add some tests for WorkingTree.basis_tree() in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

[John Arbash Meinel]

At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2327
revision-id: john at arbash-meinel.com-20070216010712-31haaz780hytg7e5
parent: john at arbash-meinel.com-20070216005529-97uws9mank4hh12q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-02-15 19:07:12 -0600
message:
  Add some tests for WorkingTree.basis_tree()
added:
  bzrlib/tests/workingtree_implementations/test_basis_tree.py test_basis_tree.py-20070216005613-85tsdbzarlx088wg-1
modified:
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
-------------- next part --------------
=== added file 'bzrlib/tests/workingtree_implementations/test_basis_tree.py'
--- a/bzrlib/tests/workingtree_implementations/test_basis_tree.py	1970-01-01 00:00:00 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_basis_tree.py	2007-02-16 01:07:12 +0000
@@ -0,0 +1,74 @@
+# Copyright (C) 2007 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+"""Test that WorkingTree.basis_tree() yields a valid tree."""
+
+from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
+
+
+class TestBasisTree(TestCaseWithWorkingTree):
+
+    def test_emtpy_tree(self):
+        """A working tree with no parents."""
+        tree = self.make_branch_and_tree('tree')
+        basis_tree = tree.basis_tree()
+
+        basis_tree.lock_read()
+        try:
+            self.assertEqual([], list(basis_tree.list_files(include_root=True)))
+        finally:
+            basis_tree.unlock()
+
+    def test_same_tree(self):
+        """Test basis_tree when working tree hasn't been modified."""
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['file', 'dir/', 'dir/subfile'])
+        tree.add(['file', 'dir', 'dir/subfile'])
+        revision_id = tree.commit('initial tree')
+
+        basis_tree = tree.basis_tree()
+        basis_tree.lock_read()
+        try:
+            self.assertEqual(revision_id, basis_tree.get_revision_id())
+            # list_files() may return in either dirblock or sorted order
+            # TODO: jam 20070215 Should list_files have an explicit order?
+            self.assertEqual(['', 'dir', 'dir/subfile', 'file'],
+                     sorted(info[0] for info in basis_tree.list_files(True)))
+        finally:
+            basis_tree.unlock()
+
+    def test_altered_tree(self):
+        """Test basis really is basis after working has been modified."""
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['file', 'dir/', 'dir/subfile'])
+        tree.add(['file', 'dir', 'dir/subfile'])
+        revision_id = tree.commit('initial tree')
+
+        self.build_tree(['new file', 'new dir/'])
+        tree.rename_one('file', 'dir/new file')
+        tree.unversion([tree.path2id('dir/subfile')])
+        tree.add(['new file', 'new dir'])
+
+        basis_tree = tree.basis_tree()
+        basis_tree.lock_read()
+        try:
+            self.assertEqual(revision_id, basis_tree.get_revision_id())
+            # list_files() may return in either dirblock or sorted order
+            # TODO: jam 20070215 Should list_files have an explicit order?
+            self.assertEqual(['', 'dir', 'dir/subfile', 'file'],
+                     sorted(info[0] for info in basis_tree.list_files(True)))
+        finally:
+            basis_tree.unlock()

=== modified file 'bzrlib/tests/workingtree_implementations/__init__.py'
--- a/bzrlib/tests/workingtree_implementations/__init__.py	2007-02-15 17:59:00 +0000
+++ b/bzrlib/tests/workingtree_implementations/__init__.py	2007-02-16 01:07:12 +0000
@@ -52,6 +52,7 @@
     result = TestSuite()
     test_workingtree_implementations = [
         'bzrlib.tests.workingtree_implementations.test_basis_inventory',
+        'bzrlib.tests.workingtree_implementations.test_basis_tree',
         'bzrlib.tests.workingtree_implementations.test_break_lock',
         'bzrlib.tests.workingtree_implementations.test_changes_from',
         'bzrlib.tests.workingtree_implementations.test_commit',