Skip to content

GitLab

"git@developer.sourcefind.cn:yangql/googletest.git" did not exist on "a02a591605dfef9addde49634bf010dbe8f95c50"
Commit 21d276b5 authored by Krystian Kuzniarek's avatar Krystian Kuzniarek
Browse files

remove MSVC workaround: accessing namespace scope from within nested classes

parent f9665846
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
googlemock/test/gmock-matchers_test.cc
View file @ 21d276b5
...@@ -2987,18 +2987,13 @@ TEST(MatcherAssertionTest, WorksWhenMatcherIsNotSatisfied) { ...@@ -2987,18 +2987,13 @@ TEST(MatcherAssertionTest, WorksWhenMatcherIsNotSatisfied) {
static unsigned short n; // NOLINT static unsigned short n; // NOLINT
n = 5; n = 5;
// VC++ prior to version 8.0 SP1 has a bug where it will not see any EXPECT_FATAL_FAILURE(ASSERT_THAT(n, Gt(10)),
// 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)),
"Value of: n\n" "Value of: n\n"
"Expected: is > 10\n" "Expected: is > 10\n"
" Actual: 5" + OfType("unsigned short")); " Actual: 5" + OfType("unsigned short"));
n = 0; n = 0;
EXPECT_NONFATAL_FAILURE( 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" "Value of: n\n"
"Expected: (is <= 7) and (is >= 5)\n" "Expected: (is <= 7) and (is >= 5)\n"
" Actual: 0" + OfType("unsigned short")); " Actual: 0" + OfType("unsigned short"));
...@@ -3012,11 +3007,11 @@ TEST(MatcherAssertionTest, WorksForByRefArguments) { ...@@ -3012,11 +3007,11 @@ TEST(MatcherAssertionTest, WorksForByRefArguments) {
static int n; static int n;
n = 0; n = 0;
EXPECT_THAT(n, AllOf(Le(7), Ref(n))); 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" "Value of: n\n"
"Expected: does not reference the variable @"); "Expected: does not reference the variable @");
// Tests the "Actual" part. // 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 @"); "Actual: 0" + OfType("int") + ", which is located @");
} }
......
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