Migrate unit tests from cdl to sigima_ (to be continued)

Author: PierreRaybaut

cdl/tests/features/common/stat_app_test.py

@@ -14,7 +14,7 @@
 # guitest: show
 
 from cdl.tests import cdltest_app_context, take_plotwidget_screenshot
-from cdl.tests.features.common.stat_unit_test import (
+from cdl.tests.sigima_tests.common.stat_unit_test import (
     create_reference_image,
     create_reference_signal,
 )

…l/tests/features/common/io1_unit_test.py …sts/sigima_tests/common/io1_unit_test.pycdl/tests/features/common/io1_unit_test.py renamed to cdl/tests/sigima_tests/common/io1_unit_test.py cdl/tests/features/common/io1_unit_test.py renamed to cdl/tests/sigima_tests/common/io1_unit_test.py

@@ -3,23 +3,19 @@
 """
 I/O test
 
-Testing DataLab specific formats.
+Testing `sigima_` specific formats.
 """
 
-# guitest: show
-
 from __future__ import annotations
 
 import numpy as np
 from guidata.qthelpers import qt_app_context
 
-from cdl.adapters_plotpy.factories import create_adapter_from_object
-from cdl.env import execenv
+from sigima_.env import execenv
 from sigima_.io import read_images, read_signals
 from sigima_.io.image import funcs as image_funcs
 from sigima_.obj import ImageObj, SignalObj
-from sigima_.tests.helpers import try_open_test_data
-from sigima_.tests.vistools import view_curve_items, view_images
+from sigima_.tests import helpers, vistools
 
 
 def __read_objs(fname: str) -> list[ImageObj] | list[SignalObj]:
@@ -34,50 +30,50 @@ def __read_objs(fname: str) -> list[ImageObj] | list[SignalObj]:
     return objs
 
 
-@try_open_test_data("Testing TXT file reader", "*.txt")
+@helpers.try_open_test_data("Testing TXT file reader", "*.txt")
 def open_txt(fname: str | None = None) -> None:
     """Testing TXT files"""
     objs = __read_objs(fname)
     for obj in objs:
         execenv.print(obj)
-    view_curve_items([create_adapter_from_object(obj).make_item() for obj in objs])
+    vistools.view_curves_and_images(objs)
 
 
-@try_open_test_data("Testing CSV file reader", "*.csv")
+@helpers.try_open_test_data("Testing CSV file reader", "*.csv")
 def open_csv(fname: str | None = None) -> None:
     """Testing CSV files"""
     objs = __read_objs(fname)
     for obj in objs:
         execenv.print(obj)
-    view_curve_items([create_adapter_from_object(obj).make_item() for obj in objs])
+    vistools.view_curves_and_images(objs)
 
 
-@try_open_test_data("Testing MAT-File reader", "*.mat")
+@helpers.try_open_test_data("Testing MAT-File reader", "*.mat")
 def open_mat(fname: str | None = None) -> None:
     """Testing MAT files"""
     objs = __read_objs(fname)
     for obj in objs:
         execenv.print(obj)
     if isinstance(objs[0], SignalObj):
-        view_curve_items([create_adapter_from_object(obj).make_item() for obj in objs])
+        vistools.view_curves(objs)
     else:
-        view_images([obj.data for obj in objs])
+        vistools.view_images(objs)
 
 
-@try_open_test_data("Testing SIF file handler", "*.sif")
+@helpers.try_open_test_data("Testing SIF file handler", "*.sif")
 def open_sif(fname: str | None = None) -> None:
     """Testing SIF files"""
     execenv.print(image_funcs.SIFFile(fname))
     datalist = image_funcs.imread_sif(fname)
-    view_images(datalist)
+    vistools.view_images(datalist)
 
 
-@try_open_test_data("Testing SCOR-DATA file handler", "*.scor-data")
+@helpers.try_open_test_data("Testing SCOR-DATA file handler", "*.scor-data")
 def open_scordata(fname: str | None = None) -> None:
     """Testing SCOR-DATA files"""
     execenv.print(image_funcs.SCORFile(fname))
     data = image_funcs.imread_scor(fname)
-    view_images(data)
+    vistools.view_images(data)
 
 
 def test_io1() -> None:

…/tests/features/common/stat_unit_test.py …ts/sigima_tests/common/stat_unit_test.pycdl/tests/features/common/stat_unit_test.py renamed to cdl/tests/sigima_tests/common/stat_unit_test.py cdl/tests/features/common/stat_unit_test.py renamed to cdl/tests/sigima_tests/common/stat_unit_test.py

@@ -18,8 +18,8 @@
 
 import sigima_.computation.image as sigima_image
 import sigima_.param
-from cdl.env import execenv
 from sigima_.algorithms.image import BINNING_OPERATIONS, binning
+from sigima_.env import execenv
 from sigima_.tests.data import get_test_image
 from sigima_.tests.vistools import view_image_items
 

…sts/features/images/binning_unit_test.py …sigima_tests/images/binning_unit_test.pycdl/tests/features/images/binning_unit_test.py renamed to cdl/tests/sigima_tests/images/binning_unit_test.py cdl/tests/features/images/binning_unit_test.py renamed to cdl/tests/sigima_tests/images/binning_unit_test.py

@@ -20,19 +20,14 @@
 import numpy as np
 import pytest
 import scipy.ndimage as spi
-from guidata.qthelpers import qt_app_context
 from numpy import ma
-from plotpy.builder import make
 
 import sigima_.algorithms.image as alg
 import sigima_.computation.image as sigima_image
 import sigima_.obj
-from cdl.config import _
-from cdl.env import execenv
-from sigima_.tests.data import (
-    create_noisygauss_image,
-    get_laser_spot_data,
-)
+from sigima_.config import _
+from sigima_.env import execenv
+from sigima_.tests.data import create_noisygauss_image, get_laser_spot_data
 from sigima_.tests.helpers import check_scalar_result
 from sigima_.tests.vistools import view_image_items
 
@@ -57,17 +52,11 @@ def get_centroid_with_cv2(data):
     return row, col
 
 
-def add_xcursor(items, x, y, title):
-    """Added X cursor to plot"""
-    label = "  " + f"{_('Centroid')}[{title}] (x=%s, y=%s)"
-    execenv.print(label % (x, y))
-    cursor = make.xcursor(x, y, label=label)
-    cursor.setTitle(title)
-    items.append(cursor)
-
-
-def compare_centroid_funcs(data):
+def __compare_centroid_funcs(data):
     """Compare centroid methods"""
+    # pylint: disable=import-outside-toplevel
+    from plotpy.builder import make
+
     items = []
     items += [make.image(data, interpolation="nearest", eliminate_outliers=2.0)]
     # Computing centroid coordinates
@@ -79,22 +68,30 @@ def compare_centroid_funcs(data):
     ):
         try:
             t0 = time.time()
