diff options
author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
---|---|---|
committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-08-17 23:58:45 +0100 |
commit | 9d77e63e125a24e8ba6cbe02b40681a37f59cd5f (patch) | |
tree | 5b4f48b7b3fd7c99e702774ffc53da0f3822613e /googlemock/test/gmock-spec-builders_test.cc | |
parent | 1cd979a80701a6c8c370f3a69048ba5cbec62a28 (diff) | |
parent | e82d320567a45db1a999f9109f2b9a733bc59bb1 (diff) | |
download | googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.gz googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.tar.bz2 googletest-9d77e63e125a24e8ba6cbe02b40681a37f59cd5f.zip |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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 |