commit 4bd2abd2f871af49eb4b39b24f3682e0c9e9fa2b
author Scott Graham <scottmg@google.com> Fri May 17 03:26:33 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri May 17 03:26:33 2019 +0000
tree 34bdf64ed80dc616a2cc4ee008acd73ebde9c593
parent 5b92c1521e934832d33838d96b5129595ed09d73

[test][logging] Followup after https://fuchsia-review.googlesource.com/c/fuchsia/+/282029

Give in to gmock-tyranny and/or make code more readable.

ZX-4110 #comment [test][logging] Followup after https://fuchsia-review.googlesource.com/c/fuchsia/+/282029

Change-Id: Ia5b8eb62d8cfb44da426e608ac08478ef9ab13bd

src/lib/fxl/logging_unittest.cc

diff --git a/src/lib/fxl/logging_unittest.cc b/src/lib/fxl/logging_unittest.cc
index 1a2a605..124447bc 100644
--- a/src/lib/fxl/logging_unittest.cc
+++ b/src/lib/fxl/logging_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "src/lib/files/file.h"
 #include "src/lib/files/scoped_temp_dir.h"
@@ -41,13 +42,14 @@
   std::string log;
   ASSERT_TRUE(files::ReadFileToString(new_settings.log_file, &log));
 
-  EXPECT_TRUE(
-      log.find(
-          "[ERROR:src/lib/fxl/logging_unittest.cc(38)] something at error") !=
-      std::string::npos);
-  EXPECT_TRUE(
-      log.find("[INFO:logging_unittest.cc(39)] and some other at info level") !=
-      std::string::npos);
+  EXPECT_THAT(
+      log,
+      testing::HasSubstr(
+          "[ERROR:src/lib/fxl/logging_unittest.cc(39)] something at error"));
+
+  EXPECT_THAT(
+      log, testing::HasSubstr(
+               "[INFO:logging_unittest.cc(40)] and some other at info level"));
 }
 
 #if defined(__Fuchsia__)
@@ -64,9 +66,9 @@
   std::string log;
   ASSERT_TRUE(files::ReadFileToString(new_settings.log_file, &log));
 
-  EXPECT_TRUE(log.find("should be ok: 0 (ZX_OK)") != std::string::npos);
-  EXPECT_TRUE(log.find("got access denied: -30 (ZX_ERR_ACCESS_DENIED)") !=
-              std::string::npos);
+  EXPECT_THAT(log, testing::HasSubstr("should be ok: 0 (ZX_OK)"));
+  EXPECT_THAT(
+      log, testing::HasSubstr("got access denied: -30 (ZX_ERR_ACCESS_DENIED)"));
 }
 #endif  // defined(__Fuchsia__)