rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set valid_values after __init__ consistently, move type validation out of class into pytest

Browse Source
This commit is contained in:
Patric Schmitz 2015-11-28 18:29:21 +01:00
parent fdde05569c
commit 03ba38578e
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qutebrowser/config/configtypes.py
View File

@ -220,9 +220,6 @@ class MappingType(BaseType):
valid_values=None):
super().__init__(none_ok)
self.valid_values = valid_values
if list(sorted(self.MAPPING)) != list(sorted(self.valid_values)):
raise ValueError("Mapping {!r} doesn't match valid values "
"{!r}".format(self.MAPPING, self.valid_values))
def validate(self, value):
super().validate(value.lower())

17
tests/unit/config/test_configtypes.py
View File

@ -235,9 +235,8 @@ class GoodMappingSubclass(configtypes.MappingType):
}
def __init__(self, none_ok=False):
super().__init__(
none_ok,
valid_values = configtypes.ValidValues('one', 'two'))
super().__init__(none_ok)
self.valid_values = configtypes.ValidValues('one', 'two')
class BadMappingSubclass(configtypes.MappingType):
@ -250,7 +249,7 @@ class BadMappingSubclass(configtypes.MappingType):
def __init__(self, none_ok=False):
super().__init__(none_ok)
self.valid_values = configtypes.ValidValues('one', 'two'))
self.valid_values = configtypes.ValidValues('one', 'two')
class TestMappingType:
@ -281,11 +280,13 @@ class TestMappingType:
def test_transform(self, klass, val, expected):
assert klass().transform(val) == expected
def test_bad_subclass_init(self):
with pytest.raises(ValueError):
BadMappingSubclass()
@pytest.mark.parametrize('typ', [configtypes.ColorSystem(),
configtypes.Position(),
configtypes.SelectOnRemove()])
def test_mapping_type_matches_valid_values(self, typ):
assert list(sorted(typ.MAPPING)) == list(sorted(typ.valid_values))
class TestString:
"""Test String."""