From 29e9ca87743400382725bd475f2206ca4b6f1828 Mon Sep 17 00:00:00 2001
From: Gennadiy Civil <misterg@google.com>
Date: Fri, 23 Feb 2018 11:29:35 -0500
Subject: [PATCH] merging unitests, check

---
 googletest/test/gtest_unittest.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index bf7621ef..f62e5b4b 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -2421,9 +2421,8 @@ TEST(StringAssertionTest, ASSERT_STREQ) {
   const char p2[] = "good";
   ASSERT_STREQ(p1, p2);
 
-  EXPECT_FATAL_FAILURE(
-      ASSERT_STREQ("bad", "good"),
-      "Expected equality of these values:\n  \"bad\"\n  \"good\"");
+  EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"),
+                       "  \"bad\"\n  \"good\"");
 }
 
 // Tests ASSERT_STREQ with NULL arguments.
@@ -3698,7 +3697,7 @@ TEST(AssertionTest, ASSERT_EQ_NULL) {
   // A failure.
   static int n = 0;
   EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n),
-                       "  &n\n    Which is:");
+                       "  &n\n    Which is: 0x");
 }
 #endif  // GTEST_CAN_COMPARE_NULL