Skip to content

Commit

Permalink
share plotWidget fixture
Browse files Browse the repository at this point in the history
  • Loading branch information
t20100 committed Dec 13, 2023
1 parent c9737d8 commit be66e6a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 21 deletions.
43 changes: 43 additions & 0 deletions src/silx/gui/plot/test/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# /*##########################################################################
#
# Copyright (c) 2023 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.
#
# ###########################################################################*/
"""Test PlotWidget active item"""

__authors__ = ["T. Vincent"]
__license__ = "MIT"
__date__ = "13/12/2023"


import pytest
from silx.gui.plot import PlotWidget


@pytest.fixture
def plotWidget(qWidgetFactory, request):
try:
backend = request.param
except AttributeError:
backend = "mpl" # Backend was not defined
if backend == "gl":
request.getfixturevalue("use_opengl") # Skip test if OpenGL test disabled
yield qWidgetFactory(PlotWidget, backend=backend)
13 changes: 0 additions & 13 deletions src/silx/gui/plot/test/testPlotWidgetActiveItem.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,9 @@
import pytest

from silx.gui.utils.testutils import SignalListener

from silx.gui.plot import PlotWidget
from silx.gui.plot.items.curve import CurveStyle


@pytest.fixture
def plotWidget(qWidgetFactory, request):
try:
backend = request.param
except AttributeError:
backend = "mpl" # Backend was not defined
if backend == "gl":
request.getfixturevalue("use_opengl") # Skip test if OpenGL test disabled
yield qWidgetFactory(PlotWidget, backend=backend)


@pytest.mark.parametrize("plotWidget", ("mpl", "gl"), indirect=True)
def testActiveCurveAndLabels(plotWidget):
# Active curve handling off, no label change
Expand Down
8 changes: 0 additions & 8 deletions src/silx/gui/plot/test/testPlotWidgetDataMargins.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@
import numpy
import pytest

from silx.gui.plot import PlotWidget


@pytest.fixture
def plotWidget(qWidgetFactory):
"""Fixture providing a PlotWidget"""
yield qWidgetFactory(PlotWidget)


def testDefaultDataMargins(plotWidget):
"""Test default PlotWidget data margins: No margins"""
Expand Down

0 comments on commit be66e6a

Please sign in to comment.