commit c8e8584169c7b000a5ab0971f632b6d0ef74f3c8
author Tom Cherry <tomcherry@google.com> Thu Oct 03 12:13:54 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 03 12:13:54 2019 -0700
tree 1cb95ecaee50b0d094e3aba31d9abdec8e03cbe4
parent 52525f6fab4fd34dbb9b2a3e6006ec1eaf7503d2
parent 5d3bc47fd63ff9cf96d40015dc96390f5ea7bdea

Merge "liblog: use EXPECTED_STREQ for strings" am: c37e3f01ee am: adc054f60d
am: 589b217303

Change-Id: Ibb3db5c530857c947f6dc82cc5078fd1eb4834fd

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)) {