External/googletest
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't fully qualify enum member

Browse Source
This commit is contained in:
Jonathan Wendeborn 2018-10-16 08:19:02 +02:00
parent 67a240a107
commit 6bbf911a8d
No known key found for this signature in database
GPG Key ID: ED1F53B38A62F08E
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
googlemock/src/gmock-spec-builders.cc
View File

@ -710,11 +710,9 @@ bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj)
namespace {
// checks whether the specified mock_obj has a registered call reaction
bool HasCallReaction(void* mock_obj, internal::CallReaction reaction) {
using internal::CallReaction;
const auto found = g_uninteresting_call_reaction.find(mock_obj);
if (found == g_uninteresting_call_reaction.cend()) {
return internal::CallReaction::kDefault == reaction;
return internal::kDefault == reaction;
}
return found->second == reaction;
}
@ -723,17 +721,17 @@ bool HasCallReaction(void* mock_obj, internal::CallReaction reaction) {
bool Mock::IsNaggy(void* mock_obj)
GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
internal::MutexLock l(&internal::g_gmock_mutex);
return HasCallReaction(mock_obj, internal::CallReaction::kWarn);
return HasCallReaction(mock_obj, internal::kWarn);
}
bool Mock::IsNice(void* mock_obj)
GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
internal::MutexLock l(&internal::g_gmock_mutex);
return HasCallReaction(mock_obj, internal::CallReaction::kAllow);
return HasCallReaction(mock_obj, internal::kAllow);
}
bool Mock::IsStrict(void* mock_obj)
GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) {
internal::MutexLock l(&internal::g_gmock_mutex);
return HasCallReaction(mock_obj, internal::CallReaction::kFail);
return HasCallReaction(mock_obj, internal::kFail);
}
// Registers a mock object and a mock method it owns.

3
googlemock/test/gmock-nice-strict_test.cc
View File

@ -161,9 +161,8 @@ TEST(RawMockTest, InfoForUninterestingCall) {
}
TEST(RawMockTest, IsNaggy_IsNice_IsStrict) {
using internal::CallReaction;
MockFoo raw_foo;
ASSERT_EQ(CallReaction::kDefault, CallReaction::kWarn) << "precondition";
ASSERT_EQ(internal::kDefault, internal::kWarn) << "precondition";
EXPECT_TRUE (Mock::IsNaggy(&raw_foo));
EXPECT_FALSE(Mock::IsNice(&raw_foo));
EXPECT_FALSE(Mock::IsStrict(&raw_foo));