diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gmock-internal-utils.cc | 8 | ||||
| -rw-r--r-- | src/gmock-spec-builders.cc | 27 |
2 files changed, 18 insertions, 17 deletions
diff --git a/src/gmock-internal-utils.cc b/src/gmock-internal-utils.cc index 470fc447..fb530801 100644 --- a/src/gmock-internal-utils.cc +++ b/src/gmock-internal-utils.cc @@ -77,13 +77,13 @@ class GoogleTestFailureReporter : public FailureReporterInterface { public: virtual void ReportFailure(FailureType type, const char* file, int line, const string& message) { - AssertHelper(type == FATAL ? + AssertHelper(type == kFatal ? TestPartResult::kFatalFailure : TestPartResult::kNonFatalFailure, file, line, message.c_str()) = Message(); - if (type == FATAL) { + if (type == kFatal) { posix::Abort(); } } @@ -117,7 +117,7 @@ GTEST_API_ bool LogIsVisible(LogSeverity severity) { } else { // If --gmock_verbose is neither "info" nor "error", we treat it // as "warning" (its default value). - return severity == WARNING; + return severity == kWarning; } } @@ -140,7 +140,7 @@ GTEST_API_ void Log(LogSeverity severity, // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is a // macro. - if (severity == WARNING) { + if (severity == kWarning) { // Prints a GMOCK WARNING marker to make the warnings easily searchable. std::cout << "\nGMOCK WARNING:"; } diff --git a/src/gmock-spec-builders.cc b/src/gmock-spec-builders.cc index a93ea71a..9fcb61ea 100644 --- a/src/gmock-spec-builders.cc +++ b/src/gmock-spec-builders.cc @@ -217,7 +217,7 @@ void ExpectationBase::CheckActionCountIfNotDone() const ss << " and a WillRepeatedly()"; } ss << "."; - Log(WARNING, ss.str(), -1); // -1 means "don't print stack trace". + Log(kWarning, ss.str(), -1); // -1 means "don't print stack trace". } } @@ -246,11 +246,11 @@ GTEST_API_ ThreadLocal<Sequence*> g_gmock_implicit_sequence; // manner specified by 'reaction'. void ReportUninterestingCall(CallReaction reaction, const string& msg) { switch (reaction) { - case ALLOW: - Log(INFO, msg, 3); + case kAllow: + Log(kInfo, msg, 3); break; - case WARN: - Log(WARNING, msg, 3); + case kWarn: + Log(kWarning, msg, 3); break; default: // FAIL Expect(false, NULL, -1, msg); @@ -345,10 +345,10 @@ UntypedFunctionMockerBase::UntypedInvokeWith(const void* const untyped_args) const bool need_to_report_uninteresting_call = // If the user allows this uninteresting call, we print it // only when he wants informational messages. - reaction == ALLOW ? LogIsVisible(INFO) : + reaction == kAllow ? LogIsVisible(kInfo) : // If the user wants this to be a warning, we print it only // when he wants to see warnings. - reaction == WARN ? LogIsVisible(WARNING) : + reaction == kWarn ? LogIsVisible(kWarning) : // Otherwise, the user wants this to be an error, and we // should always print detailed information in the error. true; @@ -391,7 +391,8 @@ UntypedFunctionMockerBase::UntypedInvokeWith(const void* const untyped_args) // True iff we need to print the call's arguments and return value. // This definition must be kept in sync with the uses of Expect() // and Log() in this function. - const bool need_to_report_call = !found || is_excessive || LogIsVisible(INFO); + const bool need_to_report_call = + !found || is_excessive || LogIsVisible(kInfo); if (!need_to_report_call) { // Perform the action without printing the call information. return @@ -427,7 +428,7 @@ UntypedFunctionMockerBase::UntypedInvokeWith(const void* const untyped_args) } else { // We had an expected call and the matching expectation is // described in ss. - Log(INFO, loc.str() + ss.str(), 2); + Log(kInfo, loc.str() + ss.str(), 2); } return result; @@ -606,21 +607,21 @@ void SetReactionOnUninterestingCalls(const void* mock_obj, // object. void Mock::AllowUninterestingCalls(const void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - SetReactionOnUninterestingCalls(mock_obj, internal::ALLOW); + SetReactionOnUninterestingCalls(mock_obj, internal::kAllow); } // Tells Google Mock to warn the user about uninteresting calls on the // given mock object. void Mock::WarnUninterestingCalls(const void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - SetReactionOnUninterestingCalls(mock_obj, internal::WARN); + SetReactionOnUninterestingCalls(mock_obj, internal::kWarn); } // Tells Google Mock to fail uninteresting calls on the given mock // object. void Mock::FailUninterestingCalls(const void* mock_obj) GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - SetReactionOnUninterestingCalls(mock_obj, internal::FAIL); + SetReactionOnUninterestingCalls(mock_obj, internal::kFail); } // Tells Google Mock the given mock object is being destroyed and its @@ -638,7 +639,7 @@ internal::CallReaction Mock::GetReactionOnUninterestingCalls( GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { internal::MutexLock l(&internal::g_gmock_mutex); return (g_uninteresting_call_reaction.count(mock_obj) == 0) ? - internal::WARN : g_uninteresting_call_reaction[mock_obj]; + internal::kWarn : g_uninteresting_call_reaction[mock_obj]; } // Tells Google Mock to ignore mock_obj when checking for leaked mock |