gunittest: makefiles and import as a standard grass package (so far no reason for different import)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@61226 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/g.list/testsuite/test_g_list.py

@@ -1,5 +1,5 @@
 
-import gunittest
+import grass.gunittest
 from grass.script import read_command
 
 LIST_RASTERS = """----------------------------------------------
@@ -126,7 +126,7 @@ lsat7_2000_80      LANDSAT-TM7 Band 8 Panchromatic (PAN) (0.52-0.90um (15m)
 """
 
 
-class GListTest(gunittest.TestCase):
+class GListTest(grass.gunittest.TestCase):
 
     def test_list_rasters(self):
         """Test human readable list of rasters.
@@ -180,4 +180,4 @@ class GListTest(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

general/g.mlist/testsuite/test_g_mlist.py

@@ -1,10 +1,10 @@
 """g.mlist tests"""
 
-import gunittest
-from gunittest.gmodules import SimpleModule
+import grass.gunittest
+from grass.gunittest.gmodules import SimpleModule
 
 
-class GMlistWrongParamertersTest(gunittest.TestCase):
+class GMlistWrongParamertersTest(grass.gunittest.TestCase):
     """Test wrong input of parameters for g.mlist module"""
 
     @classmethod
@@ -52,4 +52,4 @@ class GMlistWrongParamertersTest(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

general/g.mremove/testsuite/test_g_mremove.py

@@ -3,9 +3,9 @@
 # TODO: rmapcalc probably fatals, replace or add raise on error?
 from grass.script.raster import mapcalc as rmapcalc
 
-import gunittest
-from gunittest.gutils import get_curret_mapset
-from gunittest.gmodules import SimpleModule
+import grass.gunittest
+from grass.gunittest.gutils import get_current_mapset
+from grass.gunittest.gmodules import SimpleModule
 
 # when used user1 must be replaced by current mapset
 REMOVE_RASTERS = """rast/test_map_0@user1
@@ -35,7 +35,7 @@ Removing raster <test_two>
 """
 
 
-class GMRemoveTest(gunittest.TestCase):
+class GMRemoveTest(grass.gunittest.TestCase):
     """Test removing with g.mremove"""
 
     @classmethod
@@ -60,7 +60,7 @@ class GMRemoveTest(gunittest.TestCase):
         self.assertModule(module)
         self.assertMultiLineEqual(module.outputs.stdout,
                                   REMOVE_RASTERS.replace('user1',
-                                                         get_curret_mapset()))
+                                                         get_current_mapset()))
 
         module = SimpleModule('g.mremove', type='rast',
                               pattern='test_map_*,*two', flags='f')
@@ -82,7 +82,7 @@ class GMRemoveTest(gunittest.TestCase):
                                   'rast/test_apples@user1\n'
                                   'rast/test_apples_big@user1\n'
                                   'rast/test_oranges@user1\n'.replace(
-                                      'user1', get_curret_mapset()))
+                                      'user1', get_current_mapset()))
         module = SimpleModule('g.mremove', type='rast',
                               pattern='test_{apples,oranges}{_small,_big,*}',
                               flags='f')
@@ -92,7 +92,7 @@ class GMRemoveTest(gunittest.TestCase):
                                  msg="4 maps should be removed")
 
 
-class GMRemoveWrongInputTest(gunittest.TestCase):
+class GMRemoveWrongInputTest(grass.gunittest.TestCase):
     """Test wrong input of parameters for g.mlist module"""
 
     def test_re_flags(self):
@@ -106,4 +106,4 @@ class GMRemoveWrongInputTest(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

lib/python/Makefile

@@ -5,7 +5,7 @@ include $(MODULE_TOPDIR)/include/Make/Python.make
 
 PYDIR = $(ETC)/python/grass
 
-SUBDIRS = exceptions script ctypes temporal pygrass pydispatch imaging
+SUBDIRS = exceptions script ctypes temporal pygrass pydispatch imaging gunittest
 
 default: $(PYDIR)/__init__.py
 	$(MAKE) subdirs

lib/python/gunittest/Makefile

@@ -0,0 +1,27 @@
+MODULE_TOPDIR = ../../..
+
+include $(MODULE_TOPDIR)/include/Make/Other.make
+include $(MODULE_TOPDIR)/include/Make/Python.make
+
+PYDIR = $(ETC)/python
+GDIR = $(PYDIR)/grass
+DSTDIR = $(GDIR)/gunittest
+
+MODULES = case gmodules loader runner checkers gutils invoker main reporters utils
+
+PYFILES := $(patsubst %,$(DSTDIR)/%.py,$(MODULES) __init__)
+PYCFILES := $(patsubst %,$(DSTDIR)/%.pyc,$(MODULES) __init__)
+
+default: $(PYFILES) $(PYCFILES) $(GDIR)/__init__.py $(GDIR)/__init__.pyc
+
+$(PYDIR):
+	$(MKDIR) $@
+
+$(GDIR): | $(PYDIR)
+	$(MKDIR) $@
+
+$(DSTDIR): | $(GDIR)
+	$(MKDIR) $@
+
+$(DSTDIR)/%: % | $(DSTDIR)
+	$(INSTALL_DATA) $< $@

lib/python/gunittest/testsuite/test_assertions.py

@@ -10,11 +10,11 @@ import os
 import grass.script.core as gcore
 from grass.pygrass.modules import Module
 
-import gunittest
-from gunittest.gmodules import SimpleModule
+import grass.gunittest
+from grass.gunittest.gmodules import SimpleModule
 
 
-class TestTextAssertions(gunittest.TestCase):
+class TestTextAssertions(grass.gunittest.TestCase):
     # pylint: disable=R0904
     def test_assertLooksLike(self):
         self.assertLooksLike("Generated map is <elevation>",
@@ -84,7 +84,7 @@ mean=240.437
 """
 
 
