reorganized testing into src/test.py

Kevin Chen · Kevin Chen · commit 93166653d74d · 2011-02-08T22:18:42.000Z
I changed a bunch of things, basically enabling one to do
import control
control.tests()

I'm a little unsure on the whole setup of the directories, so if it doesn't work then
I'll fix it. -brandt

bbelson@rainier.princeton.edu
diff --git a/src/TestBDAlg.py b/src/TestBDAlg.py
@@ -159,6 +159,8 @@ def testTFTF(self):
             [[[1., 4., 11., 16., 13.]]])
         np.testing.assert_array_almost_equal(ans2.num, [[[1., 4., 7., 6.]]])
         np.testing.assert_array_almost_equal(ans2.den, [[[1., 4., 9., 8., 5.]]])
+def suite():
+    return unittest.TestLoader().loadTestsFromTestCase(TestFeedback)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/TestConvert.py b/src/TestConvert.py
@@ -60,5 +60,8 @@ def testConvert(self):
                     sys4 = matlab.tf(sys3)
                     self.printSys(sys4, 4)
 
+def suite():
+   return unittest.TestLoader().loadTestsFromTestCase(TestConvert)
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/TestFreqRsp.py b/src/TestFreqRsp.py
@@ -1,8 +1,13 @@
 #!/usr/bin/env python
 
+### MUST BE CONVERTED TO A UNIT TEST!!!
+
+
 # Script to test frequency response and frequency response plots like bode, nyquist and gang of 4.
 # Especially need to ensure that nothing SISO is broken and that MIMO at least handles exceptions and has some default to SISO in place.
 
+
+import unittest
 from statesp import StateSpace
 from matlab import ss, tf, bode
 import numpy as np
@@ -49,4 +54,7 @@
 #plt.semilogx(omega,20*np.log10(np.squeeze(frq[0])))
 
 #plt.figure(4)
-#bode(sysMIMO,omega)
+#bode(sysMIMO,omega)
+
+def suite():
+   return unittest.TestLoader().loadTestsFromTestCase(TestConvert)
diff --git a/src/TestMatlab.py b/src/TestMatlab.py
@@ -40,5 +40,8 @@ def testImpulse(self):
 #        np.testing.assert_array_almost_equal(yout, youttrue,decimal=4)
 
 
+def suite():
+   return unittest.TestLoader().loadTestsFromTestCase(TestMatlab)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/src/TestSlycot.py b/src/TestSlycot.py
@@ -1,3 +1,8 @@
+#!/usr/bin/env python
+
+#### THIS MUST BE MADE INTO A UNITTEST TO BE PART OF THE TESTING FUNCTIONS!!!!
+
+
 import numpy as np
 from slycot import tb04ad, td04ad
 import matlab
@@ -28,3 +33,10 @@
                     print "sys4"
                     print sys4
 
+#These are here for once the above is made into a unittest.
+def suite():
+   return unittest.TestLoader().loadTestsFromTestCase(TestSlycot)
+
+if __name__=='__main__':
+	unittest.main()
+
diff --git a/src/TestStateSp.py b/src/TestStateSp.py
@@ -199,6 +199,11 @@ def testPole(self):
                     p = sys.pole()
                     for z in p:
                         self.assertTrue(abs(z) < 1)
-                        
+                
+
+def suite():
+   return unittest.TestLoader().loadTestsFromTestCase(TestStateSpace)
+
+        
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/TestXferFcn.py b/src/TestXferFcn.py
@@ -430,5 +430,8 @@ def testConvertToTransferFunction(self):
                 np.testing.assert_array_almost_equal(tfsys.num[i][j], num[i][j])
                 np.testing.assert_array_almost_equal(tfsys.den[i][j], den[i][j])
 
+def suite():
+    return unittest.TestLoader().loadTestsFromTestCase(TestXferFcn)
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/__init__.py b/src/__init__.py
@@ -62,3 +62,5 @@
 from bdalg import *
 from statefbk import *
 from delay import *
+
+from test import *
