Reorganized tests

Author: PierreRaybaut

.gitignore

@@ -52,5 +52,4 @@ htmlcov
 
 # Other
 *.bak
-*_ui.py
-/plotpy/tests/gui/loadsavecanvas.h5
+*_ui.py

doc/dev/guiqwt_to_plotpy.rst

@@ -53,7 +53,7 @@ As a consequence :
     as stated above, you may consider using the ``'auto'`` value or the
     ``'manual'`` value.
 
-See demo script `tests/gui/test_plot_types.py`.
+See demo script `tests/features/test_plot_types.py`.
 
 Minor changes to the BasePlot class
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -136,7 +136,7 @@ Some new methods were added to class :py:class:`.PlotManager`:
 You may use those methods to simplify you code if you were previously registering
 annotation tools one by one.
 
-See demo script `tests/gui/test_annotations.py`.
+See demo script `tests/items/test_annotations.py`.
 
 New contour features
 ~~~~~~~~~~~~~~~~~~~~
@@ -145,7 +145,7 @@ plotpy integrates now a contour detection algorithm, so that plotpy based
 applications depending on matplotlib only for this function can drop this
 additional dependency.
 
-See demo script `tests/gui/test_contour.py`.
+See demo script `tests/items/test_contour.py`.
 
 MaskedXYImages
 ~~~~~~~~~~~~~~
@@ -156,7 +156,7 @@ You can now use the :py:class:`.MaskedXYImageItem` to apply masks to XYImageItem
 You can use the convenience methods :py:meth:`.PlotBuilder.maskedxyimage` to
 help you build such items.
 
-See demo script `tests/gui/test_image_masked_xy.py`.
+See demo script `tests/items/test_image_masked_xy.py`.
 
 New options added to plot builder
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -174,7 +174,7 @@ New methods for creating ready-to-use plots have been added to the class:
 The method :py:meth:`.PlotBuilder.contours` has been added, in order to create
 contour curves. It returns a list of :py:class:`plotpy.items.ContourItem` objects.
 
-See demo script `tests/gui/test_contour.py`.
+See demo script `tests/items/test_contour.py`.
 
 The new keyword parameter ``alpha_function`` has been added to the methods
 :py:meth:`.PlotBuilder.image`, :py:meth:`.PlotBuilder.xyimage`,
@@ -203,22 +203,22 @@ The new keyword parameter ``lut_range`` has been added to the methods
 and :py:meth:`.PlotBuilder.trimage`, so you can now avoid to make calls
 to set_lut_range after the PlotItem is built.
 
-See demo script `tests/gui/test_builder.py`.
+See demo script `tests/features/test_builder.py`.
 
 The method :py:meth:`.PlotBuilder.image` now accepts
 optional ``x`` and ``y`` keyword arguments, to automatically create a
 :py:class:`plotpy.items.XYImageItem` instead of a simple
 :py:class:`plotpy.items.ImageItem` if needed.
 
-See demo script `tests/gui/test_builder.py`.
+See demo script `tests/features/test_builder.py`.
 
 The method :py:meth:`.PlotBuilder.curve` now accepts
 optional ``dx``, ``dy``, ``errorbarwidth``, ``errorbarcap``, ``errorbarmode``,
 `errorbaralpha` keyword arguments, to automatically create a
 :py:class:`plotpy.items.ErrorBarCurveItem` instead of a simple
 :py:class:`plotpy.items.CurveItem` if needed.
 
-See demo script `tests/gui/test_builder.py`.
+See demo script `tests/features/test_builder.py`.
 
 Transformation (translation, rotate, resize) of ImageItem
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -231,4 +231,4 @@ Auto-scaling and shapes
 Auto-scaling takes now into account visible shapes
 (subclasses of :py:class:`.PolygonShape`).
 
-See demo script `tests/gui/test_autoscale_shapes.py`.
+See demo script `tests/features/test_autoscale_shapes.py`.

doc/dev/v1_to_v2.rst

@@ -46,7 +46,7 @@ New methods for creating ready-to-use plots have been added to the class:
 The method :py:meth:`.PlotBuilder.contours` has been added, in order to create
 contour curves. It returns a list of :py:class:`plotpy.items.ContourItem` objects.
 
-See demo script `tests/gui/test_contour.py`.
+See demo script `tests/items/test_contour.py`.
 
 The new keyword parameter ``alpha_function`` has been added to the methods
 :py:meth:`.PlotBuilder.image`, :py:meth:`.PlotBuilder.xyimage`,

doc/features/plot/examples.rst

@@ -9,7 +9,7 @@ a simple plot with a curve and a filtering tool. In this example, the plot
 manager (see :class:`.PlotManager`) is not used, at least not directly:
 the plot manager is integrated in the :class:`.PlotWidget` class.
 
-.. literalinclude:: ../../../plotpy/tests/gui/test_filtertest1.py
+.. literalinclude:: ../../../plotpy/tests/widgets/test_filtertest1.py
    :start-after: guitest:
 
 Using a plot manager
