commit 337cb5664b812294150a2f18794e2e6d93d5edad
author Tom Cherry <tomcherry@google.com> Thu Oct 03 07:27:58 2019 -0700
committer Tom Cherry <tomcherry@google.com> Thu Oct 03 07:32:24 2019 -0700
tree b7f7a45e45b759392a90a9fad4528b7041928283
parent b79c636f784330d512655a8ea4f54736f0cb2e72

liblog: use EXPECTED_STREQ for strings

These tests are flaky, but we're not seeing what the failure strings
are.

Bug: 142041379
Test: force a failure and see the right error message
Change-Id: Icd7777e5c309cac3b98ce65925980965a3cc3753

liblog/tests/liblog_test.cpp

diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp
index 34fb909..d8b0ced 100644
--- a/liblog/tests/liblog_test.cpp
+++ b/liblog/tests/liblog_test.cpp
@@ -2664,8 +2664,7 @@
       print_barrier();
     }
     EXPECT_EQ(0, buffer_to_string);
-    EXPECT_EQ(strlen(expected_string), strlen(msgBuf));
-    EXPECT_EQ(0, strcmp(expected_string, msgBuf));
+    EXPECT_STREQ(expected_string, msgBuf);
   }
 
   EXPECT_EQ(1, count);
@@ -2858,7 +2857,7 @@
   EXPECT_EQ(ANDROID_LOG_VERBOSE, prio);
   EXPECT_FALSE(NULL == strstr(__pmsg_file, filename));
   EXPECT_EQ(len, sizeof(max_payload_buf));
-  EXPECT_EQ(0, strcmp(max_payload_buf, buf));
+  EXPECT_STREQ(max_payload_buf, buf);
 
   ++signaled;
   if ((len != sizeof(max_payload_buf)) || strcmp(max_payload_buf, buf)) {