aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2019-01-03 12:39:44 -0500
committerGennadiy Civil <misterg@google.com>2019-01-03 16:40:20 -0500
commit3a460a26b7a91abf87af7f31b93d29f930e25c82 (patch)
tree286a8c244c42d40f2117ccabe41eb3aff8132cdf /googlemock/src
parentac8c102dae661b8bff6780ffdc535c6d1957d45b (diff)
downloadgoogletest-3a460a26b7a91abf87af7f31b93d29f930e25c82.tar.gz
googletest-3a460a26b7a91abf87af7f31b93d29f930e25c82.tar.bz2
googletest-3a460a26b7a91abf87af7f31b93d29f930e25c82.zip
Googletest export
TestCase->TestSuite refactoring PiperOrigin-RevId: 227702164
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-spec-builders.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc
index ee0c5341..19714159 100644
--- a/googlemock/src/gmock-spec-builders.cc
+++ b/googlemock/src/gmock-spec-builders.cc
@@ -572,7 +572,7 @@ 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_suite;
::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.
@@ -609,8 +609,8 @@ class MockObjectRegistry {
state.first_used_line);
std::cout << " ERROR: this mock object";
if (state.first_used_test != "") {
- std::cout << " (used in test " << state.first_used_test_case << "."
- << state.first_used_test << ")";
+ std::cout << " (used in test " << state.first_used_test_suite << "."
+ << state.first_used_test << ")";
}
std::cout << " should be deleted but never is. Its address is @"
<< it->first << ".";
@@ -790,7 +790,7 @@ void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj,
const TestInfo* const test_info =
UnitTest::GetInstance()->current_test_info();
if (test_info != nullptr) {
- state.first_used_test_case = test_info->test_case_name();
+ state.first_used_test_suite = test_info->test_suite_name();
state.first_used_test = test_info->name();
}
}