Skip to content

GitLab

Commit 29e9ca87 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

merging unitests, check

parent 3299a238
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
googletest/test/gtest_unittest.cc
View file @ 29e9ca87
...@@ -2421,9 +2421,8 @@ TEST(StringAssertionTest, ASSERT_STREQ) { ...@@ -2421,9 +2421,8 @@ TEST(StringAssertionTest, ASSERT_STREQ) {
const char p2[] = "good"; const char p2[] = "good";
ASSERT_STREQ(p1, p2); ASSERT_STREQ(p1, p2);
EXPECT_FATAL_FAILURE( EXPECT_FATAL_FAILURE(ASSERT_STREQ("bad", "good"),
ASSERT_STREQ("bad", "good"), " \"bad\"\n \"good\"");
"Expected equality of these values:\n \"bad\"\n \"good\"");
} }
// Tests ASSERT_STREQ with NULL arguments. // Tests ASSERT_STREQ with NULL arguments.
...@@ -3698,7 +3697,7 @@ TEST(AssertionTest, ASSERT_EQ_NULL) { ...@@ -3698,7 +3697,7 @@ TEST(AssertionTest, ASSERT_EQ_NULL) {
// A failure. // A failure.
static int n = 0; static int n = 0;
EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n), EXPECT_FATAL_FAILURE(ASSERT_EQ(NULL, &n),
" &n\n Which is:"); " &n\n Which is: 0x");
} }
#endif // GTEST_CAN_COMPARE_NULL #endif // GTEST_CAN_COMPARE_NULL
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment