gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change messages

Browse Source 
Signed-off-by: Denis Hananein <i@zloylos.me>
This commit is contained in:
Denis Hananein 2022-10-21 14:03:45 +02:00
parent f3eb2b7e38
commit 0d26378919
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
googlemock/include/gmock/gmock-spec-builders.h
View File

@ -1213,11 +1213,11 @@ class TypedExpectation<R(Args...)> : public ExpectationBase {
if (IsSaturated()) { if (IsSaturated()) {
// We have an excessive call. // We have an excessive call.
IncrementCallCount(); IncrementCallCount();
*what << "Mock function "; *what << "Mock function called more times than expected ";
if (!expectation_name.empty()) { if (!expectation_name.empty()) {
*what << "with name \"" << expectation_name << "\" "; *what << "for \"" << expectation_name << "\" ";
} }
*what << "called more times than expected - "; *what << " - ";
mocker->DescribeDefaultActionTo(args, what); mocker->DescribeDefaultActionTo(args, what);
DescribeCallCountTo(why); DescribeCallCountTo(why);
@ -1232,11 +1232,11 @@ class TypedExpectation<R(Args...)> : public ExpectationBase {
} }
// Must be done after IncrementCount()! // Must be done after IncrementCount()!
*what << "Mock function "; *what << "Mock function call matches ";
if (!expectation_name.empty()) { if (!expectation_name.empty()) {
*what << "with name \"" << expectation_name << "\" "; *what << "\"" << expectation_name << "\" ";
} }
*what << "call matches " << source_text() << "...\n"; *what << source_text() << "...\n";
return &(GetCurrentAction(mocker, args)); return &(GetCurrentAction(mocker, args));
} }

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

@ -411,12 +411,11 @@ bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked()
::std::stringstream ss; ::std::stringstream ss;
const ::std::string& expectation_name = untyped_expectation->GetName(); const ::std::string& expectation_name = untyped_expectation->GetName();
ss << "Actual function"; ss << "Actual function call count doesn't match ";
if (!expectation_name.empty()) { if (!expectation_name.empty()) {
ss << " with name \"" << expectation_name << "\""; ss << "\"" << expectation_name << "\"";
} }
ss << " call count doesn't match " << untyped_expectation->source_text() ss << untyped_expectation->source_text() << "...\n";
<< "...\n";
// No need to show the source file location of the expectation // No need to show the source file location of the expectation
// in the description, as the Expect() call that follows already // in the description, as the Expect() call that follows already
// takes care of it. // takes care of it.