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

test_conftypes: Cleanups.

Browse Source
This commit is contained in:
Florian Bruhin 2014-08-05 21:08:01 +02:00
parent 2a34366d2c
commit ac6defaa7f
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
qutebrowser/test/config/test_conftypes.py
View File

@ -617,6 +617,9 @@ class PercListTests(unittest.TestCase):
"""Test PercList.""" """Test PercList."""
def setUp(self):
self.t = conftypes.PercList()
def test_minval_gt_maxval(self): def test_minval_gt_maxval(self):
"""Test __init__ with a minval bigger than the maxval.""" """Test __init__ with a minval bigger than the maxval."""
with self.assertRaises(ValueError): with self.assertRaises(ValueError):
@ -624,14 +627,12 @@ class PercListTests(unittest.TestCase):
def test_validate_good(self): def test_validate_good(self):
"""Test validate with good values.""" """Test validate with good values."""
t = conftypes.PercList() self.t.validate('23%,42%,1337%')
t.validate('23%,42%,1337%')
def test_validate_bad(self): def test_validate_bad(self):
"""Test validate with bad values.""" """Test validate with bad values."""
t = conftypes.PercList()
with self.assertRaises(conftypes.ValidationError): with self.assertRaises(conftypes.ValidationError):
t.validate('23%,42%%,1337%') self.t.validate('23%,42%%,1337%')
def test_validate_minval_toosmall(self): def test_validate_minval_toosmall(self):
"""Test validate with a minval and a too small percentage.""" """Test validate with a minval and a too small percentage."""
@ -671,9 +672,8 @@ class PercListTests(unittest.TestCase):
def test_validate_empty(self): def test_validate_empty(self):
"""Test validate with an empty value.""" """Test validate with an empty value."""
t = conftypes.PercList()
with self.assertRaises(conftypes.ValidationError): with self.assertRaises(conftypes.ValidationError):
t.validate('23%,,42%') self.t.validate('23%,,42%')
def test_validate_empty_none_ok(self): def test_validate_empty_none_ok(self):
"""Test validate with an empty value and none_ok=True.""" """Test validate with an empty value and none_ok=True."""
@ -682,13 +682,15 @@ class PercListTests(unittest.TestCase):
def test_transform_single(self): def test_transform_single(self):
"""Test transform with a single value.""" """Test transform with a single value."""
t = conftypes.PercList() self.assertEqual(self.t.transform('1337%'), [1337])
self.assertEqual(t.transform('1337%'), [1337])
def test_transform_more(self): def test_transform_more(self):
"""Test transform with multiple values.""" """Test transform with multiple values."""
t = conftypes.PercList() self.assertEqual(self.t.transform('23%,42%,1337%'), [23, 42, 1337])
self.assertEqual(t.transform('23%,42%,1337%'), [23, 42, 1337])
def test_transform_empty(self):
"""Test transform with an empty value."""
self.assertEqual(self.t.transform('23%,,42%'), [23, None, 42])
class PercOrIntTests(unittest.TestCase): class PercOrIntTests(unittest.TestCase):
@ -1326,13 +1328,8 @@ class WebKitByteTests(unittest.TestCase):
def test_validate_empty(self): def test_validate_empty(self):
"""Test validate with empty string and none_ok = False.""" """Test validate with empty string and none_ok = False."""
with self.assertRaises(conftypes.ValidationError): # Note WebKitBytes are always None-able
self.t.validate('') self.t.validate('')
def test_validate_empty_none_ok(self):
"""Test validate with empty string and none_ok = True."""
t = conftypes.WebKitBytes(none_ok=True)
t.validate('')
def test_validate_int(self): def test_validate_int(self):
"""Test validate with a normal int.""" """Test validate with a normal int."""
@ -1371,7 +1368,7 @@ class WebKitByteTests(unittest.TestCase):
"""Test validate with an int which is too big with suffix.""" """Test validate with an int which is too big with suffix."""
t = conftypes.WebKitBytes(maxsize=10) t = conftypes.WebKitBytes(maxsize=10)
with self.assertRaises(conftypes.ValidationError): with self.assertRaises(conftypes.ValidationError):
self.t.validate('1k') t.validate('1k')
def test_validate_int_invalid_suffix(self): def test_validate_int_invalid_suffix(self):
"""Test validate with an int with an invalid suffix.""" """Test validate with an int with an invalid suffix."""