TST: improve coverage

jklymak · jklymak · commit b9c659696ac6 · 2021-12-24T16:25:57.000+01:00
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -2503,8 +2503,7 @@ def set_tight_layout(self, tight):
             tight = mpl.rcParams['figure.autolayout']
         _tight_parameters = tight if isinstance(tight, dict) else {}
         if bool(tight):
-            self.set_layout_engine(TightLayoutEngine(self,
-                                                     **_tight_parameters))
+            self.set_layout_engine(TightLayoutEngine(**_tight_parameters))
         self.stale = True
 
     def get_constrained_layout(self):
@@ -2537,8 +2536,7 @@ def set_constrained_layout(self, constrained):
         _constrained = bool(constrained)
         _parameters = constrained if isinstance(constrained, dict) else {}
         if _constrained:
-            self.set_layout_engine(ConstrainedLayoutEngine(self,
-                                                           **_parameters))
+            self.set_layout_engine(ConstrainedLayoutEngine(**_parameters))
         self.stale = True
 
     @_api.deprecated(
diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py
@@ -1,3 +1,4 @@
+from matplotlib._api.deprecation import MatplotlibDeprecationWarning
 import numpy as np
 import pytest
 
@@ -567,3 +568,20 @@ def test_gridspec_addressing():
     gs = fig.add_gridspec(3, 3)
     sp = fig.add_subplot(gs[0:, 1:])
     fig.draw_without_rendering()
+
+
+def test_discouraged_api():
+    fig, ax = plt.subplots(constrained_layout=True)
+    fig.draw_without_rendering()
+
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match="was deprecated in Matplotlib 3.6"):
+        fig, ax = plt.subplots()
+        fig.set_constrained_layout(True)
+        fig.draw_without_rendering()
+
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match="was deprecated in Matplotlib 3.6"):
+        fig, ax = plt.subplots()
+        fig.set_constrained_layout({'w_pad': 0.02, 'h_pad': 0.02})
+        fig.draw_without_rendering()
diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py
@@ -1,4 +1,5 @@
 import warnings
+from matplotlib._api.deprecation import MatplotlibDeprecationWarning
 
 import numpy as np
 from numpy.testing import assert_array_equal
@@ -367,3 +368,11 @@ def test_clipped_to_axes():
         m.set_clip_path(rect.get_path(), rect.get_transform())
         assert not h._fully_clipped_to_axes()
         assert not m._fully_clipped_to_axes()
+
+
+def test_tight_pads():
+    fig, ax = plt.subplots()
+    with pytest.warns(MatplotlibDeprecationWarning,
+                      match='was deprecated in Matplotlib 3.6'):
+        fig.set_tight_layout({'pad': 0.15})
+    fig.draw_without_rendering()
