diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-02-26 09:51:27 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-02-26 09:51:27 -0500 |
| commit | 4dbb4371741c170742b87dcec02b88e61a586888 (patch) | |
| tree | aee1458a7bcc662b1a94c11433ba8e3842d216f8 | |
| parent | 004f6a00b20ef92285707702e2ab187092671c2b (diff) | |
| download | googletest-4dbb4371741c170742b87dcec02b88e61a586888.tar.gz googletest-4dbb4371741c170742b87dcec02b88e61a586888.tar.bz2 googletest-4dbb4371741c170742b87dcec02b88e61a586888.zip | |
merging unittests - 5
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 38ff19ee..11af9c9b 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -4425,7 +4425,7 @@ TEST(ExpectTest, EXPECT_EQ_NULL) { // A failure. int n = 0; EXPECT_NONFATAL_FAILURE(EXPECT_EQ(NULL, &n), - "&n\n"); + " &n\n Which is:"); } #endif // GTEST_CAN_COMPARE_NULL @@ -4883,9 +4883,9 @@ TEST(EqAssertionTest, CharPointer) { ASSERT_EQ(p1, p1); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - "p2"); + " p2\n Which is:"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), - "p2"); + " p2\n Which is:"); EXPECT_FATAL_FAILURE(ASSERT_EQ(reinterpret_cast<char*>(0x1234), reinterpret_cast<char*>(0xABC0)), "ABC0"); @@ -4905,9 +4905,9 @@ TEST(EqAssertionTest, WideCharPointer) { EXPECT_EQ(p0, p0); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p0, p2), - "p2"); + " p2\n Which is:"); EXPECT_NONFATAL_FAILURE(EXPECT_EQ(p1, p2), - "p2"); + " p2\n Which is:"); void* pv3 = (void*)0x1234; // NOLINT void* pv4 = (void*)0xABC0; // NOLINT const wchar_t* p3 = reinterpret_cast<const wchar_t*>(pv3); |