-
Notifications
You must be signed in to change notification settings - Fork 224
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add testing.check_figures_equal to avoid storing baseline images #555
Changes from all commits
8b78614
2bb82f4
847814b
27e03ed
d2ad3f5
3e0d3fb
04b3f41
cfe3a24
1155df0
e6ad74d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
""" | ||
Helper functions for testing. | ||
""" | ||
|
||
import inspect | ||
import os | ||
|
||
from matplotlib.testing.compare import compare_images | ||
|
||
from ..exceptions import GMTImageComparisonFailure | ||
from ..figure import Figure | ||
|
||
|
||
def check_figures_equal(*, tol=0.0, result_dir="result_images"): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. One more thing about the result_dir is that, the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, which was partly why I opened up the issue at matplotlib/pytest-mpl#94, to get all of that There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, looks good to me. |
||
""" | ||
Decorator for test cases that generate and compare two figures. | ||
|
||
The decorated function must take two arguments, *fig_ref* and *fig_test*, | ||
and draw the reference and test images on them. After the function | ||
returns, the figures are saved and compared. | ||
|
||
This decorator is practically identical to matplotlib's check_figures_equal | ||
function, but adapted for PyGMT figures. See also the original code at | ||
https://matplotlib.org/3.3.1/api/testing_api.html# | ||
matplotlib.testing.decorators.check_figures_equal | ||
|
||
Parameters | ||
---------- | ||
tol : float | ||
The RMS threshold above which the test is considered failed. | ||
result_dir : str | ||
The directory where the figures will be stored. | ||
|
||
Examples | ||
-------- | ||
|
||
>>> import pytest | ||
>>> import shutil | ||
|
||
>>> @check_figures_equal(result_dir="tmp_result_images") | ||
... def test_check_figures_equal(fig_ref, fig_test): | ||
... fig_ref.basemap(projection="X5c", region=[0, 5, 0, 5], frame=True) | ||
... fig_test.basemap(projection="X5c", region=[0, 5, 0, 5], frame="af") | ||
>>> test_check_figures_equal() | ||
weiji14 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
>>> assert len(os.listdir("tmp_result_images")) == 0 | ||
>>> shutil.rmtree(path="tmp_result_images") # cleanup folder if tests pass | ||
|
||
>>> @check_figures_equal(result_dir="tmp_result_images") | ||
... def test_check_figures_unequal(fig_ref, fig_test): | ||
... fig_ref.basemap(projection="X5c", region=[0, 5, 0, 5], frame=True) | ||
... fig_test.basemap(projection="X5c", region=[0, 3, 0, 3], frame=True) | ||
>>> with pytest.raises(GMTImageComparisonFailure): | ||
... test_check_figures_unequal() | ||
>>> for suffix in ["", "-expected", "-failed-diff"]: | ||
... assert os.path.exists( | ||
... os.path.join( | ||
... "tmp_result_images", | ||
... f"test_check_figures_unequal{suffix}.png", | ||
... ) | ||
... ) | ||
>>> shutil.rmtree(path="tmp_result_images") # cleanup folder if tests pass | ||
weiji14 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
""" | ||
|
||
def decorator(func): | ||
|
||
os.makedirs(result_dir, exist_ok=True) | ||
old_sig = inspect.signature(func) | ||
|
||
def wrapper(*args, **kwargs): | ||
try: | ||
fig_ref = Figure() | ||
fig_test = Figure() | ||
func(*args, fig_ref=fig_ref, fig_test=fig_test, **kwargs) | ||
ref_image_path = os.path.join( | ||
result_dir, func.__name__ + "-expected.png" | ||
) | ||
test_image_path = os.path.join(result_dir, func.__name__ + ".png") | ||
fig_ref.savefig(ref_image_path) | ||
fig_test.savefig(test_image_path) | ||
|
||
# Code below is adapted for PyGMT, and is originally based on | ||
# matplotlib.testing.decorators._raise_on_image_difference | ||
err = compare_images( | ||
expected=ref_image_path, | ||
actual=test_image_path, | ||
tol=tol, | ||
in_decorator=True, | ||
) | ||
if err is None: # Images are the same | ||
os.remove(ref_image_path) | ||
os.remove(test_image_path) | ||
else: # Images are not the same | ||
for key in ["actual", "expected", "diff"]: | ||
err[key] = os.path.relpath(err[key]) | ||
raise GMTImageComparisonFailure( | ||
"images not close (RMS %(rms).3f):\n\t%(actual)s\n\t%(expected)s " | ||
% err | ||
) | ||
finally: | ||
del fig_ref | ||
del fig_test | ||
|
||
parameters = [ | ||
param | ||
for param in old_sig.parameters.values() | ||
if param.name not in {"fig_test", "fig_ref"} | ||
] | ||
new_sig = old_sig.replace(parameters=parameters) | ||
wrapper.__signature__ = new_sig | ||
|
||
return wrapper | ||
|
||
return decorator |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -2,12 +2,13 @@ | |||||||||||||||||||||||||||||||||||||||||||||
Test Figure.grdimage | ||||||||||||||||||||||||||||||||||||||||||||||
""" | ||||||||||||||||||||||||||||||||||||||||||||||
import numpy as np | ||||||||||||||||||||||||||||||||||||||||||||||
import xarray as xr | ||||||||||||||||||||||||||||||||||||||||||||||
import pytest | ||||||||||||||||||||||||||||||||||||||||||||||
import xarray as xr | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
from .. import Figure | ||||||||||||||||||||||||||||||||||||||||||||||
from ..exceptions import GMTInvalidInput | ||||||||||||||||||||||||||||||||||||||||||||||
from ..datasets import load_earth_relief | ||||||||||||||||||||||||||||||||||||||||||||||
from ..exceptions import GMTInvalidInput | ||||||||||||||||||||||||||||||||||||||||||||||
from ..helpers.testing import check_figures_equal | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
@pytest.fixture(scope="module", name="grid") | ||||||||||||||||||||||||||||||||||||||||||||||
|
@@ -93,3 +94,12 @@ def test_grdimage_over_dateline(xrgrid): | |||||||||||||||||||||||||||||||||||||||||||||
xrgrid.gmt.gtype = 1 # geographic coordinate system | ||||||||||||||||||||||||||||||||||||||||||||||
fig.grdimage(grid=xrgrid, region="g", projection="A0/0/1c", V="i") | ||||||||||||||||||||||||||||||||||||||||||||||
return fig | ||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||
@check_figures_equal() | ||||||||||||||||||||||||||||||||||||||||||||||
def test_grdimage_central_longitude(grid, fig_ref, fig_test): | ||||||||||||||||||||||||||||||||||||||||||||||
""" | ||||||||||||||||||||||||||||||||||||||||||||||
Test that plotting a grid centred at different longitudes/meridians work. | ||||||||||||||||||||||||||||||||||||||||||||||
""" | ||||||||||||||||||||||||||||||||||||||||||||||
fig_ref.grdimage("@earth_relief_01d_g", projection="W120/15c", cmap="geo") | ||||||||||||||||||||||||||||||||||||||||||||||
fig_test.grdimage(grid, projection="W120/15c", cmap="geo") | ||||||||||||||||||||||||||||||||||||||||||||||
Comment on lines
+99
to
+105
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
I'll update this test in #560 later 😄. Problem with using this fancy |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added some notes here to CONTRIBUTING.md, adapted from https://matplotlib.org/3.3.1/devel/testing.html#writing-an-image-comparison-test.