Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
4dbb4371
Commit
4dbb4371
authored
Feb 26, 2018
by
Gennadiy Civil
Browse files
merging unittests - 5
parent
004f6a00
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
googletest/test/gtest_unittest.cc
googletest/test/gtest_unittest.cc
+5
-5
No files found.
googletest/test/gtest_unittest.cc
View file @
4dbb4371
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment