small updates to increase code coverage

murrayrm · murrayrm · commit e2f971b2aec0 · 2024-08-08T14:54:49.000-07:00
diff --git a/control/ctrlplot.py b/control/ctrlplot.py
@@ -277,11 +277,9 @@ def pole_zero_subplots(
     from .grid import nogrid, sgrid, zgrid
     from .iosys import isctime
 
-    if rcParams is None:
-        rcParams = _ctrlplot_rcParams
-
     if fig is None:
         fig = plt.gcf()
+    rcParams = config._get_param('ctrlplot', 'rcParams', rcParams)
 
     if not isinstance(grid, list):
         grid = [grid] * nrows * ncols
@@ -525,8 +523,6 @@ def _update_plot_title(
     if fig is None:
         fig = plt.gcf()
     rcParams = config._get_param('ctrlplot', 'rcParams', kwargs, pop=True)
-    if rcParams is None:
-        rcParams = _ctrlplot_rcParams
 
     if use_existing:
         # Get the current title, if it exists
diff --git a/control/tests/ctrlplot_test.py b/control/tests/ctrlplot_test.py
@@ -771,6 +771,10 @@ def test_deprecation_warnings():
         axs = ct.get_plot_axes(cplt.lines)
         assert np.all(axs == cplt.axes)
 
+    with pytest.warns(FutureWarning, match="deprecated"):
+        ct.suptitle("updated title")
+        assert cplt.figure._suptitle.get_text() == "updated title"
+
 
 def test_ControlPlot_init():
     sys = ct.rss(2, 2, 2)
@@ -782,6 +786,7 @@ def test_ControlPlot_init():
     assert np.all(cplt_raw.axes == cplt.axes)
     assert cplt_raw.figure == cplt.figure
 
+
 def test_pole_zero_subplots(savefig=False):
     ax_array = ct.pole_zero_subplots(2, 1, grid=[True, False])
     sys1 = ct.tf([1, 2], [1, 2, 3], name='sys1')
@@ -793,6 +798,16 @@ def test_pole_zero_subplots(savefig=False):
     if savefig:
         plt.savefig("ctrlplot-pole_zero_subplots.png")
 
+    # Single type of of grid for all axes
+    ax_array = ct.pole_zero_subplots(2, 2, grid='empty')
+    assert ax_array[0, 0].xaxis.get_label().get_text() == ''
+
+    # Discrete system grid
+    ax_array = ct.pole_zero_subplots(2, 2, grid=True, dt=1)
+    assert ax_array[0, 0].xaxis.get_label().get_text() == 'Real'
+    assert ax_array[0, 0].get_lines()[0].get_color() == 'grey'
+
+
 if __name__ == "__main__":
     #
     # Interactive mode: generate plots for manual viewing
