ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve error message and update unit tests accordingly

Browse Source
This commit is contained in:
Axel Kohlmeyer
2022-08-17 13:25:47 -04:00
parent c8f379dbab
commit c1b664b4be
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils.cpp
View File

@ -777,7 +777,7 @@ std::vector<std::string> utils::gridid_parse(const char *file, int line, const s
auto words = Tokenizer(name, ":").as_vector();
if (words.size() != 3) {
if (error)
error->all(FLERR, "Grid ID {} does not contain two ':' characters", name);
error->all(file, line, "Grid ID {} must be 3 strings separated by 2 ':'characters", name);
else
return {"", "", ""};
}

8
unittest/utils/test_utils.cpp
View File

@ -798,14 +798,14 @@ TEST(Utils, gridid_parse)
ASSERT_THAT(words[0], StrEq(""));
words = utils::gridid_parse(FLERR, "c_1:full:", nullptr);
ASSERT_THAT(words[0], StrEq("c_1"));
ASSERT_THAT(words[1], StrEq("full"));
ASSERT_THAT(words[0], StrEq(""));
ASSERT_THAT(words[1], StrEq(""));
ASSERT_THAT(words[0], StrEq(""));
words = utils::gridid_parse(FLERR, ":full:density", nullptr);
ASSERT_THAT(words[0], StrEq(""));
ASSERT_THAT(words[1], StrEq("full"));
ASSERT_THAT(words[0], StrEq("density"));
ASSERT_THAT(words[1], StrEq(""));
ASSERT_THAT(words[0], StrEq(""));
words = utils::gridid_parse(FLERR, "c_1:full", nullptr);
ASSERT_THAT(words[0], StrEq(""));