Merge pull request #93 from baagaard-usgs/update-pytests

Update pytests to use load_tests. Streamline test setup.

Author: baagaard-usgs

spatialdata/Makefile.am

@@ -42,6 +42,9 @@ EXTRA_DIST = \
 	spatialdb/generator/Shaper.py \
 	spatialdb/generator/Value.py \
 	spatialdb/generator/__init__.py \
+	testing/__init__.py \
+	testing/UnitTestApp.py \
+	testing/TestCases.py \
 	units/NondimElasticDynamic.py \
 	units/NondimElasticQuasistatic.py \
 	units/Nondimensional.py \

spatialdata/spatialdb/SimpleDB.py

@@ -35,8 +35,7 @@ class SimpleDB(SpatialDBObj, ModuleSimpleDB):
     queryType.meta['tip'] = "Type of query to perform."
 
     from .SimpleIOAscii import SimpleIOAscii
-    iohandler = pythia.pyre.inventory.facility("iohandler", family="simpledb_io",
-                                        factory=SimpleIOAscii)
+    iohandler = pythia.pyre.inventory.facility("iohandler", family="simpledb_io", factory=SimpleIOAscii)
     iohandler.meta['tip'] = "I/O handler for database."
 
     # PUBLIC METHODS /////////////////////////////////////////////////////

spatialdata/spatialdb/SimpleGridDB.py

@@ -8,6 +8,8 @@
 # See https://mit-license.org/ and LICENSE.md and for license information. 
 # =================================================================================================
 
+import pathlib
+
 from .SpatialDBObj import SpatialDBObj
 from .spatialdb import SimpleGridDB as ModuleSimpleGridDB
 
@@ -18,10 +20,8 @@ def validateFilename(value):
     """
     if 0 == len(value):
         raise ValueError("Name of SimpleGridDB file must be specified.")
-    try:
-        fin = open(value, "r")
-    except IOError:
-        raise IOError("Spatial database file '{}' not found.".format(value))
+    if not pathlib.Path(value).is_file():
+        raise IOError(f"Spatial database file '{value}' not found.")
     return value
 
 

spatialdata/spatialdb/SimpleIO.py

@@ -8,11 +8,7 @@
 # See https://mit-license.org/ and LICENSE.md and for license information. 
 # =================================================================================================
 
-# @file spatialdata/spatialdb/SimpleIO.py
-#
-# @brief Python I/O manager for simple spatial database (SimpleDB).
-#
-# Factory: simpledb_io
+import pathlib
 
 from pythia.pyre.components.Component import Component
 
@@ -23,10 +19,8 @@ def validateFilename(value):
     """
     if 0 == len(value):
         raise ValueError("Filename for spatial database not specified.")
-    try:
-        fin = open(value, "r")
-    except IOError:
-        raise IOError("Spatial database file '{}' not found.".format(value))
+    if not pathlib.Path(value).is_file():
+        raise IOError(f"Spatial database file '{value}' not found.")
     return value
 
 

spatialdata/spatialdb/TimeHistory.py

@@ -8,6 +8,7 @@
 # See https://mit-license.org/ and LICENSE.md and for license information. 
 # =================================================================================================
 
+import pathlib
 
 from pythia.pyre.components.Component import Component
 from .spatialdb import TimeHistory as ModuleTimeHistory
@@ -19,10 +20,8 @@ def validateFilename(value):
     """
     if 0 == len(value):
         raise ValueError("Name of TimeHistoryDB file must be specified.")
-    try:
-        fin = open(value, "r")
-    except IOError:
-        raise IOError("Temporal database file '{}' not found.".format(value))
+    if not pathlib.Path(value).is_file():
+        raise IOError(f"Temporal database file '{value}' not found.")
     return value
 
 

spatialdata/testing/TestCases.py

@@ -0,0 +1,21 @@
+# =================================================================================================
+# This code is part of SpatialData, developed through the Computational Infrastructure
+# for Geodynamics (https://github.com/geodynamics/spatialdata).
+#
+# Copyright (c) 2010-2023, University of California, Davis and the SpatialData Development Team.
+# All rights reserved.
+#
+# See https://mit-license.org/ and LICENSE.md and for license information. 
+# =================================================================================================
+"""PyLith module for unit test helper functions."""
+
+import unittest
+
+def make_suite(test_classes, loader=unittest.defaultTestLoader):
+    suite = unittest.TestSuite()
+    for cls in test_classes:
+        suite.addTests(loader.loadTestsFromTestCase(cls))
+    return suite
+
+
+# End of file

tests/pytests/UnitTestApp.py renamed to spatialdata/testing/UnitTestApp.py

@@ -7,10 +7,12 @@
 #
 # See https://mit-license.org/ and LICENSE.md and for license information. 
 # =================================================================================================
-# @brief Python application for Python unit tests.
-#
-# We place this script in tests/pytests because we must initialize coverage
-# *before* importing any spatialdata modules.
+"""Application for running Python unit tests with code coverage.
+
+We place this script in tests/pytests so that we can import it into the individual scripts in the
+subdirectories.
+"""
+
 
 import unittest
 
@@ -19,16 +21,18 @@ class UnitTestApp():
     """
     Test application.
     """
-    cov = None
-    try:
-        import coverage
-        cov = coverage.Coverage(source=["spatialdata"])
-    except ImportError:
-        pass
-
-    # PUBLIC METHODS /////////////////////////////////////////////////////
-
-    def main(self):
+    test_modules = []
+
+    def __init__(self, test_modules, src_dirs=["spatialdata"]):
+        self.cov = None
+        self.test_modules = test_modules
+        try:
+            import coverage
+            self.cov = coverage.Coverage(source=src_dirs)
+        except ImportError:
+            pass
+
+    def run(self):
         """
         Run the application.
         """
@@ -40,10 +44,19 @@ def main(self):
         if self.cov:
             self.cov.stop()
             self.cov.save()
+            self.cov.report()
 
         if not success:
             import sys
             sys.exit(1)
 
 
+    def _suite(self):
+        loader = unittest.defaultTestLoader
+        suite = unittest.TestSuite()
+        for mod in self.test_modules:
+            suite.addTests(loader.loadTestsFromModule(mod))
+        return suite
+
+
 # End of file

spatialdata/testing/__init__.py

@@ -14,7 +14,5 @@ SUBDIRS = \
 	units \
 	utils
 
-noinst_PYTHON = UnitTestApp.py
-
 
 # End of file 

tests/pytests/Makefile.am

@@ -12,6 +12,7 @@
 
 import unittest
 
+from spatialdata.testing.TestCases import make_suite
 from spatialdata.geocoords.CSCart import CSCart
 
 
@@ -32,4 +33,13 @@ def test_accessors(self):
         self.assertEqual(2, cs.getSpaceDim())
 
 
+def load_tests(loader, tests, pattern):
+    TEST_CLASSES = [TestCSCart]
+    return make_suite(TEST_CLASSES, loader)
+
+
+if __name__ == "__main__":
+    unittest.main(verbosity=2)
+
+
 # End of file