← 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-29 10:57:01 UTC
  • mfrom: (1092.1.41)
  • Revision ID: mbp@sourcefrog.net-20050829105701-7aaa81ecf1bfee05
- merge in merge improvements and additional tests 
  from aaron and lifeless

robertc@robertcollins.net-20050825131100-85772edabc817481

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_smart_add.py
138
138
        for path in paths:
139
139
            self.assertNotEqual(branch.inventory.path2id(path), None)
140
140
 
141
 
class TestAddCallbacks(TestCase):
 
141
class TestAddCallbacks(FunctionalTestCase):
142
142
 
143
143
    def setUp(self):
144
144
        from bzrlib.inventory import InventoryEntry
147
147
 
148
148
    def test_null_callback(self):
149
149
        from bzrlib.add import _NullAddCallback
150
 
        _NullAddCallback(self.entry)
 
150
        _NullAddCallback('path', 'file', self.entry)
151
151
 
152
152
    def test_print_callback(self):
153
153
        from bzrlib.add import _PrintAddCallback
154
154
        from StringIO import StringIO
155
155
        stdout = StringIO()
156
156
        self.apply_redirected(None, stdout, None, _PrintAddCallback,
157
 
                              self.entry)
158
 
        self.assertEqual(stdout.getvalue(), "added name\n")
 
157
                              'path', 'file', self.entry)
 
158
        self.assertEqual(stdout.getvalue(), "added path\n")