← 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: Martin Pool
  • Date: 2010-08-18 07:25:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5383.
  • Revision ID: mbp@sourcefrog.net-20100818072522-uk3gsazoia3l3s0a
Start adding 'what's new in 2.3'

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_options.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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,
23
22
    errors,
24
23
    option,
25
 
    registry,
26
24
    )
27
25
from bzrlib.builtins import cmd_commit
28
 
from bzrlib.commands import parse_args
 
26
from bzrlib.commands import Command, parse_args
29
27
from bzrlib.tests import TestCase
30
28
from bzrlib.repofmt import knitrepo
31
29
 
109
107
        self.assertFalse(option.Option('foo', hidden=False).is_hidden('foo'))
110
108
 
111
109
    def test_registry_conversion(self):
112
 
        registry = controldir.ControlDirFormatRegistry()
113
 
        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
114
 
        bzrdir.register_metadir(registry, 'two', 'RepositoryFormatKnit1', 'two help')
115
 
        bzrdir.register_metadir(registry, 'hidden', 'RepositoryFormatKnit1',
 
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',
116
114
            'two help', hidden=True)
117
115
        registry.set_default('one')
118
116
        options = [option.RegistryOption('format', '', registry, str)]
179
177
        self.assertEqual('test option', my_option.help)
180
178
 
181
179
    def test_help(self):
182
 
        registry = controldir.ControlDirFormatRegistry()
183
 
        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
184
 
        bzrdir.register_metadir(registry, 'two',
 
180
        registry = bzrdir.BzrDirFormatRegistry()
 
181
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
 
182
        registry.register_metadir('two',
185
183
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
186
184
            'two help',
187
185
            )
188
 
        bzrdir.register_metadir(registry, 'hidden', 'RepositoryFormat7', 'hidden help',
 
186
        registry.register_metadir('hidden', 'RepositoryFormat7', 'hidden help',
189
187
            hidden=True)
190
188
        registry.set_default('one')
191
189
        options = [option.RegistryOption('format', 'format help', registry,
207
205
        opt = option.Option('hello', help='fg', type=int, argname='gar')
208
206
        self.assertEqual(list(opt.iter_switches()),
209
207
                         [('hello', None, 'GAR', 'fg')])
210
 
        registry = controldir.ControlDirFormatRegistry()
211
 
        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
212
 
        bzrdir.register_metadir(registry, 'two',
 
208
        registry = bzrdir.BzrDirFormatRegistry()
 
209
        registry.register_metadir('one', 'RepositoryFormat7', 'one help')
 
210
        registry.register_metadir('two',
213
211
                'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
214
212
                'two help',
215
213
                )
388
386
                    + '\n'.join(msgs))
389
387
 
390
388
    def test_is_hidden(self):
391
 
        registry = controldir.ControlDirFormatRegistry()
392
 
        bzrdir.register_metadir(registry, 'hidden', 'HiddenFormat',
 
389
        registry = bzrdir.BzrDirFormatRegistry()
 
390
        registry.register_metadir('hidden', 'HiddenFormat',
393
391
            'hidden help text', hidden=True)
394
 
        bzrdir.register_metadir(registry, 'visible', 'VisibleFormat',
 
392
        registry.register_metadir('visible', 'VisibleFormat',
395
393
            'visible help text', hidden=False)
396
394
        format = option.RegistryOption('format', '', registry, str)
397
395
        self.assertTrue(format.is_hidden('hidden'))
398
396
        self.assertFalse(format.is_hidden('visible'))
399
397
 
400
 
    def test_short_name(self):
401
 
        registry = controldir.ControlDirFormatRegistry()
402
 
        opt = option.RegistryOption('format', help='', registry=registry)
403
 
        self.assertEquals(None, opt.short_name())
404
 
        opt = option.RegistryOption('format', short_name='F', help='',
405
 
            registry=registry)
406
 
        self.assertEquals('F', opt.short_name())
407
 
 
408
398
    def test_option_custom_help(self):
409
399
        the_opt = option.Option.OPTIONS['help']
410
400
        orig_help = the_opt.help[:]
413
403
        self.assertEqual('suggest lottery numbers', my_opt.help)
414
404
        self.assertEqual(orig_help, the_opt.help)
415
405
 
416
 
    def test_short_value_switches(self):
417
 
        reg = registry.Registry()
418
 
        reg.register('short', 'ShortChoice')
419
 
        reg.register('long', 'LongChoice')
420
 
        ropt = option.RegistryOption('choice', '', reg, value_switches=True,
421
 
            short_value_switches={'short': 's'})
422
 
        opts, args = parse([ropt], ['--short'])
423
 
        self.assertEqual('ShortChoice', opts.choice)
424
 
        opts, args = parse([ropt], ['-s'])
425
 
        self.assertEqual('ShortChoice', opts.choice)
426
 
 
427
406
 
428
407
class TestVerboseQuietLinkage(TestCase):
429
408