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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
19
"""Black-box tests for 'bzr added', which shows newly-added files."""
23
23
from bzrlib.branch import Branch
24
from bzrlib.tests import TestCaseInTempDir
25
from bzrlib.tests.treeshape import build_tree_contents
27
class TestAdded(TestCaseInTempDir):
24
from bzrlib.tests import TestCaseWithTransport
27
class TestAdded(TestCaseWithTransport):
29
29
def test_added(self):
30
30
"""Test that 'added' command reports added files"""
32
def check_added(expected):
33
out, err = self.run_bzr_captured(['added'])
31
self._test_added('a', 'a\n')
33
def test_added_with_spaces(self):
34
"""Test that 'added' command reports added files with spaces in their names quoted"""
35
self._test_added('a filename with spaces', '"a filename with spaces"\n')
37
def test_added_null_separator(self):
38
"""Test that added uses its null operator properly"""
39
self._test_added('a', 'a\0', null=True)
41
def _test_added(self, name, output, null=False):
43
def check_added(expected, null=False):
49
out, err = self.run_bzr(command)
34
50
self.assertEquals(out, expected)
35
51
self.assertEquals(err, '')
40
53
# in empty directory, nothing added
54
tree = self.make_branch_and_tree('.')
44
57
# with unknown file, still nothing added
45
build_tree_contents([('a', 'contents of a\n')])
58
self.build_tree_contents([(name, 'contents of %s\n' % (name))])
48
61
# after add, shows up in list
49
62
# bug report 20060119 by Nathan McCallum -- 'bzr added' causes
65
check_added(output, null)
54
67
# after commit, now no longer listed
55
bzr('commit', '-m', 'add a')
68
tree.commit(message='add "%s"' % (name))
71
def test_added_directory(self):
72
"""Test --directory option"""
73
tree = self.make_branch_and_tree('a')
74
self.build_tree(['a/README'])
76
out, err = self.run_bzr(['added', '--directory=a'])
77
self.assertEquals('README\n', out)