more coverage

bnavigator · bnavigator · commit fae38af3578c · 2021-04-29T19:02:32.000+02:00
diff --git a/control/rlocus.py b/control/rlocus.py
@@ -137,7 +137,7 @@ def root_locus(sys, kvect=None, xlim=None, ylim=None,
     print_gain = config._get_param(
         'rlocus', 'print_gain', print_gain, _rlocus_defaults)
 
-    sys_loop = sys if sys.issiso() else sys[0,0]
+    sys_loop = sys if sys.issiso() else sys[0, 0]
 
     # Convert numerator and denominator to polynomials if they aren't
     (nump, denp) = _systopoly1d(sys_loop)
diff --git a/control/setup.py b/control/setup.py
diff --git a/control/tests/rlocus_test.py b/control/tests/rlocus_test.py
@@ -15,6 +15,7 @@
 from control.bdalg import feedback
 
 
+@pytest.mark.usefixtures("mplcleanup")
 class TestRootLocus:
     """These are tests for the feedback function in rlocus.py."""
 
@@ -32,7 +33,7 @@ class TestRootLocus:
                                                  (True, 'dtime')]
                             ])
     def sys(self, request):
-        """Return some simple LTI system for testing"""
+        """Return some simple LTI systems for testing"""
         # avoid construction during collection time: prevent unfiltered
         # deprecation warning
         sysfn, args = request.param
@@ -45,7 +46,7 @@ def check_cl_poles(self, sys, pole_list, k_list):
             np.testing.assert_array_almost_equal(poles, poles_expected)
 
     def testRootLocus(self, sys):
-        """Basic root locus plot"""
+        """Basic root locus (no plot)"""
         klist = [-1, 0, 1]
 
         roots, k_out = root_locus(sys, klist, plot=False)
@@ -57,6 +58,33 @@ def test_without_gains(self, sys):
         roots, kvect = root_locus(sys, plot=False)
         self.check_cl_poles(sys, roots, kvect)
 
+    @pytest.mark.parametrize('grid', [None, True, False])
+    def test_root_locus_plot_grid(self, sys, grid):
+        rlist, klist = root_locus(sys, grid=grid)
+        ax = plt.gca()
+        n_gridlines = sum([int(line.get_linestyle() in [':', 'dotted',
+                                                        '--', 'dashed'])
+                           for line in ax.lines])
+        if grid is False:
+            assert n_gridlines == 2
+        else:
+            assert n_gridlines > 2
+        # TODO check validity of grid
+
+    def test_root_locus_warnings(self):
+        sys = TransferFunction([1000], [1, 25, 100, 0])
+        with pytest.warns(FutureWarning, match="Plot.*deprecated"):
+            rlist, klist = root_locus(sys, Plot=True)
+        with pytest.warns(FutureWarning, match="PrintGain.*deprecated"):
+            rlist, klist = root_locus(sys, PrintGain=True)
+
+    def test_root_locus_neg_false_gain_nonproper(self):
+        """ Non proper TranferFunction with negative gain: Not implemented"""
+        with pytest.raises(ValueError, match="with equal order"):
+            root_locus(TransferFunction([-1, 2], [1, 2]))
+
+    # TODO: cover and validate negative false_gain branch in _default_gains()
+
     def test_root_locus_zoom(self):
         """Check the zooming functionality of the Root locus plot"""
         system = TransferFunction([1000], [1, 25, 100, 0])
@@ -104,4 +132,3 @@ def test_rlocus_default_wn(self):
             [-1e-2, 1-1e7j, 1+1e7j], [0, -1e7j, 1e7j], 1))
 
         ct.root_locus(sys)
-
diff --git a/setup.cfg b/setup.cfg
@@ -5,4 +5,3 @@ universal=1
 addopts = -ra
 filterwarnings =
     error:.*matrix subclass:PendingDeprecationWarning
-
