TST: improve the tests

jklymak · jklymak · commit 55ef3ef16cc3 · 2022-06-24T13:13:54.000+02:00
diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py
@@ -214,20 +214,35 @@ def test_subplot_factory_reapplication():
     assert maxes.subplot_class_factory(maxes.Subplot) is maxes.Subplot
 
 
+@pytest.mark.parametrize("width_ratios", [None, [1, 3, 2]])
+@pytest.mark.parametrize("height_ratios", [None, [1, 2]])
 @check_figures_equal(extensions=['png'])
-def test_width_and_height_ratios(fig_test, fig_ref):
-    fig_test.subplots(2, 3, height_ratios=[1, 2],
-                      width_ratios=[1, 3, 2])
+def test_width_and_height_ratios(fig_test, fig_ref,
+                                 height_ratios, width_ratios):
+    fig_test.subplots(2, 3, height_ratios=height_ratios,
+                      width_ratios=width_ratios)
     fig_ref.subplots(2, 3, gridspec_kw={
-                     'height_ratios': [1, 2],
-                     'width_ratios': [1, 3, 2]})
+                     'height_ratios': height_ratios,
+                     'width_ratios': width_ratios})
 
 
+@pytest.mark.parametrize("width_ratios", [None, [1, 3, 2]])
+@pytest.mark.parametrize("height_ratios", [None, [1, 2]])
 @check_figures_equal(extensions=['png'])
-def test_width_and_height_ratios_mosaic(fig_test, fig_ref):
+def test_width_and_height_ratios_mosaic(fig_test, fig_ref,
+                                        height_ratios, width_ratios):
     mosaic_spec = [['A', 'B', 'B'], ['A', 'C', 'D']]
-    fig_test.subplot_mosaic(mosaic_spec, height_ratios=[1, 2],
-                            width_ratios=[1, 3, 2])
+    fig_test.subplot_mosaic(mosaic_spec, height_ratios=height_ratios,
+                            width_ratios=width_ratios)
     fig_ref.subplot_mosaic(mosaic_spec, gridspec_kw={
-                           'height_ratios': [1, 2],
-                           'width_ratios': [1, 3, 2]})
+                           'height_ratios': height_ratios,
+                           'width_ratios': width_ratios})
+
+
+def test_ratio_overlapping_kws():
+    with pytest.raises(ValueError, match='height_ratios'):
+        plt.subplots(2, 3, height_ratios=[1, 2],
+                           gridspec_kw={'height_ratios':[1,2]})
+    with pytest.raises(ValueError, match='width_ratios'):
+        plt.subplots(2, 3, width_ratios=[1, 2, 3],
+                           gridspec_kw={'width_ratios':[1, 2, 3]})
