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

Removes duplicated definition of SetArgumentPointee (by Vlad Losev); Makes gmock compilable on platforms that don't have ::abort() (by Acadeli Checa); Fixes compatibility with Symbian's STLport (by Acadeli Checa).

Browse Source
This commit is contained in:
zhanyong.wan
2009-08-07 07:15:56 +00:00
parent a18423e0ee
commit 9571b28675
5 changed files with 27 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gmock-internal-utils.cc
View File

@@ -80,7 +80,7 @@ class GoogleTestFailureReporter : public FailureReporterInterface {
AssertHelper(type == FATAL ? TPRT_FATAL_FAILURE : TPRT_NONFATAL_FAILURE,
file, line, message.c_str()) = Message();
if (type == FATAL) {
abort();
posix::Abort();
}
}
};

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

@@ -186,7 +186,9 @@ class MockObjectRegistry {
// object alive. Therefore we report any living object as test
// failure, unless the user explicitly asked us to ignore it.
~MockObjectRegistry() {
using ::std::cout;
// "using ::std::cout;" doesn't work with Symbian's STLport, where cout is
// a macro.
if (!GMOCK_FLAG(catch_leaked_mocks))
return;
@@ -199,24 +201,24 @@ class MockObjectRegistry {
// TODO(wan@google.com): Print the type of the leaked object.
// This can help the user identify the leaked object.
cout << "\n";
std::cout << "\n";
const MockObjectState& state = it->second;
internal::FormatFileLocation(
state.first_used_file, state.first_used_line, &cout);
cout << " ERROR: this mock object";
state.first_used_file, state.first_used_line, &std::cout);
std::cout << " ERROR: this mock object";
if (state.first_used_test != "") {
cout << " (used in test " << state.first_used_test_case << "."
std::cout << " (used in test " << state.first_used_test_case << "."
<< state.first_used_test << ")";
}
cout << " should be deleted but never is. Its address is @"
std::cout << " should be deleted but never is. Its address is @"
<< it->first << ".";
leaked_count++;
}
if (leaked_count > 0) {
cout << "\nERROR: " << leaked_count
std::cout << "\nERROR: " << leaked_count
<< " leaked mock " << (leaked_count == 1 ? "object" : "objects")
<< " found at program exit.\n";
cout.flush();
std::cout.flush();
::std::cerr.flush();
// RUN_ALL_TESTS() has already returned when this destructor is
// called. Therefore we cannot use the normal Google Test