← 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: Aaron Bentley
  • Date: 2005-08-25 15:23:10 UTC
  • mto: (1092.1.42) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: abentley@panoramicfeedback.com-20050825152310-897f26086c7fb592
Fixed negative revision handling

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 FunctionalTestCase, TestCase
5
 
from bzrlib.branch import Branch
6
 
from bzrlib.errors import NotBranchError, NotVersionedError
7
 
 
8
 
class TestSmartAdd(FunctionalTestCase):
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
 
        self.build_tree(build_paths)
52
 
        branch = Branch(".", init=True)
53
 
        child_branch = Branch("original/child", init=True)
54
 
        smart_add((".",), False, True)
55
 
        for path in paths:
56
 
            self.assertNotEqual((path, branch.inventory.path2id(path)),
57
 
                                (path, None))
58
 
        for path in full_child_paths:
59
 
            self.assertEqual((path, branch.inventory.path2id(path)),
60
 
                             (path, None))
61
 
        for path in child_paths:
62
 
            self.assertEqual(child_branch.inventory.path2id(path), None)
63
 
 
64
 
    def test_add_paths(self):
65
 
        """Test smart-adding a list of paths."""
66
 
        from bzrlib.add import smart_add
67
 
        paths = ("file1", "file2")
68
 
        self.build_tree(paths)
69
 
        branch = Branch(".", init=True)
70
 
        smart_add(paths, False, True)
71
 
        for path in paths:
72
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
73
 
            
74
 
class TestSmartAddBranch(FunctionalTestCase):
75
 
    """Test smart adds with a specified branch."""
76
 
 
77
 
    def test_add_dot_from_root(self):
78
 
        """Test adding . from the root of the tree.""" 
79
 
        from bzrlib.add import smart_add_branch
80
 
        paths = ("original/", "original/file1", "original/file2")
81
 
        self.build_tree(paths)
82
 
        branch = Branch(".", init=True)
83
 
        smart_add_branch(branch, (".",), False, True)
84
 
        for path in paths:
85
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
86
 
 
87
 
    def test_add_dot_from_subdir(self):
88
 
        """Test adding . from a subdir of the tree.""" 
89
 
        from bzrlib.add import smart_add_branch
90
 
        paths = ("original/", "original/file1", "original/file2")
91
 
        self.build_tree(paths)
92
 
        branch = Branch(".", init=True)
93
 
        os.chdir("original")
94
 
        smart_add_branch(branch, (".",), False, True)
95
 
        for path in paths:
96
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
97
 
 
98
 
    def test_add_tree_from_above_tree(self):
99
 
        """Test adding a tree from above the tree.""" 
100
 
        from bzrlib.add import smart_add_branch
101
 
        paths = ("original/", "original/file1", "original/file2")
102
 
        branch_paths = ("branch/", "branch/original/", "branch/original/file1",
103
 
                        "branch/original/file2")
104
 
        self.build_tree(branch_paths)
105
 
        branch = Branch("branch", init=True)
106
 
        smart_add_branch(branch, ("branch",), False, True)
107
 
        for path in paths:
108
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
109
 
 
110
 
    def test_add_above_tree_preserves_tree(self):
111
 
        """Test nested trees are not affect by an add above them."""
112
 
        from bzrlib.add import smart_add_branch
113
 
        paths = ("original/", "original/file1", "original/file2")
114
 
        child_paths = ("path")
115
 
        full_child_paths = ("original/child", "original/child/path")
116
 
        build_paths = ("original/", "original/file1", "original/file2", 
117
 
                       "original/child/", "original/child/path")
118
 
        self.build_tree(build_paths)
119
 
        branch = Branch(".", init=True)
120
 
        child_branch = Branch("original/child", init=True)
121
 
        smart_add_branch(branch, (".",), False, True)
122
 
        for path in paths:
123
 
            self.assertNotEqual((path, branch.inventory.path2id(path)),
124
 
                                (path, None))
125
 
        for path in full_child_paths:
126
 
            self.assertEqual((path, branch.inventory.path2id(path)),
127
 
                             (path, None))
128
 
        for path in child_paths:
129
 
            self.assertEqual(child_branch.inventory.path2id(path), None)
130
 
 
131
 
    def test_add_paths(self):
132
 
        """Test smart-adding a list of paths."""
133
 
        from bzrlib.add import smart_add_branch
134
 
        paths = ("file1", "file2")
135
 
        self.build_tree(paths)
136
 
        branch = Branch(".", init=True)
137
 
        smart_add_branch(branch, paths, False, True)
138
 
        for path in paths:
139
 
            self.assertNotEqual(branch.inventory.path2id(path), None)
140
 
 
141
 
class TestAddCallbacks(TestCase):
142
 
 
143
 
    def setUp(self):
144
 
        from bzrlib.inventory import InventoryEntry
145
 
        super(TestAddCallbacks, self).setUp()
146
 
        self.entry = InventoryEntry("id", "name", "file", None)
147
 
 
148
 
    def test_null_callback(self):
149
 
        from bzrlib.add import _NullAddCallback
150
 
        _NullAddCallback(self.entry)
151
 
 
152
 
    def test_print_callback(self):
153
 
        from bzrlib.add import _PrintAddCallback
154
 
        from StringIO import StringIO
155
 
        stdout = StringIO()
156
 
        self.apply_redirected(None, stdout, None, _PrintAddCallback,
157
 
                              self.entry)
158
 
        self.assertEqual(stdout.getvalue(), "added name\n")