Added validator tests to test_rcparams and renamed validator function in rcsetup.py

MKhadra · MKhadra · commit 1c67ded20cc0 · 2020-03-11T13:22:43.000-04:00
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -792,7 +792,7 @@ def validate_hatch(s):
 validate_dashlist = _listify_validator(validate_nseq_float(allow_none=True))
 
 
-def validate_minor_tick_ndivs(n):
+def validate_int_or_auto(n):
     """
     Validate the given ndiv parameter for minor ticks.
     ndiv can be either the string 'auto' or a non-negative integer.
@@ -1352,7 +1352,7 @@ def _convert_validator_spec(key, conv):
     'xtick.minor.bottom':    [True, validate_bool],    # draw x axis bottom minor ticks
     'xtick.major.top':   [True, validate_bool],  # draw x axis top major ticks
     'xtick.major.bottom':    [True, validate_bool],    # draw x axis bottom major ticks
-    'xtick.minor.ndivs': ['auto', validate_minor_tick_ndivs],  # default number of minor ticks to display between each pair of major ticks
+    'xtick.minor.ndivs': ['auto', validate_int_or_auto],  # default number of minor ticks to display between each pair of major ticks
 
     # fontsize of the xtick labels
     'xtick.labelsize':   ['medium', validate_fontsize],
@@ -1376,7 +1376,7 @@ def _convert_validator_spec(key, conv):
     'ytick.minor.right':    [True, validate_bool],    # draw y axis right minor ticks
     'ytick.major.left':   [True, validate_bool],  # draw y axis left major ticks
     'ytick.major.right':    [True, validate_bool],    # draw y axis right major ticks
-    'ytick.minor.ndivs': ['auto', validate_minor_tick_ndivs],  # default number of minor ticks to display between each pair of major ticks
+    'ytick.minor.ndivs': ['auto', validate_int_or_auto],  # default number of minor ticks to display between each pair of major ticks
 
     # fontsize of the ytick labels
     'ytick.labelsize':   ['medium', validate_fontsize],
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -26,7 +26,8 @@
                                 validate_hatch,
                                 validate_hist_bins,
                                 validate_markevery,
-                                _validate_linestyle)
+                                _validate_linestyle,
+                                validate_int_or_auto)
 
 
 def test_rcparams(tmpdir):
@@ -387,6 +388,16 @@ def generate_validator_testcases(valid):
                   (([1, 2], 1), ValueError),  # inverted offset/onoff
                   )
          },
+        {'validator': validate_int_or_auto,
+         'success': ((3, 3),
+                     (100, 100),
+                     (0, 0),
+                     ('auto', 'auto')
+                    ),
+         'fail': (('random string', ValueError),  # not a valid string
+                  (-100, RuntimeError)  # not a valid int
+                 )
+         },
     )
 
     for validator_dict in validation_tests:
