From 7266fcc5edc11816f2ea010dfb896dc1af0a0e50 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Wed, 26 Oct 2022 22:06:28 +0000 Subject: [PATCH] Making error messages consistent --- src/dagmc.cpp | 5 +++-- tests/regression_tests/dagmc/legacy/test.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dagmc.cpp b/src/dagmc.cpp index b06db792e..129291891 100644 --- a/src/dagmc.cpp +++ b/src/dagmc.cpp @@ -498,8 +498,9 @@ void DAGUniverse::legacy_assign_material( // report failure for failed int conversion or missing material if (!found_by_id) - fatal_error(fmt::format( - "No material '{}' found for volume (cell) {}", mat_string, c->id_)); + fatal_error( + fmt::format("Material with name/ID '{}' not found for volume (cell) {}", + mat_string, c->id_)); } if (settings::verbosity >= 10) { diff --git a/tests/regression_tests/dagmc/legacy/test.py b/tests/regression_tests/dagmc/legacy/test.py index 706b52bea..502775148 100644 --- a/tests/regression_tests/dagmc/legacy/test.py +++ b/tests/regression_tests/dagmc/legacy/test.py @@ -62,7 +62,7 @@ def test_missing_material_id(model): model.materials = model.materials[:-1] with pytest.raises(RuntimeError) as exec_info: model.run() - exp_error_msg = "Material with ID '41' not found for volume (cell) 3" + exp_error_msg = "Material with name/ID '41' not found for volume (cell) 3" assert exp_error_msg in str(exec_info.value) @@ -71,7 +71,7 @@ def test_missing_material_name(model): model.materials = model.materials[1:] with pytest.raises(RuntimeError) as exec_info: model.run() - exp_error_msg = "No material 'no-void fuel' found for volume (cell) 1" + exp_error_msg = "Material with name/ID 'no-void fuel' not found for volume (cell) 1" assert exp_error_msg in str(exec_info.value)