diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-15 08:37:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 08:37:15 -0700 |
| commit | 7e7e3a6f45db62d470c9d15b062582e9e95d3bcd (patch) | |
| tree | 29039379de3d6fb3ef4c049d9b69faba9b4e5ccf /googlemock/test/gmock-spec-builders_test.cc | |
| parent | b50b2f775ed0268af9c83a96b285e296778d0743 (diff) | |
| parent | 997d343dd680e541ef96ce71ee54a91daf2577a0 (diff) | |
| download | googletest-7e7e3a6f45db62d470c9d15b062582e9e95d3bcd.tar.gz googletest-7e7e3a6f45db62d470c9d15b062582e9e95d3bcd.tar.bz2 googletest-7e7e3a6f45db62d470c9d15b062582e9e95d3bcd.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'googlemock/test/gmock-spec-builders_test.cc')
| -rw-r--r-- | googlemock/test/gmock-spec-builders_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc index 715aac8c..7056c43c 100644 --- a/googlemock/test/gmock-spec-builders_test.cc +++ b/googlemock/test/gmock-spec-builders_test.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // Google Mock - a framework for writing C++ mock classes. // @@ -1176,7 +1175,7 @@ TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) { TEST(UndefinedReturnValueTest, ReturnValueIsMandatoryWhenNotDefaultConstructible) { MockA a; - // TODO(wan@google.com): We should really verify the output message, + // FIXME: We should really verify the output message, // but we cannot yet due to that EXPECT_DEATH only captures stderr // while Google Mock logs to stdout. #if GTEST_HAS_EXCEPTIONS |