← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_treebuilder.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_treebuilder.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
"""Tests for the TreeBuilder helper class."""
19
19
 
20
 
from bzrlib import errors, tests
 
20
from bzrlib import errors
21
21
from bzrlib.memorytree import MemoryTree
22
22
from bzrlib.tests import TestCaseWithTransport
23
23
from bzrlib.treebuilder import TreeBuilder
29
29
    def __init__(self):
30
30
        self._calls = []
31
31
 
32
 
    def lock_tree_write(self):
33
 
        self._calls.append("lock_tree_write")
 
32
    def lock_write(self):
 
33
        self._calls.append("lock_write")
34
34
 
35
35
    def unlock(self):
36
36
        self._calls.append("unlock")
37
37
 
38
38
 
39
39
class TestFakeTree(TestCaseWithTransport):
40
 
 
 
40
    
41
41
    def testFakeTree(self):
42
42
        """Check that FakeTree works as required for the TreeBuilder tests."""
43
43
        tree = FakeTree()
44
44
        self.assertEqual([], tree._calls)
45
 
        tree.lock_tree_write()
46
 
        self.assertEqual(["lock_tree_write"], tree._calls)
 
45
        tree.lock_write()
 
46
        self.assertEqual(["lock_write"], tree._calls)
47
47
        tree.unlock()
48
 
        self.assertEqual(["lock_tree_write", "unlock"], tree._calls)
49
 
 
50
 
 
51
 
class TestTreeBuilderMemoryTree(tests.TestCaseWithMemoryTransport):
52
 
 
 
48
        self.assertEqual(["lock_write", "unlock"], tree._calls)
 
49
 
 
50
 
 
51
class TestTreeBuilder(TestCaseWithTransport):
 
52
    
53
53
    def test_create(self):
54
54
        builder = TreeBuilder()
55
55
 
57
57
        builder = TreeBuilder()
58
58
        tree = FakeTree()
59
59
        builder.start_tree(tree)
60
 
        self.assertEqual(["lock_tree_write"], tree._calls)
 
60
        self.assertEqual(["lock_write"], tree._calls)
61
61
 
62
62
    def test_start_tree_when_started_fails(self):
63
63
        builder = TreeBuilder()
64
64
        tree = FakeTree()
65
65
        builder.start_tree(tree)
66
66
        self.assertRaises(errors.AlreadyBuilding, builder.start_tree, tree)
67
 
 
 
67
        
68
68
    def test_finish_tree_not_started_errors(self):
69
69
        builder = TreeBuilder()
70
70
        self.assertRaises(errors.NotBuilding, builder.finish_tree)
74
74
        tree = FakeTree()
75
75
        builder.start_tree(tree)
76
76
        builder.finish_tree()
77
 
        self.assertEqual(["lock_tree_write", "unlock"], tree._calls)
 
77
        self.assertEqual(["lock_write", "unlock"], tree._calls)
78
78
 
79
79
    def test_build_tree_not_started_errors(self):
80
80
        builder = TreeBuilder()
92
92
        self.assertEqual('contents of bar/file\n',
93
93
            tree.get_file(tree.path2id('bar/file')).read())
94
94
        builder.finish_tree()
95