-            row, col = func(data)
+            y, x = func(data)
             dt = time.time() - t0
-            add_xcursor(items, col, row, name)
+            label = "  " + f"{_('Centroid')}[{name}] (x=%s, y=%s)"
+            execenv.print(label % (x, y))
+            cursor = make.xcursor(x, y, label=label)
+            cursor.setTitle(name)
+            items.append(cursor)
             execenv.print(f"    Calculation time: {int(dt * 1e3):d} ms")
         except ImportError:
             execenv.print(f"    Unable to compute {name}: missing module")
     view_image_items(items)
 
 
-def test_centroid_graphically():
+@pytest.mark.gui
+def test_image_centroid_interactive():
     """Centroid test comparing different methods and showing results"""
+    # pylint: disable=import-outside-toplevel
+    from guidata.qthelpers import qt_app_context
+
     with qt_app_context():
         for data in get_laser_spot_data():
             execenv.print(f"Data[dtype={data.dtype},shape={data.shape}]")
             # Testing with masked arrays
-            compare_centroid_funcs(data.view(ma.MaskedArray))
+            __compare_centroid_funcs(data.view(ma.MaskedArray))
 
 
 def __check_centroid(image, expected_x, expected_y):
@@ -121,5 +118,5 @@ def test_image_centroid():
 
 
 if __name__ == "__main__":
-    test_centroid_graphically()
+    test_image_centroid_interactive()
     test_image_centroid()