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
21d276b5
Commit
21d276b5
authored
Nov 14, 2019
by
Krystian Kuzniarek
Browse files
remove MSVC workaround: accessing namespace scope from within nested classes
parent
f9665846
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
9 deletions
+4
-9
googlemock/test/gmock-matchers_test.cc
googlemock/test/gmock-matchers_test.cc
+4
-9
No files found.
googlemock/test/gmock-matchers_test.cc
View file @
21d276b5
...
...
@@ -2987,18 +2987,13 @@ TEST(MatcherAssertionTest, WorksWhenMatcherIsNotSatisfied) {
static
unsigned
short
n
;
// NOLINT
n
=
5
;
// VC++ prior to version 8.0 SP1 has a bug where it will not see any
// functions declared in the namespace scope from within nested classes.
// EXPECT/ASSERT_(NON)FATAL_FAILURE macros use nested classes so that all
// namespace-level functions invoked inside them need to be explicitly
// resolved.
EXPECT_FATAL_FAILURE
(
ASSERT_THAT
(
n
,
::
testing
::
Gt
(
10
)),
EXPECT_FATAL_FAILURE
(
ASSERT_THAT
(
n
,
Gt
(
10
)),
"Value of: n
\n
"
"Expected: is > 10
\n
"
" Actual: 5"
+
OfType
(
"unsigned short"
));
n
=
0
;
EXPECT_NONFATAL_FAILURE
(
EXPECT_THAT
(
n
,
::
testing
::
AllOf
(
::
testing
::
Le
(
7
),
::
testing
::
Ge
(
5
))),
EXPECT_THAT
(
n
,
AllOf
(
Le
(
7
),
Ge
(
5
))),
"Value of: n
\n
"
"Expected: (is <= 7) and (is >= 5)
\n
"
" Actual: 0"
+
OfType
(
"unsigned short"
));
...
...
@@ -3012,11 +3007,11 @@ TEST(MatcherAssertionTest, WorksForByRefArguments) {
static
int
n
;
n
=
0
;
EXPECT_THAT
(
n
,
AllOf
(
Le
(
7
),
Ref
(
n
)));
EXPECT_FATAL_FAILURE
(
ASSERT_THAT
(
n
,
::
testing
::
Not
(
::
testing
::
Ref
(
n
))),
EXPECT_FATAL_FAILURE
(
ASSERT_THAT
(
n
,
Not
(
Ref
(
n
))),
"Value of: n
\n
"
"Expected: does not reference the variable @"
);
// Tests the "Actual" part.
EXPECT_FATAL_FAILURE
(
ASSERT_THAT
(
n
,
::
testing
::
Not
(
::
testing
::
Ref
(
n
))),
EXPECT_FATAL_FAILURE
(
ASSERT_THAT
(
n
,
Not
(
Ref
(
n
))),
"Actual: 0"
+
OfType
(
"int"
)
+
", which is located @"
);
}
...
...
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