Merge pull request #1276 from KrisThielemans/fix_Python_tests

Fix pSTIR python tests

src/common/Utilities.py

@@ -588,7 +588,7 @@ def is_operator_adjoint(operator, num_tests=5, max_err=10e-5, verbose=True):
     return True
 
 
-def test_data_container_algebra(test, x, eps=1e-5):
+def data_container_algebra_tests(test, x, eps=1e-5):
 
     ax = x.as_array()
     ay = numpy.ones_like(ax)

src/xSTIR/pSTIR/tests/CMakeLists.txt

@@ -19,7 +19,7 @@
 #=========================================================================
 
 add_test(NAME PET_TESTS_PYTHON
-  COMMAND ${Python_EXECUTABLE} -m pytest --cov=sirf.STIR --cov-config=.coveragerc-STIR src/xSTIR/pSTIR
+  COMMAND ${Python_EXECUTABLE} -m pytest --cov=sirf.STIR --cov-config=.coveragerc-STIR src/xSTIR/pSTIR/tests
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 #add_test(NAME PET_DEMOS_PYTHON
 #  COMMAND ${PYTHON_EXECUTABLE} run_all.py --non-interactive

src/xSTIR/pSTIR/tests/test_all.py

@@ -16,7 +16,7 @@
 from sirf.Utilities import __licence__, RE_PYEXT
 from glob import glob
 from os import path
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 __author__ = "Casper da Costa-Luis"
 
 
@@ -32,7 +32,7 @@
     failed = 0
     ntests = 0
 
-    for script in sorted(glob('*.py')):
+    for script in sorted(glob('tests_*.py')):
         if path.abspath(__file__) == path.abspath(script):
             continue
         print('\n\n--- running %s' % script)

src/xSTIR/pSTIR/tests/tests_data_container_algebra.py

@@ -15,7 +15,7 @@
 """
 from sirf.STIR import *
 from sirf.Utilities import runner, RE_PYEXT, __license__
-from sirf.Utilities import test_data_container_algebra
+from sirf.Utilities import data_container_algebra_tests
 
 __version__ = "0.2.3"
 __author__ = "Evgueni Ovtchinnikov"
@@ -33,14 +33,14 @@ def test_main(rec=False, verb=False, throw=True):
         AcquisitionData.set_storage_scheme(scheme)
         raw_data_file = existing_filepath(data_path, 'Utahscat600k_ca_seg4.hs')
         ad = AcquisitionData(raw_data_file)
-        test_data_container_algebra(test, ad)
+        data_container_algebra_tests(test, ad)
 
         image_size = (31, 111, 111)
         voxel_size = (3.375, 3, 3)
         image = ImageData()
         image.initialise(image_size, voxel_size)
         image.fill(1.0)
-        test_data_container_algebra(test, image)
+        data_container_algebra_tests(test, image)
 
     return test.failed, test.ntest
 

src/xSTIR/pSTIR/tests/tests_qp_lc_rdp.py

@@ -20,7 +20,7 @@
 __author__ = "Imraj Singh, Evgueni Ovtchinnikov, Kris Thielemans"
 
 
-def test_Hessian(test, prior, x, eps=1e-3):
+def Hessian_test(test, prior, x, eps=1e-3):
     """Checks that grad(x + dx) - grad(x) is close to H(x)*dx
         """
     if x.norm() > 0:
@@ -84,7 +84,7 @@ def test_main(rec=False, verb=False, throw=True):
 
             if isinstance(prior, sirf.STIR.RelativeDifferencePrior):
                 prior.set_epsilon(im.max()*.01)
-            test_Hessian(test, prior, im, 0.03)
+            Hessian_test(test, prior, im, 0.03)
 
     return test.failed, test.ntest
 

src/xSTIR/pSTIR/tests/tests_two.py

@@ -36,7 +36,7 @@ def test_main(rec=False, verb=False, throw=True):
         test.check(acq_data.norm())
 
         image = acq_data.create_uniform_image(1.0)
-        test.check(image.norm())
+        test.check_if_equal_within_tolerance(image.norm(), numpy.sqrt(numpy.prod(image.dimensions())))
 
         acq_model = AcquisitionModelUsingRayTracingMatrix()
         acq_model.set_up(acq_data, image)

src/xSTIR/pSTIR/tests/tests_two.txt

@@ -1,6 +1,4 @@
 4.932500e+04
-7.182416e+02
 2.256327e+02
 4.932500e+04
-7.182416e+02
 2.256327e+02