Use Python unit tests in the ctools.test() function.

This avoids code duplication and makes use to the standard unit tests within the installation.

Use Python unit tests in the ctools.test() function.
This avoids code duplication and makes use to the standard unit tests within the installation.
Jürgen Knödlseder
1 parent d89b2921
Showing 4 changed files with 95 additions and 31 deletions
pyext/Makefile.am
pyext/ctools/__init__.py
pyext/ctools/tools.i
test/test_python.py
@@ -30,13 +30,36 @@
 if WITH_PYTHON
  
 # Test scripts to be distributed in $(pythondir)/ctools/tests
-testscripts = ctools/tests/__init__.py \
-              ctools/tests/unbinned.py
+testscripts = $(abs_top_srcdir)/test/test_python.py \
+              $(abs_top_srcdir)/test/test_ctobssim.py \
+              $(abs_top_srcdir)/test/test_ctselect.py \
+              $(abs_top_srcdir)/test/test_ctbin.py \
+              $(abs_top_srcdir)/test/test_ctlike.py \
+              $(abs_top_srcdir)/test/test_cttsmap.py \
+              $(abs_top_srcdir)/test/test_ctmodel.py \
+              $(abs_top_srcdir)/test/test_ctskymap.py \
+              $(abs_top_srcdir)/test/test_ctexpcube.py \
+              $(abs_top_srcdir)/test/test_ctpsfcube.py \
+              $(abs_top_srcdir)/test/test_ctbkgcube.py \
+              $(abs_top_srcdir)/test/test_ctcubemask.py \
+              $(abs_top_srcdir)/test/test_ctbutterfly.py \
+              $(abs_top_srcdir)/test/test_ctulimit.py \
+              $(abs_top_srcdir)/test/test_cterror.py \
+              $(abs_top_srcdir)/test/test_pipelines.py
+testdata    = $(abs_top_srcdir)/test/data/crab.xml \
+              $(abs_top_srcdir)/test/data/crab_events.fits.gz \
+              $(abs_top_srcdir)/test/data/crab_cntmap.fits.gz \
+              $(abs_top_srcdir)/test/data/exclusion.reg
+testirf     = $(abs_top_srcdir)/test/irf/cta_dummy_irf.dat
  
 # Distribute scripts
-EXTRA_DIST       = $(testscripts)
+EXTRA_DIST       = $(testscripts) $(testdata) $(testirf)
 testscriptsdir   = $(pythondir)/ctools/tests
 testscripts_DATA = $(testscripts)
+testdatadir      = $(pythondir)/ctools/tests/data
+testdata_DATA    = $(testdata)
+testirfdir       = $(pythondir)/ctools/tests/irf
+testirf_DATA     = $(testirf)
  
 # Set SWIG interface filename
 SWIG_INTERFACE = ctools/tools.i
+# ==========================================================================
+# ctools Python module
+#
+# Copyright (C) 2015 Juergen Knoedlseder
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ==========================================================================
 # import gammalib first
 import gammalib
  
@@ -15,23 +34,3 @@ del tools
 del gammalib
 del bad_entries
 del entry
-
-# Add test function
-def test(verbosity=2):
-    """
-    Run ctools tests.
-    """
-    # Imports
-    import unittest
-    from .tests.unbinned import pipelines
-
-    # Create a test suite
-    test_suite = unittest.TestSuite()
-
-    # Test cases must be listed manually here ...
-    # We currently don't use unittest for test collection
-    test_suite.addTest(unittest.makeSuite(pipelines))
-
-    # Create a test runner and run the test
-    test_runner = unittest.TextTestRunner(verbosity=verbosity)
-    test_runner.run(test_suite)
@@ -60,3 +60,10 @@
 %include "ctbutterfly.i"
 %include "ctulimit.i"
 %include "cterror.i"
+
+/* __ Test function ______________________________________________________ */
+%pythoncode %{
+def test():
+    from ctools.tests import test_python
+    test_python.test(installed=True)
+%}
 \ No newline at end of file
@@ -39,10 +39,10 @@ import test_cterror
 import test_pipelines
  
  
-# ======================== #
-# Main routine entry point #
-# ======================== #
-if __name__ == '__main__':
+# ================== #
+# Perform unit tests #
+# ================== #
+def test(installed=False):
     """
     Perform unit testing for Python interface.
     """
@@ -100,20 +100,41 @@ if __name__ == &#39;__main__&#39;:
     suites.append(suite_cterror)
     suites.append(suite_pipelines)
  
+    # If we have an installed version then create a temporary
+    # directory and copy over all information that is needed
+    if installed:
+
+        # Create temporary working directory
+        import tempfile
+        path = tempfile.mkdtemp()
+        os.chdir(path)
+
+        # Get test directory
+        import inspect
+        testdir = inspect.getfile(ctools.tests)
+        head, tail = os.path.split(testdir)
+
+        # Copy over test data and irf
+        os.system("cp -r %s %s" % (head+"/data", "data"))
+        os.system("cp -r %s %s" % (head+"/irf",  "irf"))
+
     # Set PFILES environment variable
     try:
         os.mkdir("pfiles")
     except:
         pass
-    os.system("cp -r ../src/*/*.par pfiles/")
     os.environ['PFILES'] = "pfiles"
  
+    # If we have a non-installed version then copy over pfiles
+    if not installed:
+        os.system("cp -r ../src/*/*.par pfiles/")
+
     # Run test suite
     success = suites.run()
  
-
-    # Save test results
-    suites.save("reports/ctools.xml")
+    # If we have a non-installed version then save test results
+    if not installed:
+        suites.save("reports/ctools.xml")
  
     # Set return code
     if success:
@@ -121,5 +142,19 @@ if __name__ == &#39;__main__&#39;:
     else:
         rc = 1
  
+    # Return
+    return rc
+
+
+# ======================== #
+# Main routine entry point #
+# ======================== #
+if __name__ == '__main__':
+    """
+    Perform unit testing for Python interface.
+    """
+    # Run tests
+    rc = test()
+
     # Exit with return code
     sys.exit(rc)