From ba4781bd82228ac5aa386785b000a972e4aa4d3b Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sun, 25 Apr 2021 01:14:57 -0400 Subject: [PATCH] restore old string matching as it works just as well (on my machine) --- unittest/cplusplus/test_lammps_class.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/unittest/cplusplus/test_lammps_class.cpp b/unittest/cplusplus/test_lammps_class.cpp index 8f12bd247b..6a0e6719cc 100644 --- a/unittest/cplusplus/test_lammps_class.cpp +++ b/unittest/cplusplus/test_lammps_class.cpp @@ -13,8 +13,6 @@ using ::testing::MatchesRegex; using ::testing::StartsWith; -using ::testing::StrEq; -using ::testing::StrNe; namespace LAMMPS_NS { // test fixture for regular tests @@ -93,13 +91,13 @@ TEST_F(LAMMPS_plain, InitMembers) EXPECT_NE(lmp->python, nullptr); EXPECT_EQ(lmp->citeme, nullptr); if (LAMMPS::has_git_info) { - EXPECT_THAT(LAMMPS::git_commit, StrNe("")); - EXPECT_THAT(LAMMPS::git_branch, StrNe("")); - EXPECT_THAT(LAMMPS::git_descriptor, StrNe("")); + EXPECT_STRNE(LAMMPS::git_commit, ""); + EXPECT_STRNE(LAMMPS::git_branch, ""); + EXPECT_STRNE(LAMMPS::git_descriptor, ""); } else { - EXPECT_THAT(LAMMPS::git_commit, StrEq("(unknown)")); - EXPECT_THAT(LAMMPS::git_branch, StrEq("(unknown)")); - EXPECT_THAT(LAMMPS::git_descriptor, StrEq("(unknown)")); + EXPECT_STREQ(LAMMPS::git_commit, "(unknown)"); + EXPECT_STREQ(LAMMPS::git_branch, "(unknown)"); + EXPECT_STREQ(LAMMPS::git_descriptor, "(unknown)"); } EXPECT_EQ(lmp->comm->nthreads, 1); }