Skip to content

Commit

Permalink
Simplified test_Mesh log checking.
Browse files Browse the repository at this point in the history
  • Loading branch information
trexfeathers committed Apr 27, 2021
1 parent bfbed13 commit 3cf6662
Showing 1 changed file with 13 additions and 32 deletions.
45 changes: 13 additions & 32 deletions lib/iris/tests/unit/experimental/ugrid/test_Mesh.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ def setUpClass(cls):
[[0, 1], [1, 2], [2, 0]], cf_role="boundary_node_connectivity"
)

def check_log(self, log, expected_levelname, log_regex):
rec = log.records[-1]
self.assertEqual(expected_levelname, rec.levelname)
self.assertRegex(rec.msg, log_regex)


class TestProperties1D(TestMeshCommon):
# Tests that can re-use a single instance for greater efficiency.
Expand Down Expand Up @@ -194,10 +199,7 @@ def test_connectivities_locations(self):

with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.assertEqual([], func(contains_face=True))
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r".*filter for non-existent.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r".*filter for non-existent.*")

def test_coord(self):
# See Mesh.coords tests for thorough coverage of cases.
Expand Down Expand Up @@ -269,10 +271,7 @@ def test_coords_locations(self):

with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.assertEqual([], func(include_faces=True))
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r".*filter non-existent.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r".*filter non-existent.*")

def test_edge_dimension(self):
self.assertEqual(
Expand Down Expand Up @@ -626,10 +625,7 @@ def test_add_connectivities_invalid(self):
face_node = self.FACE_NODE
with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.mesh.add_connectivities(face_node)
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r"Not adding connectivity.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r"Not adding connectivity.*")

def test_add_coords(self):
# ADD coords.
Expand Down Expand Up @@ -736,10 +732,7 @@ def test_dimension_names(self):

with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.mesh.dimension_names("foo", "bar", "baz")
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r"Not setting face_dimension.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r"Not setting face_dimension.*")
self.assertEqual(
ugrid.Mesh1DNames("foo", "bar"), self.mesh.dimension_names()
)
Expand All @@ -760,10 +753,7 @@ def test_edge_dimension_set(self):
def test_face_dimension_set(self):
with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.mesh.face_dimension = "foo"
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r"Not setting face_dimension.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r"Not setting face_dimension.*")
self.assertIsNone(self.mesh.face_dimension)

def test_node_dimension_set(self):
Expand Down Expand Up @@ -808,10 +798,7 @@ def test_remove_connectivities(self):
for kwargs in positive_kwargs:
with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.mesh.remove_connectivities(**kwargs)
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r"Ignoring request to remove.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r"Ignoring request to remove.*")
self.assertEqual(self.EDGE_NODE, self.mesh.edge_node_connectivity)
for kwargs in negative_kwargs:
with self.assertLogs(ugrid.logger, level="DEBUG") as log:
Expand Down Expand Up @@ -846,10 +833,7 @@ def test_remove_coords(self):
for kwargs in positive_kwargs:
with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.mesh.remove_coords(**kwargs)
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r"Ignoring request to remove.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r"Ignoring request to remove.*")
self.assertEqual(self.NODE_LON, self.mesh.node_coords.node_x)
for kwargs in negative_kwargs:
with self.assertLogs(ugrid.logger, level="DEBUG") as log:
Expand Down Expand Up @@ -968,10 +952,7 @@ def test_add_connectivities_invalid(self):
)
with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.mesh.add_connectivities(fake_cf_role)
rec = log.records[0]
self.assertEqual("DEBUG", rec.levelname)
re_msg = r"Not adding connectivity.*"
self.assertRegex(rec.msg, re_msg)
self.check_log(log, "DEBUG", r"Not adding connectivity.*")

def test_add_coords_face(self):
# ADD coords.
Expand Down

0 comments on commit 3cf6662

Please sign in to comment.