Skip to content

Replace testing helper function #4878

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lbdreyer merged 2 commits into from
Jul 27, 2022
Merged

Replace testing helper function #4878

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8280eac
replace unmasked_data_as_1d_array
rcomer Jul 26, 2022
c8547b5
whatsnew
rcomer Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions lib/iris/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,31 +588,18 @@ def assertNoWarningsRegexp(self, expected_regexp=""):
self.assertFalse(matches, msg)

def _assertMaskedArray(self, assertion, a, b, strict, **kwargs):
# Define helper function to extract unmasked values as a 1d
# array.
def unmasked_data_as_1d_array(array):
array = ma.asarray(array)
if array.ndim == 0:
if array.mask:
data = np.array([])
else:
data = np.array([array.data])
else:
data = array.data[~ma.getmaskarray(array)]
return data

# Compare masks. This will also check that the array shapes
# match, which is not tested when comparing unmasked values if
# strict is False.
Comment thread
lbdreyer marked this conversation as resolved.
# Compare masks.
a_mask, b_mask = ma.getmaskarray(a), ma.getmaskarray(b)
np.testing.assert_array_equal(a_mask, b_mask)

if strict:
# Compare all data values.
assertion(a.data, b.data, **kwargs)
else:
# Compare only unmasked data values.
assertion(
unmasked_data_as_1d_array(a),
unmasked_data_as_1d_array(b),
ma.compressed(a),
ma.compressed(b),
**kwargs,
)

Expand Down