Use EXPECT_STREQ

Author: mbknust

src/lib/format/tests/TestDecoding.cpp

@@ -128,7 +128,7 @@ void TestSampleData(const PayloadDecoderInitParams & params, const SamplePayload
         printf("ACTUAL: '%s'\n", partial.Reset().Add(output_builder.c_str() + idx).AddMarkerIfOverflow().c_str());
     }
 
-    EXPECT_EQ(strcmp(output_builder.c_str(), expectation), 0);
+    EXPECT_STREQ(output_builder.c_str(), expectation);
 }
 
 TEST(TestDecoding, TestFullDataDecoding)

src/lib/format/tests/TestFlatTree.cpp

@@ -83,21 +83,21 @@ class ByName
 
 TEST(TestFlatTree, TestFlatTreeFind)
 {
-    EXPECT_EQ(strcmp(FindEntry(tree, 0, ByTag(ContextTag(1)))->data.name, "hello"), 0);
-    EXPECT_EQ(strcmp(FindEntry(tree, 0, ByTag(ContextTag(2)))->data.name, "world"), 0);
+    EXPECT_STREQ(FindEntry(tree, 0, ByTag(ContextTag(1)))->data.name, "hello");
+    EXPECT_STREQ(FindEntry(tree, 0, ByTag(ContextTag(2)))->data.name, "world");
     EXPECT_EQ(FindEntry(tree, 0, ByTag(ContextTag(3))), nullptr);
 
     EXPECT_EQ(FindEntry(tree, 0, ByName("hello"))->data.tag, ContextTag(1));
     EXPECT_EQ(FindEntry(tree, 0, ByName("world"))->data.tag, ContextTag(2));
     EXPECT_EQ(FindEntry(tree, 0, ByName("foo")), nullptr);
 
     EXPECT_EQ(FindEntry(tree, 1, ByTag(ContextTag(1))), nullptr);
-    EXPECT_EQ(strcmp(FindEntry(tree, 1, ByTag(ProfileTag(234, 2)))->data.name, "b"), 0);
-    EXPECT_EQ(strcmp(FindEntry(tree, 1, ByTag(ProfileTag(345, 3)))->data.name, "c"), 0);
+    EXPECT_STREQ(FindEntry(tree, 1, ByTag(ProfileTag(234, 2)))->data.name, "b");
+    EXPECT_STREQ(FindEntry(tree, 1, ByTag(ProfileTag(345, 3)))->data.name, "c");
     EXPECT_EQ(FindEntry(tree, 1, ByTag(AnonymousTag())), nullptr);
 
     EXPECT_EQ(FindEntry(tree, 2, ByTag(ContextTag(1))), nullptr);
-    EXPECT_EQ(strcmp(FindEntry(tree, 2, ByTag(AnonymousTag()))->data.name, "foo"), 0);
+    EXPECT_STREQ(FindEntry(tree, 2, ByTag(AnonymousTag()))->data.name, "foo");
 
     // out of array
     EXPECT_EQ(FindEntry(tree, 3, ByTag(AnonymousTag())), nullptr);

src/lib/format/tests/TestFlatTreePosition.cpp

@@ -94,7 +94,7 @@ class ByName
 
 #define ASSERT_HAS_NAME(p, n)                                                                                                      \
     EXPECT_NE(p.Get(), nullptr);                                                                                                   \
-    EXPECT_EQ(strcmp(p.Get()->name, n), 0)
+    EXPECT_STREQ(p.Get()->name, n);
 
 #define ASSERT_HAS_CONTEXT_TAG(p, t)                                                                                               \
     EXPECT_NE(p.Get(), nullptr);                                                                                                   \