-class TestAssertCommandKeyValue(gunittest.TestCase):
+class TestAssertCommandKeyValue(grass.gunittest.TestCase):
     """Test usage of `.assertCommandKeyValue` method."""
     # pylint: disable=R0904
 
@@ -125,7 +125,7 @@ class TestAssertCommandKeyValue(gunittest.TestCase):
                                    precision=0.01, sep='=')
 
 
-class TestRasterMapAssertations(gunittest.TestCase):
+class TestRasterMapAssertations(grass.gunittest.TestCase):
     # pylint: disable=R0904
 
     @classmethod
@@ -196,7 +196,7 @@ class TestRasterMapAssertations(gunittest.TestCase):
                           msg="The difference of different maps should have huge mean")
 
 
-class TestVectorMapAssertations(gunittest.TestCase):
+class TestVectorMapAssertations(grass.gunittest.TestCase):
     # pylint: disable=R0904
     def test_assertVectorFitsUnivar(self):
         self.assertVectorFitsUnivar(map='bridges', column='WIDTH',
@@ -213,7 +213,7 @@ class TestVectorMapAssertations(gunittest.TestCase):
                           reference=RANDOM_KEYVALUES)
 
 
-class TestFileAssertations(gunittest.TestCase):
+class TestFileAssertations(grass.gunittest.TestCase):
     # pylint: disable=R0904
 
     @classmethod
