← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_options.py

  • Committer: John Arbash Meinel
  • Date: 2011-10-03 14:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 6186.
  • Revision ID: john@arbash-meinel.com-20111003141544-2upoh3swgxqerfv7
Separate the comments, for vila.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_options.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
from bzrlib import (
20
20
    bzrdir,
21
21
    commands,
 
22
    controldir,
22
23
    errors,
23
24
    option,
 
25
    registry,
24
26
    )
25
27
from bzrlib.builtins import cmd_commit
26
 
from bzrlib.commands import Command, parse_args
 
28
from bzrlib.commands import parse_args
27
29
from bzrlib.tests import TestCase
28
30
from bzrlib.repofmt import knitrepo
29
31
 
63
65
        out, err = self.run_bzr('help status')
64
66
        self.assertContainsRe(out, r'--show-ids.*Show internal object.')
65
67
 
 
68
    def test_option_help_global_hidden(self):
 
69
        """Hidden global options have no help strings."""
 
70
        out, err = self.run_bzr('help log')
 
71
        self.assertNotContainsRe(out, r'--message')
 
72
 
66
73
    def test_option_arg_help(self):
67
74
        """Help message shows option arguments."""
68
75
        out, err = self.run_bzr('help commit')
107
114
        self.assertFalse(option.Option('foo', hidden=False).is_hidden('foo'))
108
115
 
109
116
    def test_registry_conversion(self):
110
 
        registry = bzrdir.BzrDirFormatRegistry()
111
 
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
112
 
        registry.register_metadir('two', 'RepositoryFormatKnit1', 'two help')
113
 
        registry.register_metadir('hidden', 'RepositoryFormatKnit1',
 
117
        registry = controldir.ControlDirFormatRegistry()
 
118
        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
 
119
        bzrdir.register_metadir(registry, 'two', 'RepositoryFormatKnit1', 'two help')
 
120
        bzrdir.register_metadir(registry, 'hidden', 'RepositoryFormatKnit1',
114
121
            'two help', hidden=True)
115
122
        registry.set_default('one')
116
123
        options = [option.RegistryOption('format', '', registry, str)]
177
184
        self.assertEqual('test option', my_option.help)
178
185
 
179
186
    def test_help(self):
180
 
        registry = bzrdir.BzrDirFormatRegistry()
181
 
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
182
 
        registry.register_metadir('two',
 
187
        registry = controldir.ControlDirFormatRegistry()
 
188
        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
 
189
        bzrdir.register_metadir(registry, 'two',
183
190
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
184
191
            'two help',
185
192
            )
186
 
        registry.register_metadir('hidden', 'RepositoryFormat7', 'hidden help',
 
193
        bzrdir.register_metadir(registry, 'hidden', 'RepositoryFormat7', 'hidden help',
187
194
            hidden=True)
188
195
        registry.set_default('one')
189
196
        options = [option.RegistryOption('format', 'format help', registry,
205
212
        opt = option.Option('hello', help='fg', type=int, argname='gar')
206
213
        self.assertEqual(list(opt.iter_switches()),
207
214
                         [('hello', None, 'GAR', 'fg')])
208
 
        registry = bzrdir.BzrDirFormatRegistry()
209
 
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
210
 
        registry.register_metadir('two',
 
215
        registry = controldir.ControlDirFormatRegistry()
 
216
        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
 
217
        bzrdir.register_metadir(registry, 'two',
211
218
                'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
212
219
                'two help',
213
220
                )
386
393
                    + '\n'.join(msgs))
387
394
 
388
395
    def test_is_hidden(self):
389
 
        registry = bzrdir.BzrDirFormatRegistry()
390
 
        registry.register_metadir('hidden', 'HiddenFormat',
 
396
        registry = controldir.ControlDirFormatRegistry()
 
397
        bzrdir.register_metadir(registry, 'hidden', 'HiddenFormat',
391
398
            'hidden help text', hidden=True)
392
 
        registry.register_metadir('visible', 'VisibleFormat',
 
399
        bzrdir.register_metadir(registry, 'visible', 'VisibleFormat',
393
400
            'visible help text', hidden=False)
394
401
        format = option.RegistryOption('format', '', registry, str)
395
402
        self.assertTrue(format.is_hidden('hidden'))
396
403
        self.assertFalse(format.is_hidden('visible'))
397
404
 
 
405
    def test_short_name(self):
 
406
        registry = controldir.ControlDirFormatRegistry()
 
407
        opt = option.RegistryOption('format', help='', registry=registry)
 
408
        self.assertEquals(None, opt.short_name())
 
409
        opt = option.RegistryOption('format', short_name='F', help='',
 
410
            registry=registry)
 
411
        self.assertEquals('F', opt.short_name())
 
412
 
398
413
    def test_option_custom_help(self):
399
414
        the_opt = option.Option.OPTIONS['help']
400
415
        orig_help = the_opt.help[:]
403
418
        self.assertEqual('suggest lottery numbers', my_opt.help)
404
419
        self.assertEqual(orig_help, the_opt.help)
405
420
 
 
421
    def test_short_value_switches(self):
 
422
        reg = registry.Registry()
 
423
        reg.register('short', 'ShortChoice')
 
424
        reg.register('long', 'LongChoice')
 
425
        ropt = option.RegistryOption('choice', '', reg, value_switches=True,
 
426
            short_value_switches={'short': 's'})
 
427
        opts, args = parse([ropt], ['--short'])
 
428
        self.assertEqual('ShortChoice', opts.choice)
 
429
        opts, args = parse([ropt], ['-s'])
 
430
        self.assertEqual('ShortChoice', opts.choice)
 
431
 
406
432
 
407
433
class TestVerboseQuietLinkage(TestCase):
408
434