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

configtypes: Add some additional tests.

Browse Source
This commit is contained in:
Florian Bruhin 2015-07-23 16:58:21 +02:00
parent eb28365d82
commit 41333cd6e1
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tests/config/test_configtypes.py
View File

@ -804,20 +804,14 @@ class TestFont:
FontDesc(QFont.StyleNormal, QFont.Bold, 10, None, 'Foobar Neue'), FontDesc(QFont.StyleNormal, QFont.Bold, 10, None, 'Foobar Neue'),
'bold italic 10pt "Foobar Neue"': 'bold italic 10pt "Foobar Neue"':
FontDesc(QFont.StyleItalic, QFont.Bold, 10, None, 'Foobar Neue'), FontDesc(QFont.StyleItalic, QFont.Bold, 10, None, 'Foobar Neue'),
'normal 300 10pt "Foobar Neue"':
FontDesc(QFont.StyleNormal, 37.5, 10, None, 'Foobar Neue'),
'normal 800 10pt "Foobar Neue"':
FontDesc(QFont.StyleNormal, 99, 10, None, 'Foobar Neue'),
} }
INVALID = [ font_xfail = pytest.mark.xfail(reason='FIXME: #103')
'green "Foobar Neue"',
'italic green "Foobar Neue"',
'bold bold "Foobar Neue"',
'bold italic "Foobar Neue"',
'10pt 20px "Foobar Neue"',
'bold',
'italic',
'green',
'10pt',
'10pt ""',
]
@pytest.fixture(params=[configtypes.Font, configtypes.QtFont]) @pytest.fixture(params=[configtypes.Font, configtypes.QtFont])
def klass(self, request): def klass(self, request):
@ -835,8 +829,19 @@ class TestFont:
def test_validate_valid(self, klass, val): def test_validate_valid(self, klass, val):
klass(none_ok=True).validate(val) klass(none_ok=True).validate(val)
@pytest.mark.parametrize('val', INVALID) @pytest.mark.parametrize('val', [
@pytest.mark.xfail(reason='FIXME: #103') font_xfail('green "Foobar Neue"'),
font_xfail('italic green "Foobar Neue"'),
font_xfail('bold bold "Foobar Neue"'),
font_xfail('bold italic "Foobar Neue"'),
font_xfail('10pt 20px "Foobar Neue"'),
font_xfail('bold'),
font_xfail('italic'),
font_xfail('green'),
font_xfail('10pt'),
font_xfail('10pt ""'),
'%',
])
def test_validate_invalid(self, klass, val): def test_validate_invalid(self, klass, val):
with pytest.raises(configexc.ValidationError): with pytest.raises(configexc.ValidationError):
klass().validate(val) klass().validate(val)
@ -895,6 +900,7 @@ class TestFontFamily:
'normal bold 10pt "Foobar Neue"', 'normal bold 10pt "Foobar Neue"',
'bold italic 10pt "Foobar Neue"', 'bold italic 10pt "Foobar Neue"',
'', # with none_ok=False '', # with none_ok=False
'%',
] ]
@pytest.fixture @pytest.fixture
@ -1229,6 +1235,7 @@ class TestShellCommand:
({}, ''), ({}, ''),
({'placeholder': '{}'}, 'foo{} bar'), ({'placeholder': '{}'}, 'foo{} bar'),
({'placeholder': '{}'}, 'foo bar'), ({'placeholder': '{}'}, 'foo bar'),
({}, 'foo"'), # not splittable with shlex
]) ])
def test_validate_invalid(self, klass, kwargs, val): def test_validate_invalid(self, klass, kwargs, val):
with pytest.raises(configexc.ValidationError): with pytest.raises(configexc.ValidationError):
@ -1318,13 +1325,14 @@ class TestSearchEngineName:
def klass(self): def klass(self):
return configtypes.SearchEngineName return configtypes.SearchEngineName
@pytest.mark.parametrize('val', ['', 'foobar'])
def test_validate_valid(self, klass, val):
klass(none_ok=True).validate(val)
def test_validate_empty(self, klass): def test_validate_empty(self, klass):
with pytest.raises(configexc.ValidationError): with pytest.raises(configexc.ValidationError):
klass().validate('') klass().validate('')
def test_validate_empty_none_ok(self, klass):
klass(none_ok=True).validate('')
@pytest.mark.parametrize('val, expected', [('', None), @pytest.mark.parametrize('val, expected', [('', None),
('foobar', 'foobar')]) ('foobar', 'foobar')])
def test_transform(self, klass, val, expected): def test_transform(self, klass, val, expected):