TST : added tests for some validation functions

tacaswell · tacaswell · commit 1c2bc58e2319 · 2014-10-01T10:31:24.000-04:00
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -9,17 +9,24 @@
 
 import matplotlib as mpl
 from matplotlib.tests import assert_str_equal
-from nose.tools import assert_true, assert_raises
+from nose.tools import assert_true, assert_raises, assert_equal
 import nose
+from itertools import chain
+import numpy as np
+from matplotlib.rcsetup import (validate_bool_maybe_none,
+                                validate_stringlist,
+                                validate_bool,
+                                validate_nseq_int,
+                                validate_nseq_float)
 
 
 mpl.rc('text', usetex=False)
 mpl.rc('lines', linewidth=22)
 
 fname = os.path.join(os.path.dirname(__file__), 'test_rcparams.rc')
 
-def test_rcparams():
 
+def test_rcparams():
     usetex = mpl.rcParams['text.usetex']
     linewidth = mpl.rcParams['lines.linewidth']
 
@@ -55,7 +62,6 @@ def test_RcParams_class():
                        'font.weight': 'normal',
                        'font.size': 12})
 
-
     if six.PY3:
         expected_repr = """
 RcParams({'font.cursive': ['Apple Chancery',
@@ -96,6 +102,7 @@ def test_RcParams_class():
     assert ['font.cursive', 'font.size'] == sorted(rc.find_all('i[vz]').keys())
     assert ['font.family'] == list(six.iterkeys(rc.find_all('family')))
 
+
 def test_Bug_2543():
     # Test that it possible to add all values to itself / deepcopy
     # This was not possible because validate_bool_maybe_none did not
@@ -116,7 +123,6 @@ def test_Bug_2543():
         with mpl.rc_context():
             from copy import deepcopy
             _deep_copy = deepcopy(mpl.rcParams)
-        from matplotlib.rcsetup import validate_bool_maybe_none, validate_bool
         # real test is that this does not raise
         assert_true(validate_bool_maybe_none(None) is None)
         assert_true(validate_bool_maybe_none("none") is None)
@@ -126,6 +132,7 @@ def test_Bug_2543():
             mpl.rcParams['svg.embed_char_paths'] = False
             assert_true(mpl.rcParams['svg.fonttype'] == "none")
 
+
 def test_Bug_2543_newer_python():
     # only split from above because of the usage of assert_raises
     # as a context manager, which only works in 2.7 and above
@@ -141,5 +148,64 @@ def test_Bug_2543_newer_python():
             mpl.rcParams['svg.fonttype'] = True
 
 if __name__ == '__main__':
-    import nose
     nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
+
+
+def _validation_test_helper(validator, arg, target):
+    res = validator(arg)
+    assert_equal(res, target)
+
+
+def _validation_fail_helper(validator, arg, exception_type):
+    with assert_raises(exception_type):
+        validator(arg)
+
+
+def test_validators():
+    validation_tests = (
+        {'validator': validate_bool,
+         'success': chain(((_, True) for _ in
+                           ('t', 'y', 'yes', 'on', 'true', '1', 1, True)),
+                           ((_, False) for _ in
+                            ('f', 'n', 'no', 'off', 'false', '0', 0, False))),
+        'fail': ((_, ValueError)
+                 for _ in ('aardvark', 2, -1, [], ))},
+        {'validator': validate_stringlist,
+         'success': (('', []),
+                     ('a,b', ['a', 'b']),
+                     ('aardvark', ['aardvark']),
+                     ('aardvark, ', ['aardvark']),
+                     ('aardvark, ,', ['aardvark']),
+                     (['a', 'b'], ['a', 'b']),
+                     (('a', 'b'), ['a', 'b']),
+                     ((1, 2), ['1', '2'])),
+            'fail': ((dict(), AssertionError),
+                     (1, AssertionError),)
+            },
+        {'validator': validate_nseq_int(2),
+         'success': ((_, [1, 2])
+                     for _ in ('1, 2', [1.5, 2.5], [1, 2],
+                               (1, 2), np.array((1, 2)))),
+         'fail': ((_, ValueError)
+                  for _ in ('aardvark', ('a', 1),
+                            (1, 2, 3)
+                            ))
+        },
+        {'validator': validate_nseq_float(2),
+         'success': ((_, [1.5, 2.5])
+                     for _ in ('1.5, 2.5', [1.5, 2.5], [1.5, 2.5],
+                               (1.5, 2.5), np.array((1.5, 2.5)))),
+         'fail': ((_, ValueError)
+                  for _ in ('aardvark', ('a', 1),
+                            (1, 2, 3)
+                            ))
+        }
+
+    )
+
+    for validator_dict in validation_tests:
+        validator = validator_dict['validator']
+        for arg, target in validator_dict['success']:
+            yield _validation_test_helper, validator, arg, target
+        for arg, error_type in validator_dict['fail']:
+            yield _validation_fail_helper, validator, arg, error_type
