Browse Source

testing: use gunittest instead of Python unittest (now key-value summary can be collected)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@61396 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 10 years ago
parent
commit
3416af9f6b

+ 3 - 3
lib/python/pygrass/modules/interface/testsuite/test_modules.py

@@ -4,7 +4,7 @@ Created on Tue Jun 24 09:43:53 2014
 
 @author: pietro
 """
-import unittest
+from grass.gunittest import TestCase, test
 
 from grass.script.core import get_commands
 from grass.pygrass.modules.interface import Module
@@ -28,9 +28,9 @@ class TestModulesMeta(type):
         return type.__new__(mcs, name, bases, dict)
 
 
-class TestModules(unittest.TestCase):
+class TestModules(TestCase):
     __metaclass__ = TestModulesMeta
 
 
 if __name__ == '__main__':
-    unittest.main()
+    test()

+ 4 - 4
lib/python/pygrass/modules/interface/testsuite/test_parameter.py

@@ -5,7 +5,7 @@ Created on Fri Jul  4 16:32:54 2014
 @author: pietro
 """
 from __future__ import print_function
-import unittest
+from grass.gunittest import TestCase, test
 
 from grass.pygrass.modules.interface.parameter import Parameter, _check_value
 
@@ -18,7 +18,7 @@ GETTYPE = {
     'all': lambda x: x,
 }
 
-class TestCheckValueFunction(unittest.TestCase):
+class TestCheckValueFunction(TestCase):
 
     def test_single_all(self):
         param = Parameter(diz=dict(name='int_number', required='yes',
@@ -272,7 +272,7 @@ class TestCheckValueFunction(unittest.TestCase):
             _check_value(param, "elevation")
 
 
-class TestParameterGetBASH(unittest.TestCase):
+class TestParameterGetBash(TestCase):
     def test_single_float_double(self):
         for ptype in ('float', 'double'):
             param = Parameter(diz=dict(name='number', required='yes',
@@ -342,4 +342,4 @@ class TestParameterGetBASH(unittest.TestCase):
             _check_value(param, 1)
 
 if __name__ == '__main__':
-    unittest.main()
+    test()

+ 5 - 3
lib/python/pygrass/vector/testsuite/test_geometry.py

@@ -8,12 +8,14 @@ import sys
 import unittest
 import numpy as np
 
+from grass.gunittest import TestCase, test
+
 import grass.lib.vector as libvect
 
 from grass.pygrass.vector.geometry import Point, Line
 
 
-class PointTestCase(unittest.TestCase):
+class PointTestCase(TestCase):
 
     def test_empty_init(self):
         """Test Point()"""
@@ -83,7 +85,7 @@ class PointTestCase(unittest.TestCase):
         pass
 
 
-class LineTestCase(unittest.TestCase):
+class LineTestCase(TestCase):
 
     def test_len(self):
         """Test __len__ magic method"""
@@ -127,4 +129,4 @@ class LineTestCase(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    test()

+ 6 - 7
lib/python/pygrass/vector/testsuite/test_table.py

@@ -5,15 +5,14 @@ Created on Wed Jun 25 11:08:22 2014
 @author: pietro
 """
 import os
-import unittest
 import sqlite3
 import tempfile as tmp
 from string import ascii_letters, digits
 from random import choice
-
-
 import numpy as np
 
+from grass.gunittest import TestCase, test
+
 from grass.pygrass.vector.table import Table, get_path
 
 
@@ -147,7 +146,7 @@ class DBconnection(object):
         self.cols = None
 
 
-class ColumnsTestCase(DBconnection, unittest.TestCase):
+class ColumnsTestCase(DBconnection, TestCase):
 
     def test_check_insert_update_str(self):
         """Check insert_str and update_str attribute of Columns are correct"""
@@ -157,7 +156,7 @@ class ColumnsTestCase(DBconnection, unittest.TestCase):
         self.assertEqual(self.cols.update_str, update % self.tname)
 
 
-class TableInsertTestCase(DBconnection, unittest.TestCase):
+class TableInsertTestCase(DBconnection, TestCase):
 
     def setUp(self):
         """Create a not empty table instance"""
@@ -192,7 +191,7 @@ class TableInsertTestCase(DBconnection, unittest.TestCase):
         self.assertListEqual(vals, cur.fetchall())
 
 
-class TableUpdateTestCase(DBconnection, unittest.TestCase):
+class TableUpdateTestCase(DBconnection, TestCase):
 
     def test_update(self):
         """Test Table.update method"""
@@ -206,4 +205,4 @@ class TableUpdateTestCase(DBconnection, unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    test()

+ 4 - 3
lib/python/pygrass/vector/testsuite/test_vector3d.py

@@ -4,9 +4,10 @@ Created on Wed Jun 18 17:21:42 2014
 
 @author: pietro
 """
-import unittest
 import numpy as np
 
+from grass.gunittest import TestCase, test
+
 from grass.script.core import run_command
 
 from grass.pygrass.vector import VectorTopo
@@ -26,7 +27,7 @@ def generate_coordinates(number, bbox=None, with_z=False):
     return x, y
 
 
-class VectorTopo3DTestCase(unittest.TestCase):
+class VectorTopo3DTestCase(TestCase):
 
     npoints = 10
     tmpname = "tmp_vect3d"
@@ -64,4 +65,4 @@ class VectorTopo3DTestCase(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    test()

+ 4 - 6
lib/python/temporal/testsuite/unittests_temporal_raster3d_algebra.py

@@ -11,11 +11,11 @@ for details.
 
 import grass.script
 import grass.temporal as tgis
-import unittest
+import grass.gunittest as gunittest
 import datetime
-import os
 
-class TestRegisterFunctions(unittest.TestCase):
+
+class TestRegisterFunctions(gunittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
@@ -79,6 +79,4 @@ class TestRegisterFunctions(unittest.TestCase):
         grass.script.del_temp_region()
 
 if __name__ == '__main__':
-    unittest.main()
-
-
+    gunittest.test()

+ 5 - 6
lib/python/temporal/testsuite/unittests_temporal_raster_algebra.py

@@ -11,11 +11,11 @@ for details.
 
 import grass.script
 import grass.temporal as tgis
-import unittest
+import grass.gunittest as gunittest
 import datetime
-import os
 
-class TestRegisterFunctions(unittest.TestCase):
+
+class TestRegisterFunctions(gunittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
@@ -368,7 +368,6 @@ class TestRegisterFunctions(unittest.TestCase):
         ret = grass.script.run_command("t.remove", flags="rf", input="A,B,C", quiet=True)
         grass.script.del_temp_region()
 
-if __name__ == '__main__':
-    unittest.main()
-
 
+if __name__ == '__main__':
+    gunittest.test()