diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-14 14:25:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 14:25:05 -0700 |
| commit | 02671abb44c8c34a940d79e777fc7c3b3ebae50e (patch) | |
| tree | d0c92b4fb2f6d14b59c858574521840dc2b08d41 /googlemock/src | |
| parent | e26771776b26b690c98edd99a949ae6c8638e03b (diff) | |
| parent | 587ceaeaee6c2ccb5e565858d7fe12aaf69795e6 (diff) | |
| download | googletest-02671abb44c8c34a940d79e777fc7c3b3ebae50e.tar.gz googletest-02671abb44c8c34a940d79e777fc7c3b3ebae50e.tar.bz2 googletest-02671abb44c8c34a940d79e777fc7c3b3ebae50e.zip | |
Merge branch 'master' into cmake-binary-dir-fix
Diffstat (limited to 'googlemock/src')
| -rw-r--r-- | googlemock/src/gmock-spec-builders.cc | 4 | ||||
| -rw-r--r-- | googlemock/src/gmock.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc index 83cc9cc1..b93f4e0e 100644 --- a/googlemock/src/gmock-spec-builders.cc +++ b/googlemock/src/gmock-spec-builders.cc @@ -606,7 +606,7 @@ class MockObjectRegistry { if (it->second.leakable) // The user said it's fine to leak this object. continue; - // TODO(wan@google.com): Print the type of the leaked object. + // FIXME: Print the type of the leaked object. // This can help the user identify the leaked object. std::cout << "\n"; const MockObjectState& state = it->second; @@ -782,7 +782,7 @@ void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj, 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 + // FIXME: 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(); diff --git a/googlemock/src/gmock.cc b/googlemock/src/gmock.cc index 1cebede0..36356c93 100644 --- a/googlemock/src/gmock.cc +++ b/googlemock/src/gmock.cc @@ -33,7 +33,7 @@ namespace testing { -// TODO(wan@google.com): support using environment variables to +// FIXME: support using environment variables to // control the flag values, like what Google Test does. GMOCK_DEFINE_bool_(catch_leaked_mocks, true, |