← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_smart_add.py

  • Committer: Martin Pool
  • Date: 2005-08-30 05:30:43 UTC
  • Revision ID: mbp@sourcefrog.net-20050830053042-58932432ee958d1e
- make get_parent() be a method of Branch; add simple tests for it

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_smart_add.py
 
1
import os
 
2
import unittest
 
3
 
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
 
5
from bzrlib.branch import Branch
 
6
from bzrlib.errors import NotBranchError, NotVersionedError
 
7
 
 
8
class TestSmartAdd(TestCaseInTempDir):
 
9
 
 
10
    def test_add_dot_from_root(self):
 
11
        """Test adding . from the root of the tree.""" 
 
12
        from bzrlib.add import smart_add
 
13
        paths = ("original/", "original/file1", "original/file2")
 
14
        self.build_tree(paths)
 
15
        branch = Branch(".", init=True)
 
16
        smart_add((".",), False, True)
 
17
        for path in paths:
 
18
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
19
 
 
20
    def test_add_dot_from_subdir(self):
 
21
        """Test adding . from a subdir of the tree.""" 
 
22
        from bzrlib.add import smart_add
 
23
        paths = ("original/", "original/file1", "original/file2")
 
24
        self.build_tree(paths)
 
25
        branch = Branch(".", init=True)
 
26
        os.chdir("original")
 
27
        smart_add((".",), False, True)
 
28
        for path in paths:
 
29
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
30
 
 
31
    def test_add_tree_from_above_tree(self):
 
32
        """Test adding a tree from above the tree.""" 
 
33
        from bzrlib.add import smart_add
 
34
        paths = ("original/", "original/file1", "original/file2")
 
35
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
 
36
                        "branch/original/file2")
 
37
        self.build_tree(branch_paths)
 
38
        branch = Branch("branch", init=True)
 
39
        smart_add(("branch",), False, True)
 
40
        for path in paths:
 
41
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
42
 
 
43
    def test_add_above_tree_preserves_tree(self):
 
44
        """Test nested trees are not affect by an add above them."""
 
45
        from bzrlib.add import smart_add
 
46
        paths = ("original/", "original/file1", "original/file2")
 
47
        child_paths = ("path",)
 
48
        full_child_paths = ("original/child", "original/child/path")
 
49
        build_paths = ("original/", "original/file1", "original/file2", 
 
50
                       "original/child/", "original/child/path")
 
51
        
 
52
        self.build_tree(build_paths)
 
53
        branch = Branch(".", init=True)
 
54
        child_branch = Branch("original/child", init=True)
 
55
        smart_add((".",), False, True)
 
56
        for path in paths:
 
57
            self.assertNotEqual((path, branch.inventory.path2id(path)),
 
58
                                (path, None))
 
59
        for path in full_child_paths:
 
60
            self.assertEqual((path, branch.inventory.path2id(path)),
 
61
                             (path, None))
 
62
        for path in child_paths:
 
63
            self.assertEqual(child_branch.inventory.path2id(path), None)
 
64
 
 
65
    def test_add_paths(self):
 
66
        """Test smart-adding a list of paths."""
 
67
        from bzrlib.add import smart_add
 
68
        paths = ("file1", "file2")
 
69
        self.build_tree(paths)
 
70
        branch = Branch(".", init=True)
 
71
        smart_add(paths, False, True)
 
72
        for path in paths:
 
73
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
74
            
 
75
class TestSmartAddBranch(TestCaseInTempDir):
 
76
    """Test smart adds with a specified branch."""
 
77
 
 
78
    def test_add_dot_from_root(self):
 
79
        """Test adding . from the root of the tree.""" 
 
80
        from bzrlib.add import smart_add_branch
 
81
        paths = ("original/", "original/file1", "original/file2")
 
82
        self.build_tree(paths)
 
83
        branch = Branch(".", init=True)
 
84
        smart_add_branch(branch, (".",), False, True)
 
85
        for path in paths:
 
86
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
87
 
 
88
    def test_add_dot_from_subdir(self):
 
89
        """Test adding . from a subdir of the tree.""" 
 
90
        from bzrlib.add import smart_add_branch
 
91
        paths = ("original/", "original/file1", "original/file2")
 
92
        self.build_tree(paths)
 
93
        branch = Branch(".", init=True)
 
94
        os.chdir("original")
 
95
        smart_add_branch(branch, (".",), False, True)
 
96
        for path in paths:
 
97
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
98
 
 
99
    def test_add_tree_from_above_tree(self):
 
100
        """Test adding a tree from above the tree.""" 
 
101
        from bzrlib.add import smart_add_branch
 
102
        paths = ("original/", "original/file1", "original/file2")
 
103
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
 
104
                        "branch/original/file2")
 
105
        self.build_tree(branch_paths)
 
106
        branch = Branch("branch", init=True)
 
107
        smart_add_branch(branch, ("branch",), False, True)
 
108
        for path in paths:
 
109
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
110
 
 
111
    def test_add_above_tree_preserves_tree(self):
 
112
        """Test nested trees are not affect by an add above them."""
 
113
        from bzrlib.add import smart_add_branch
 
114
        paths = ("original/", "original/file1", "original/file2")
 
115
        child_paths = ("path")
 
116
        full_child_paths = ("original/child", "original/child/path")
 
117
        build_paths = ("original/", "original/file1", "original/file2", 
 
118
                       "original/child/", "original/child/path")
 
119
        self.build_tree(build_paths)
 
120
        branch = Branch(".", init=True)
 
121
        child_branch = Branch("original/child", init=True)
 
122
        smart_add_branch(branch, (".",), False, True)
 
123
        for path in paths:
 
124
            self.assertNotEqual((path, branch.inventory.path2id(path)),
 
125
                                (path, None))
 
126
        for path in full_child_paths:
 
127
            self.assertEqual((path, branch.inventory.path2id(path)),
 
128
                             (path, None))
 
129
        for path in child_paths:
 
130
            self.assertEqual(child_branch.inventory.path2id(path), None)
 
131
 
 
132
    def test_add_paths(self):
 
133
        """Test smart-adding a list of paths."""
 
134
        from bzrlib.add import smart_add_branch
 
135
        paths = ("file1", "file2")
 
136
        self.build_tree(paths)
 
137
        branch = Branch(".", init=True)
 
138
        smart_add_branch(branch, paths, False, True)
 
139
        for path in paths:
 
140
            self.assertNotEqual(branch.inventory.path2id(path), None)
 
141
 
 
142
class TestAddCallbacks(TestCaseInTempDir):
 
143
 
 
144
    def setUp(self):
 
145
        from bzrlib.inventory import InventoryEntry
 
146
        super(TestAddCallbacks, self).setUp()
 
147
        self.entry = InventoryEntry("id", "name", "file", None)
 
148
 
 
149
    def test_null_callback(self):
 
150
        from bzrlib.add import _NullAddCallback
 
151
        _NullAddCallback('path', 'file', self.entry)
 
152
 
 
153
    def test_print_callback(self):
 
154
        from bzrlib.add import _PrintAddCallback
 
155
        from StringIO import StringIO
 
156
        stdout = StringIO()
 
157
        self.apply_redirected(None, stdout, None, _PrintAddCallback,
 
158
                              'path', 'file', self.entry)
 
159
        self.assertEqual(stdout.getvalue(), "added path\n")