From bfa4dba15485b4192f8bbe13345e9658c97ecf76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@debian.org>
Date: Sat, 7 Oct 2017 07:59:01 +0200
Subject: New upstream version 0.6.0+dfsg

---
 silx/image/test/__init__.py        |  2 ++
 silx/image/test/test_bilinear.py   |  4 +--
 silx/image/test/test_shapes.py     |  4 +--
 silx/image/test/test_tomography.py | 66 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 silx/image/test/test_tomography.py

(limited to 'silx/image/test')

diff --git a/silx/image/test/__init__.py b/silx/image/test/__init__.py
index e99eaa2..4c5a2e9 100644
--- a/silx/image/test/__init__.py
+++ b/silx/image/test/__init__.py
@@ -31,6 +31,7 @@ import unittest
 from . import test_bilinear
 from . import test_shapes
 from . import test_medianfilter
+from . import test_tomography
 
 
 def suite():
@@ -39,4 +40,5 @@ def suite():
     test_suite.addTest(test_bilinear.suite())
     test_suite.addTest(test_medianfilter.suite())
     test_suite.addTest(test_shapes.suite())
+    test_suite.addTest(test_tomography.suite())
     return test_suite
diff --git a/silx/image/test/test_bilinear.py b/silx/image/test/test_bilinear.py
index 1789aca..564dfad 100644
--- a/silx/image/test/test_bilinear.py
+++ b/silx/image/test/test_bilinear.py
@@ -3,7 +3,7 @@
 #    Project: silx (originally pyFAI)
 #             https://github.com/silx-kit/silx
 #
-#    Copyright (C) 2012-2016  European Synchrotron Radiation Facility, Grenoble, France
+#    Copyright (C) 2012-2017  European Synchrotron Radiation Facility, Grenoble, France
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
 # in the Software without restriction, including without limitation the rights
@@ -29,7 +29,7 @@ __date__ = "02/08/2016"
 import unittest
 import numpy
 import logging
-logger = logging.getLogger("test_bilinear")
+logger = logging.getLogger(__name__)
 from ..bilinear import BilinearImage
 
 
diff --git a/silx/image/test/test_shapes.py b/silx/image/test/test_shapes.py
index ed85165..0c5ab5e 100644
--- a/silx/image/test/test_shapes.py
+++ b/silx/image/test/test_shapes.py
@@ -27,7 +27,7 @@
 
 __authors__ = ["T. Vincent"]
 __license__ = "MIT"
-__date__ = "05/12/2016"
+__date__ = "15/05/2017"
 
 
 import logging
@@ -37,9 +37,7 @@ import numpy
 from silx.test.utils import ParametricTestCase
 from silx.image import shapes
 
-logging.basicConfig()
 _logger = logging.getLogger(__name__)
-_logger.setLevel(logging.WARNING)
 
 
 class TestPolygonFill(ParametricTestCase):
diff --git a/silx/image/test/test_tomography.py b/silx/image/test/test_tomography.py
new file mode 100644
index 0000000..2a6a33c
--- /dev/null
+++ b/silx/image/test/test_tomography.py
@@ -0,0 +1,66 @@
+# coding: utf-8
+# /*##########################################################################
+#
+# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# ############################################################################*/
+"""
+Tests that the functions of tomography are valid
+"""
+
+__authors__ = ["H. Payno"]
+__license__ = "MIT"
+__date__ = "12/09/2017"
+
+import unittest
+import numpy
+from silx.test.utils import utilstest
+from silx.image import tomography
+
+class TestTomography(unittest.TestCase):
+    """
+
+    """
+
+    def setUp(self):
+        self.sinoTrueData = numpy.load(utilstest.getfile("sino500.npz"))["data"]
+
+    def testCalcCenterCentroid(self):
+        centerTD = tomography.calc_center_centroid(self.sinoTrueData)
+        self.assertTrue(numpy.isclose(centerTD, 256, rtol=0.01))
+
+    def testCalcCenterCorr(self):
+        centerTrueData = tomography.calc_center_corr(self.sinoTrueData,
+                                                     fullrot=False,
+                                                     props=1)
+        self.assertTrue(numpy.isclose(centerTrueData, 256, rtol=0.01))
+
+
+def suite():
+    test_suite = unittest.TestSuite()
+    for testClass in (TestTomography, ):
+        test_suite.addTest(
+            unittest.defaultTestLoader.loadTestsFromTestCase(testClass))
+    return test_suite
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='suite')
-- 
cgit v1.2.3