~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commands.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-09 15:33:25 UTC
  • mto: (5082.2.1 integration2)
  • mto: This revision was merged to the branch mainline in revision 5084.
  • Revision ID: v.ladeuil+lp@free.fr-20100309153325-w16djg6tbkt0905a
Deprecate Merge3Merger.scalar_three_way.

* bzrlib/merge.py:
(Merge3Merger.scalar_three_way): Deprecated, not used in the
current code base, skimming history seem to reveal it hasn't been
used for quite a long time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
from cStringIO import StringIO
18
18
import errno
23
23
    commands,
24
24
    config,
25
25
    errors,
 
26
    option,
 
27
    symbol_versioning,
26
28
    tests,
27
29
    )
28
30
from bzrlib.commands import display_command
60
62
        self.assertRaises(errors.BzrCommandError,
61
63
                          commands.run_bzr, ['log', u'--option\xb5'])
62
64
 
 
65
    @staticmethod
 
66
    def get_command(options):
 
67
        class cmd_foo(commands.Command):
 
68
            'Bar'
 
69
 
 
70
            takes_options = options
 
71
 
 
72
        return cmd_foo()
 
73
 
 
74
    def test_help_hidden(self):
 
75
        c = self.get_command([option.Option('foo', hidden=True)])
 
76
        self.assertNotContainsRe(c.get_help_text(), '--foo')
 
77
 
 
78
    def test_help_not_hidden(self):
 
79
        c = self.get_command([option.Option('foo', hidden=False)])
 
80
        self.assertContainsRe(c.get_help_text(), '--foo')
 
81
 
63
82
 
64
83
class TestGetAlias(tests.TestCase):
65
84
 
93
112
 
94
113
    def test_unicode(self):
95
114
        my_config = self._get_config("[ALIASES]\n"
96
 
            u"iam=whoami 'Erik B\u00e5gfors <erik@bagfors.nu>'\n")
 
115
            u'iam=whoami "Erik B\u00e5gfors <erik@bagfors.nu>"\n')
97
116
        self.assertEqual([u'whoami', u'Erik B\u00e5gfors <erik@bagfors.nu>'],
98
117
                          commands.get_alias("iam", config=my_config))
99
118
 
140
159
class TestRegisterLazy(tests.TestCase):
141
160
 
142
161
    def setUp(self):
 
162
        tests.TestCase.setUp(self)
143
163
        import bzrlib.tests.fake_command
144
164
        del sys.modules['bzrlib.tests.fake_command']
145
165
        global lazy_command_imported
146
166
        lazy_command_imported = False
 
167
        commands.install_bzr_command_hooks()
147
168
 
148
169
    @staticmethod
149
170
    def remove_fake():
186
207
        # commands are registered).
187
208
        # when they are simply created.
188
209
        hook_calls = []
 
210
        commands.install_bzr_command_hooks()
189
211
        commands.Command.hooks.install_named_hook(
190
212
            "extend_command", hook_calls.append, None)
191
213
        # create a command, should not fire
218
240
            self.assertEqual([cmd], hook_calls)
219
241
        finally:
220
242
            commands.plugin_cmds.remove('fake')
 
243
 
 
244
 
 
245
class TestGetCommandHook(tests.TestCase):
 
246
 
 
247
    def test_fires_on_get_cmd_object(self):
 
248
        # The get_command(cmd) hook fires when commands are delivered to the
 
249
        # ui.
 
250
        commands.install_bzr_command_hooks()
 
251
        hook_calls = []
 
252
        class ACommand(commands.Command):
 
253
            """A sample command."""
 
254
        def get_cmd(cmd_or_None, cmd_name):
 
255
            hook_calls.append(('called', cmd_or_None, cmd_name))
 
256
            if cmd_name in ('foo', 'info'):
 
257
                return ACommand()
 
258
        commands.Command.hooks.install_named_hook(
 
259
            "get_command", get_cmd, None)
 
260
        # create a command directly, should not fire
 
261
        cmd = ACommand()
 
262
        self.assertEqual([], hook_calls)
 
263
        # ask by name, should fire and give us our command
 
264
        cmd = commands.get_cmd_object('foo')
 