@@ -20,5 +20,5 @@ Even if this simple example does not justify the use of the :class:`.PlotManager
 applications, using the :class:`.PlotManager` allows to design highly versatile
 graphical user interfaces.
 
-.. literalinclude:: ../../../plotpy/tests/gui/test_filtertest2.py
+.. literalinclude:: ../../../plotpy/tests/widgets/test_filtertest2.py
    :start-after: guitest:

doc/features/tools/examples.rst

@@ -4,7 +4,7 @@ Example
 The following example add all the existing image tools to a :class:`.PlotWidget`
 object for testing purpose:
 
-.. literalinclude:: ../../../plotpy/tests/gui/test_image_plot_tools.py
+.. literalinclude:: ../../../plotpy/tests/tools/test_image_plot_tools.py
    :start-after: guitest:
 
 .. image:: /images/screenshots/image_plot_tools.png

doc/intro/examples.rst

@@ -8,7 +8,7 @@ The test launcher
 
 A lot of examples are available in the `plotpy.tests` test module ::
 
-    from plotpy.tests.gui import run
+    from plotpy.tests import run
     run()
 
 The two lines above execute the `test launcher`:
@@ -22,7 +22,7 @@ Curve plotting
 Basic curve plotting
 ~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_plot.py
+.. literalinclude:: ../../plotpy/tests/items/test_curve.py
    :start-after: guitest:
 
 
@@ -34,7 +34,7 @@ Basic curve plotting
 Computations on curves
 ~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_computations.py
+.. literalinclude:: ../../plotpy/tests/features/test_computations.py
    :start-after: guitest:
 
 
@@ -44,7 +44,7 @@ Computations on curves
 Curve fitting
 -------------
 
-.. literalinclude:: ../../plotpy/tests/gui/test_fit.py
+.. literalinclude:: ../../plotpy/tests/features/test_fit.py
    :start-after: guitest:
 
 
@@ -57,7 +57,7 @@ Image visualization
 Image contrast adjustment
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_contrast.py
+.. literalinclude:: ../../plotpy/tests/features/test_contrast.py
    :start-after: guitest:
 
 
@@ -66,7 +66,7 @@ Image contrast adjustment
 Image cross-sections
 ~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_cross_section.py
+.. literalinclude:: ../../plotpy/tests/tools/test_cross_section.py
    :start-after: guitest:
 
 
@@ -77,7 +77,7 @@ Transformable images
 
 Affine transforms example on 3000x3000 images (real-time transforms):
 
-.. literalinclude:: ../../plotpy/tests/gui/test_transform.py
+.. literalinclude:: ../../plotpy/tests/items/test_transform.py
    :start-after: guitest:
 
 
@@ -86,7 +86,7 @@ Affine transforms example on 3000x3000 images (real-time transforms):
 Image rectangular filter
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_imagefilter.py
+.. literalinclude:: ../../plotpy/tests/features/test_imagefilter.py
    :start-after: guitest:
 
 
@@ -99,7 +99,7 @@ Histograms
 2-D histogram
 ~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_hist2d.py
+.. literalinclude:: ../../plotpy/tests/items/test_hist2d.py
    :start-after: guitest:
 
 
@@ -112,7 +112,7 @@ Other examples
 Dot Array Demo
 ~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_dotarraydemo.py
+.. literalinclude:: ../../plotpy/tests/widgets/test_dotarraydemo.py
    :start-after: guitest:
 
 
@@ -121,7 +121,7 @@ Dot Array Demo
 Image plot tools
 ~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_image_plot_tools.py
+.. literalinclude:: ../../plotpy/tests/tools/test_image_plot_tools.py
    :start-after: guitest:
 
 
@@ -130,7 +130,7 @@ Image plot tools
 Real-time Mandelbrot plotting
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_mandelbrot.py
+.. literalinclude:: ../../plotpy/tests/items/test_mandelbrot.py
    :start-after: guitest:
 
 
@@ -139,7 +139,7 @@ Real-time Mandelbrot plotting
 Simple application
 ~~~~~~~~~~~~~~~~~~
 
-.. literalinclude:: ../../plotpy/tests/gui/test_simple_window.py
+.. literalinclude:: ../../plotpy/tests/widgets/test_simple_window.py
    :start-after: guitest:
 
 

plotpy/plot/manager.py

@@ -720,26 +720,21 @@ def register_all_annotation_tools(self) -> None:
         Register all annotation tools for the plot
         """
         self.add_separator_tool()
-
         self.add_tool(AnnotatedPointTool)
         self.add_tool(AnnotatedSegmentTool)
-
         self.add_tool(AnnotatedRectangleTool)
         self.add_tool(AnnotatedObliqueRectangleTool)
         self.add_tool(AnnotatedCircleTool)
         self.add_tool(AnnotatedEllipseTool)
-
         self.add_tool(LabelTool)
 
     def register_curve_annotation_tools(self) -> None:
         """
         Register all curve friendly annotation tools for the plot
         """
         self.add_separator_tool()
-
         self.add_tool(AnnotatedPointTool)
         self.add_tool(AnnotatedSegmentTool)
-
         self.add_tool(LabelTool)
 
     def register_image_annotation_tools(self) -> None:

plotpy/tests/__init__.py

@@ -12,6 +12,8 @@
 
 from guidata.configtools import get_module_data_path
 
+import plotpy
+
 TESTDATAPATH = get_module_data_path("plotpy", osp.join("tests", "data"))
 
 
@@ -24,7 +26,7 @@ def run() -> None:
     """Run plotpy test launcher"""
     from guidata.guitest import run_testlauncher
 
-    import plotpy
+    import plotpy.config  # load icons
 
     run_testlauncher(plotpy)