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

Improves the error message for leaked mocks to include the test name (by Zhanyong Wan).

Browse Source
This commit is contained in:
zhanyong.wan
2009-05-05 23:14:47 +00:00
parent 125783fb87
commit e7bb5ededa
5 changed files with 74 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gmock-spec-builders.cc
View File

@@ -168,6 +168,8 @@ struct MockObjectState {
// invoked on this mock object.
const char* first_used_file;
int first_used_line;
::std::string first_used_test_case;
::std::string first_used_test;
bool leakable; // true iff it's OK to leak the object.
FunctionMockers function_mockers; // All registered methods of the object.
};
@@ -203,8 +205,13 @@ class MockObjectRegistry {
const MockObjectState& state = it->second;
internal::FormatFileLocation(
state.first_used_file, state.first_used_line, &cout);
cout << " ERROR: this mock object should be deleted but never is. "
<< "Its address is @" << it->first << ".";
cout << " ERROR: this mock object";
if (state.first_used_test != "") {
cout << " (used in test " << state.first_used_test_case << "."
<< state.first_used_test << ")";
}
cout << " should be deleted but never is. Its address is @"
<< it->first << ".";
leaked_count++;
}
if (leaked_count > 0) {
@@ -357,6 +364,15 @@ void Mock::RegisterUseByOnCallOrExpectCall(
if (state.first_used_file == NULL) {
state.first_used_file = file;
state.first_used_line = line;
const TestInfo* const test_info =
UnitTest::GetInstance()->current_test_info();
if (test_info != NULL) {
// TODO(wan@google.com): record the test case name when the
// ON_CALL or EXPECT_CALL is invoked from SetUpTestCase() or
// TearDownTestCase().
state.first_used_test_case = test_info->test_case_name();
state.first_used_test = test_info->name();
}
}
}