From 54e72e3533cb94d489cf074349b908f42b399add Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Thu, 26 Oct 2023 23:20:06 +0800 Subject: [PATCH] Combine two tests into a single one --- pygmt/tests/test_figure.py | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/pygmt/tests/test_figure.py b/pygmt/tests/test_figure.py index 7ba776a12e1..65226a690ed 100644 --- a/pygmt/tests/test_figure.py +++ b/pygmt/tests/test_figure.py @@ -292,31 +292,25 @@ def mock_psconvert(*args, **kwargs): # pylint: disable=unused-argument } -@pytest.mark.parametrize("fmt", [".bmp", ".jpg", ".pdf", ".png", ".tif"]) def test_figure_savefig_worldfile(fmt): """ - Check if a world file is created when requested. + Check if a world file is created when supported and raise an error when not + supported. """ fig = Figure() fig.basemap(region=[0, 1, 0, 1], projection="X1c/1c", frame=True) - with GMTTempFile(prefix="pygmt-worldfile", suffix=fmt) as imgfile: - fig.savefig(fname=imgfile.name, worldfile=True) - assert Path(imgfile.name).stat().st_size > 0 - worldfile_suffix = "." + fmt[1] + fmt[3] + "w" - assert Path(imgfile.name).with_suffix(worldfile_suffix).stat().st_size > 0 - - -@pytest.mark.parametrize("fmt", [".tiff", ".kml"]) -def test_figure_savefig_worldfile_unsupported_format(fmt): - """ - Figure.savefig should raise an error when a world file is requested for an - unsupported format. - """ - fig = Figure() - fig.basemap(region=[0, 1, 0, 1], projection="X1c/1c", frame=True) - with GMTTempFile(prefix="pygmt-worldfile", suffix=fmt) as imgfile: - with pytest.raises(GMTInvalidInput): + # supported formats + for fmt in [".bmp", ".jpg", ".png", ".tif"]: + with GMTTempFile(prefix="pygmt-worldfile", suffix=fmt) as imgfile: fig.savefig(fname=imgfile.name, worldfile=True) + assert Path(imgfile.name).stat().st_size > 0 + worldfile_suffix = "." + fmt[1] + fmt[3] + "w" + assert Path(imgfile.name).with_suffix(worldfile_suffix).stat().st_size > 0 + # unsupported formats + for fmt in [".eps", ".kml", ".pdf", ".tiff"]: + with GMTTempFile(prefix="pygmt-worldfile", suffix=fmt) as imgfile: + with pytest.raises(GMTInvalidInput): + fig.savefig(fname=imgfile.name, worldfile=True) @pytest.mark.skipif(IPython is None, reason="run when IPython is installed")