265
        self.assertEqual([('called', None, 'foo')], hook_calls)
 
266
        self.assertIsInstance(cmd, ACommand)
 
267
        del hook_calls[:]
 
268
        # ask by a name that is supplied by a builtin - the hook should still
 
269
        # fire and we still get our object, but we should see the builtin
 
270
        # passed to the hook.
 
271
        cmd = commands.get_cmd_object('info')
 
272
        self.assertIsInstance(cmd, ACommand)
 
273
        self.assertEqual(1, len(hook_calls))
 
274
        self.assertEqual('info', hook_calls[0][2])
 
275
        self.assertIsInstance(hook_calls[0][1], builtins.cmd_info)
 
276
 
 
277
 
 
278
class TestGetMissingCommandHook(tests.TestCase):
 
279
 
 
280
    def hook_missing(self):
 
281
        """Hook get_missing_command for testing."""
 
282
        self.hook_calls = []
 
283
        class ACommand(commands.Command):
 
284
            """A sample command."""
 
285
        def get_missing_cmd(cmd_name):
 
286
            self.hook_calls.append(('called', cmd_name))
 
287
            if cmd_name in ('foo', 'info'):
 
288
                return ACommand()
 
289
        commands.Command.hooks.install_named_hook(
 
290
            "get_missing_command", get_missing_cmd, None)
 
291
        self.ACommand = ACommand
 
292
 
 
293
    def test_fires_on_get_cmd_object(self):
 
294
        # The get_missing_command(cmd) hook fires when commands are delivered to the
 
295
        # ui.
 
296
        self.hook_missing()
 
297
        # create a command directly, should not fire
 
298
        self.cmd = self.ACommand()
 
299
        self.assertEqual([], self.hook_calls)
 
300
        # ask by name, should fire and give us our command
 
301
        cmd = commands.get_cmd_object('foo')
 
302
        self.assertEqual([('called', 'foo')], self.hook_calls)
 
303
        self.assertIsInstance(cmd, self.ACommand)
 
304
        del self.hook_calls[:]
 
305
        # ask by a name that is supplied by a builtin - the hook should not
 
306
        # fire and we still get our object.
 
307
        commands.install_bzr_command_hooks()
 
308
        cmd = commands.get_cmd_object('info')
 
309
        self.assertNotEqual(None, cmd)
 
310
        self.assertEqual(0, len(self.hook_calls))
 
311
 
 
312
    def test_skipped_on_HelpCommandIndex_get_topics(self):
 
313
        # The get_missing_command(cmd_name) hook is not fired when
 
314
        # looking up help topics.
 
315
        self.hook_missing()
 
316
        topic = commands.HelpCommandIndex()
 
317
        topics = topic.get_topics('foo')
 
318
        self.assertEqual([], self.hook_calls)
 
319
 
 
320
 
 
321
class TestListCommandHook(tests.TestCase):
 
322
 
 
323
    def test_fires_on_all_command_names(self):
 
324
        # The list_commands() hook fires when all_command_names() is invoked.
 
325
        hook_calls = []
 
326
        commands.install_bzr_command_hooks()
 
327
        def list_my_commands(cmd_names):
 
328
            hook_calls.append('called')
 
329
            cmd_names.update(['foo', 'bar'])
 
330
            return cmd_names
 
331
        commands.Command.hooks.install_named_hook(
 
332
            "list_commands", list_my_commands, None)
 
333
        # Get a command, which should not trigger the hook.
 
334
        cmd = commands.get_cmd_object('info')
 
335
        self.assertEqual([], hook_calls)
 
336
        # Get all command classes (for docs and shell completion).
 
337
        cmds = list(commands.all_command_names())
 
338
        self.assertEqual(['called'], hook_calls)
 
339
        self.assertSubset(['foo', 'bar'], cmds)
 
340
 
 
341
class TestDeprecations(tests.TestCase):
 
342
 
 
343
    def test_shlex_split_unicode_deprecation(self):
 
344
        res = self.applyDeprecated(
 
345
                symbol_versioning.deprecated_in((2, 2, 0)),
 
346
                commands.shlex_split_unicode, 'whatever')