Skip to content

Commit

Permalink
review actions
Browse files Browse the repository at this point in the history
  • Loading branch information
@bjlittle
bjlittle committed Mar 22, 2024
1 parent aa4fc56 commit 04062cd
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions lib/iris/tests/unit/common/metadata/test_CellMeasureMetadata.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ def test_op_lenient_same(self, mocker):
expected = self.values

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_lenient_same_none(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -296,8 +296,8 @@ def test_op_lenient_same_none(self, mocker):
expected = self.values

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_lenient_same_measure_none(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -307,8 +307,8 @@ def test_op_lenient_same_measure_none(self, mocker):
expected = right.copy()

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_lenient_different(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -319,8 +319,8 @@ def test_op_lenient_different(self, mocker):
expected["units"] = None

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_lenient_different_measure(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -331,17 +331,17 @@ def test_op_lenient_different_measure(self, mocker):
expected["measure"] = None

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_strict_same(self, mocker):
lmetadata = self.cls(**self.values)
rmetadata = self.cls(**self.values)
expected = self.values.copy()

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_strict_different(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -352,8 +352,8 @@ def test_op_strict_different(self, mocker):
expected["long_name"] = None

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_strict_different_measure(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -364,8 +364,8 @@ def test_op_strict_different_measure(self, mocker):
expected["measure"] = None

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_strict_different_none(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -376,8 +376,8 @@ def test_op_strict_different_none(self, mocker):
expected["long_name"] = None

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected

def test_op_strict_different_measure_none(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -388,8 +388,8 @@ def test_op_strict_different_measure_none(self, mocker):
expected["measure"] = None

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert expected == lmetadata.combine(rmetadata)._asdict()
assert expected == rmetadata.combine(lmetadata)._asdict()
assert lmetadata.combine(rmetadata)._asdict() == expected
assert rmetadata.combine(lmetadata)._asdict() == expected


class Test_difference:
Expand All @@ -408,7 +408,7 @@ def _setup(self, mocker):
self.none = self.cls(*(None,) * len(self.cls._fields))

def test_wraps_docstring(self):
assert self.cls.difference.__doc__ = BaseMetadata.difference.__doc__
assert self.cls.difference.__doc__ == BaseMetadata.difference.__doc__

def test_lenient_service(self):
qualname_difference = _qualname(self.cls.difference)
Expand Down Expand Up @@ -474,8 +474,8 @@ def test_op_lenient_same_measure_none(self, mocker):
rexpected["measure"] = (None, mocker.sentinel.measure)

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert lexpected == lmetadata.difference(rmetadata)._asdict()
assert rexpected == rmetadata.difference(lmetadata)._asdict()
assert lmetadata.difference(rmetadata)._asdict() == lexpected
assert rmetadata.difference(lmetadata)._asdict() == rexpected

def test_op_lenient_different(self, mocker):
left = self.values.copy()
Expand All @@ -489,8 +489,8 @@ def test_op_lenient_different(self, mocker):
rexpected["units"] = lexpected["units"][::-1]

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert lexpected == lmetadata.difference(rmetadata)._asdict()
assert rexpected == rmetadata.difference(lmetadata)._asdict()
assert lmetadata.difference(rmetadata)._asdict() == lexpected
assert rmetadata.difference(lmetadata)._asdict() == rexpected

def test_op_lenient_different_measure(self, mocker):
left = self.values.copy()
Expand All @@ -504,8 +504,8 @@ def test_op_lenient_different_measure(self, mocker):
rexpected["measure"] = lexpected["measure"][::-1]

mocker.patch("iris.common.metadata._LENIENT", return_value=True)
assert lexpected == lmetadata.difference(rmetadata)._asdict()
assert rexpected == rmetadata.difference(lmetadata)._asdict()
assert lmetadata.difference(rmetadata)._asdict() == lexpected
assert rmetadata.difference(lmetadata)._asdict() == rexpected

def test_op_strict_same(self, mocker):
lmetadata = self.cls(**self.values)
Expand All @@ -527,8 +527,8 @@ def test_op_strict_different(self, mocker):
rexpected["long_name"] = lexpected["long_name"][::-1]

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert lexpected == lmetadata.difference(rmetadata)._asdict()
assert rexpected == rmetadata.difference(lmetadata)._asdict()
assert lmetadata.difference(rmetadata)._asdict() == lexpected
assert rmetadata.difference(lmetadata)._asdict() == rexpected

def test_op_strict_different_measure(self, mocker):
left = self.values.copy()
Expand All @@ -542,8 +542,8 @@ def test_op_strict_different_measure(self, mocker):
rexpected["measure"] = lexpected["measure"][::-1]

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert lexpected == lmetadata.difference(rmetadata)._asdict()
assert rexpected == rmetadata.difference(lmetadata)._asdict()
assert lmetadata.difference(rmetadata)._asdict() == lexpected
assert rmetadata.difference(lmetadata)._asdict() == rexpected

def test_op_strict_different_none(self, mocker):
left = self.values.copy()
Expand All @@ -557,8 +557,8 @@ def test_op_strict_different_none(self, mocker):
rexpected["long_name"] = lexpected["long_name"][::-1]

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert lexpected == lmetadata.difference(rmetadata)._asdict()
assert rexpected == rmetadata.difference(lmetadata)._asdict()
assert lmetadata.difference(rmetadata)._asdict() == lexpected
assert rmetadata.difference(lmetadata)._asdict() == rexpected

def test_op_strict_different_measure_none(self, mocker):
left = self.values.copy()
Expand All @@ -572,8 +572,8 @@ def test_op_strict_different_measure_none(self, mocker):
rexpected["measure"] = lexpected["measure"][::-1]

mocker.patch("iris.common.metadata._LENIENT", return_value=False)
assert lexpected == lmetadata.difference(rmetadata)._asdict()
assert rexpected == rmetadata.difference(lmetadata)._asdict()
assert lmetadata.difference(rmetadata)._asdict() == lexpected
assert rmetadata.difference(lmetadata)._asdict() == rexpected


class Test_equal:
Expand Down

0 comments on commit 04062cd

Please sign in to comment.