@@ -277,4 +277,4 @@ class TestFileAssertations(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

lib/python/gunittest/testsuite/test_checkers.py

@@ -16,13 +16,12 @@ for details.
 
 from grass.script.core import parse_key_val
 
-import gunittest
-from gunittest.checkers import (values_equal, text_to_keyvalue,
-                                keyvalue_equals,
-                                proj_info_equals, proj_units_equals)
+import grass.gunittest
+from grass.gunittest.checkers import (values_equal, text_to_keyvalue,
+    keyvalue_equals, proj_info_equals, proj_units_equals)
 
 
-class TestValuesEqual(gunittest.TestCase):
+class TestValuesEqual(grass.gunittest.TestCase):
 
     def test_floats(self):
         self.assertTrue(values_equal(5.0, 5.0))
@@ -115,7 +114,7 @@ meters: 1
 # what about keys and lower/upper case letters
 
 
-class TestTextToKeyValue(gunittest.TestCase):
+class TestTextToKeyValue(grass.gunittest.TestCase):
     def test_conversion(self):
         keyvals = text_to_keyvalue(KEYVAL_TEXT, sep=':', val_sep=',')
         expected = {'s': 'Hello',
@@ -217,14 +216,14 @@ R_UNIVAR_KEYVAL_INT_DICT = {'n': 2025000,
                             'null_cells': 57995100, 'cells': 60020100}
 
 
-class TestComapreProjections(gunittest.TestCase):
+class TestComapreProjections(grass.gunittest.TestCase):
 
     def test_compare_proj_info(self):
         self.assertTrue(proj_info_equals(PROJ_INFO_TEXT_1, PROJ_INFO_TEXT_2))
         self.assertTrue(proj_units_equals(PROJ_UNITS_TEXT_1, PROJ_UNITS_TEXT_2))
 
 
-class TestParseKeyvalue(gunittest.TestCase):
+class TestParseKeyvalue(grass.gunittest.TestCase):
 
     def test_shell_script_style(self):
 
@@ -276,7 +275,7 @@ max=156.329864501953
 """
 
 
-class TestRasterMapComparisons(gunittest.TestCase):
+class TestRasterMapComparisons(grass.gunittest.TestCase):
 
     def test_compare_univars(self):
         self.assertTrue(keyvalue_equals(text_to_keyvalue(R_UNIVAR_ELEVATION,
@@ -311,4 +310,4 @@ class TestRasterMapComparisons(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

lib/python/gunittest/testsuite/test_doctests.py

@@ -5,8 +5,8 @@ Tests checkers
 
 import doctest
 
-import gunittest
-import gunittest.utils
+import grass.gunittest
+import grass.gunittest.utils
 
 
 # doctest does not allow changing the base classes of test case, skip test case
@@ -15,10 +15,10 @@ import gunittest.utils
 # the alternative is to copy 500 from doctest and change what is needed
 # (this might be necessary anyway beacuse of the reports and stdout and stderr)
 doctest.DocFileCase = type('DocFileCase',
-                           (gunittest.TestCase,),
+                           (grass.gunittest.TestCase,),
                            dict(doctest.DocFileCase.__dict__))
 doctest.SkipDocTestCase = type('SkipDocTestCase',
-                               (gunittest.TestCase,),
+                               (grass.gunittest.TestCase,),
                                dict(doctest.SkipDocTestCase.__dict__))
 
 
@@ -26,12 +26,12 @@ def load_tests(loader, tests, ignore):
     # TODO: this must be somewhere when doctest is called, not here
     # TODO: ultimate solution is not to use _ as a buildin in lib/python
     # for now it is the only place where it works
-    gunittest.utils.do_doctest_gettext_workaround()
+    grass.gunittest.utils.do_doctest_gettext_workaround()
     # this should be called at some top level
-    tests.addTests(doctest.DocTestSuite(gunittest.gmodules))
-    tests.addTests(doctest.DocTestSuite(gunittest.checkers))
+    tests.addTests(doctest.DocTestSuite(grass.gunittest.gmodules))
+    tests.addTests(doctest.DocTestSuite(grass.gunittest.checkers))
     return tests
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

lib/python/gunittest/testsuite/test_gmodules.py

@@ -2,8 +2,8 @@
 
 import subprocess
 
-import gunittest
-from gunittest.gmodules import (call_module, CalledModuleError)
+import grass.gunittest
+from grass.gunittest.gmodules import (call_module, CalledModuleError)
 
 G_REGION_OUTPUT = """n=...
 s=...
@@ -17,7 +17,7 @@ cells=...
 """
 
 
-class TestCallModuleFunction(gunittest.TestCase):
+class TestCallModuleFunction(grass.gunittest.TestCase):
 
     def test_output(self):
         output = call_module('g.region', flags='pg')
@@ -89,4 +89,4 @@ class TestCallModuleFunction(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

lib/python/gunittest/testsuite/test_module_assertions.py

@@ -5,11 +5,11 @@ import subprocess
 
 from grass.pygrass.modules import Module
 
-import gunittest
-from gunittest.gmodules import CalledModuleError
+import grass.gunittest
+from grass.gunittest.gmodules import CalledModuleError
 
 
-class TestModuleAssertions(gunittest.TestCase):
+class TestModuleAssertions(grass.gunittest.TestCase):
     # pylint: disable=R0904
 
     def setUp(self):
@@ -38,4 +38,4 @@ class TestModuleAssertions(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

lib/python/temporal/testsuite/unittests_register.py

@@ -11,11 +11,11 @@ for details.
 
 import grass.script as grass
 import grass.temporal as tgis
-import gunittest
+import grass.gunittest
 import datetime
 
 
-class TestRegisterFunctions(gunittest.TestCase):
+class TestRegisterFunctions(grass.gunittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
@@ -300,4 +300,4 @@ class TestRegisterFunctions(gunittest.TestCase):
         self.assertEqual(unit, "seconds")
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

raster/r.gwflow/testsuite/validation_7x7_grid.py

@@ -8,7 +8,7 @@ year = "1995"
 @author Soeren Gebbert
 """
 import grass.script as grass
-from gunittest.case import TestCase
+from grass.gunittest.case import TestCase
 
 class Validation7x7Grid(TestCase):
 
@@ -84,7 +84,7 @@ class Validation7x7Grid(TestCase):
 
 
 if __name__ == '__main__':
-    from gunittest.main import test
+    from grass.gunittest.main import test
     test()
 
 

raster/r.gwflow/testsuite/validation_excavation.py

@@ -9,7 +9,7 @@ year = "1995"
 """
 
 import grass.script as grass
-from gunittest.case import TestCase
+from grass.gunittest.case import TestCase
 
 class ValidationExcavation(TestCase):
 
@@ -82,7 +82,7 @@ class ValidationExcavation(TestCase):
         self.assertRasterFitsInfo(raster="gwresult",  reference=info_string,  precision=3)
 
 if __name__ == '__main__':
-    from gunittest.main import test
+    from grass.gunittest.main import test
     test()
 
 

raster/r.slope.aspect/testsuite/test_r_slope_aspect.py

@@ -1,5 +1,5 @@
-import gunittest
-from gunittest.gmodules import call_module
+import grass.gunittest
+from grass.gunittest.gmodules import call_module
 
 SMALL_MAP = """\
 north:   15
@@ -16,7 +16,7 @@ cols:    5
 100.0 150.0 150.0 100.0 100.0
 """
 
-class TestSlopeAspect(gunittest.TestCase):
+class TestSlopeAspect(grass.gunittest.TestCase):
 
     def test_limits(self):
         slope = 'limits_slope'
@@ -39,7 +39,7 @@ class TestSlopeAspect(gunittest.TestCase):
                                 msg="Aspect in degrees must be between 0 and 360")
 
 
-class TestSlopeAspectAgainstReference(gunittest.TestCase):
+class TestSlopeAspectAgainstReference(grass.gunittest.TestCase):
     """
 
     Data created using::
@@ -102,7 +102,7 @@ class TestSlopeAspectAgainstReference(gunittest.TestCase):
                                        precision=self.precision)
 
 
-class TestSlopeAspectAgainstItself(gunittest.TestCase):
+class TestSlopeAspectAgainstItself(grass.gunittest.TestCase):
 
     precision = 0.0000001
 
@@ -136,7 +136,7 @@ class TestSlopeAspectAgainstItself(gunittest.TestCase):
 
 
 # TODO: implement this class
-class TestExtremes(gunittest.TestCase):
+class TestExtremes(grass.gunittest.TestCase):
 
     def setUp(self):
         self.use_temp_region()
@@ -160,4 +160,4 @@ class TestExtremes(gunittest.TestCase):
 
 
 if __name__ == '__main__':
-    gunittest.test()
+    grass.gunittest.test()

temporal/t.rast.extract/testsuite/test_extract.py

@@ -11,7 +11,7 @@ for details.
 import grass.script as grass
 import grass.pygrass.modules as pymod
 import subprocess
-from gunittest.case import TestCase
+from grass.gunittest.case import TestCase
 
 class TestRasterExtraction(TestCase):
 
@@ -151,5 +151,5 @@ class TestRasterExtraction(TestCase):
                                                         reference=tinfo_string,  precision=2,  sep="=")
 
 if __name__ == '__main__':
-    from gunittest.main import test
+    from grass.gunittest.main import test
     test()