test frd freqresp deprecation

bnavigator · bnavigator · commit 3dbaacd7d9d0 · 2021-01-07T13:03:57.000+01:00
diff --git a/control/tests/frd_test.py b/control/tests/frd_test.py
@@ -416,6 +416,12 @@ def test_eval(self):
         with pytest.raises(ValueError, match="only accept purely imaginary"):
             frd_tf(2)
 
+    def test_freqresp_deprecated(self):
+        sys_tf = ct.tf([1], [1, 2, 1])
+        frd_tf = FRD(sys_tf, np.logspace(-1, 1, 3))
+        with pytest.warns(DeprecationWarning):
+            frd_tf.freqresp(1.)
+
     def test_repr_str(self):
         # repr printing
         array = np.array
diff --git a/control/tests/freqresp_test.py b/control/tests/freqresp_test.py
@@ -21,24 +21,46 @@
 pytestmark = pytest.mark.usefixtures("mplcleanup")
 
 
-def test_siso():
-    """Test SISO frequency response"""
+@pytest.fixture
+def ss_siso():
     A = np.array([[1, 1], [0, 1]])
     B = np.array([[0], [1]])
     C = np.array([[1, 0]])
     D = 0
-    sys = StateSpace(A, B, C, D)
+    return StateSpace(A, B, C, D)
+
+
+@pytest.fixture
+def ss_mimo():
+    A = np.array([[1, 1], [0, 1]])
+    B = np.array([[1, 0], [0, 1]])
+    C = np.array([[1, 0]])
+    D = np.array([[0, 0]])
+    return StateSpace(A, B, C, D)
+
+def test_freqresp_siso(ss_siso):
+    """Test SISO frequency response"""
     omega = np.linspace(10e-2, 10e2, 1000)
 
     # test frequency response
-    sys.frequency_response(omega)
+    ctrl.freqresp(ss_siso, omega)
 
-    # test bode plot
-    bode(sys)
 
-    # Convert to transfer function and test bode
-    systf = tf(sys)
-    bode(systf)
+@slycotonly
+def test_freqresp_mimo(ss_mimo):
+    """Test MIMO frequency response calls"""
+    omega = np.linspace(10e-2, 10e2, 1000)
+    ctrl.freqresp(ss_mimo, omega)
+    tf_mimo = tf(ss_mimo)
+    ctrl.freqresp(tf_mimo, omega)
+
+
+def test_bode_basic(ss_siso):
+    """Test bode plot call (Very basic)"""
+    # TODO: proper test
+    tf_siso = tf(ss_siso)
+    bode(ss_siso)
+    bode(tf_siso)
 
 
 @pytest.mark.filterwarnings("ignore:.*non-positive left xlim:UserWarning")
@@ -106,20 +128,6 @@ def test_doubleint():
     bode(sys)
 
 
-@slycotonly
-def test_mimo():
-    """Test MIMO frequency response calls"""
-    A = np.array([[1, 1], [0, 1]])
-    B = np.array([[1, 0], [0, 1]])
-    C = np.array([[1, 0]])
-    D = np.array([[0, 0]])
-    omega = np.linspace(10e-2, 10e2, 1000)
-    sysMIMO = ss(A, B, C, D)
-
-    sysMIMO.frequency_response(omega)
-    tf(sysMIMO)
-
-
 @pytest.mark.parametrize(
     "Hz, Wcp, Wcg",
     [pytest.param(False, 6.0782869, 10., id="omega"),
diff --git a/control/tests/statesp_test.py b/control/tests/statesp_test.py
@@ -378,7 +378,6 @@ def test_freq_resp(self):
 
         # Deprecated version of the call (should return warning)
         with pytest.warns(DeprecationWarning, match="will be removed"):
-            from control import freqresp
             mag, phase, omega = sys.freqresp(true_omega)
             np.testing.assert_almost_equal(mag, true_mag)
 
