aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock/gmock-spec-builders.h
Commit message (Collapse)AuthorAgeFilesLines
* Formatting changes for automatic code managementGennadiy Civil2018-07-271-0/+2
|
* Fix warning C4819: The file contains a character that cannot be represented ↵duxiuxing2018-07-171-18/+18
| | | | in the current code page (936). Save the file in Unicode format to prevent data loss
* Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-181-12/+78
|
* Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-121-8/+3
| | | | | | | | | | | | | | | | | | Internal CL 156157936, which was published in commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71, introduced undefined behavior by casting a base class (internal::{Naggy,Nice,Strict}Base<MockClass>, using the curiously recurring template pattern) pointer to a derived class ({Naggy,Nice,Strict}Mock<MockClass>), in the base class' constructor. At that point, the object isn't guaranteed to have taken on the shape of the derived class, and casting is undefined behavior. The undefined behavior was caught by Chrome's CFI build bot [1], and prevents rolling googletest past that commit / CL. This commit simplifies the {Naggy,Nice,Strict}Mock class hierarchy in a way that removes the undefined behavior. [1] https://www.chromium.org/developers/testing/control-flow-integrity
* Merging gMock, 2Gennadiy Civil2018-04-051-49/+58
|
* Code mergesGennadiy Civil2018-01-261-5/+4
|
* Use gender-neutral pronouns in comments and docsJonathan Wakely2017-09-271-1/+1
|
* Adding a flag option to change the default mock typeAlyssa Wilk2017-08-101-1/+0
|
* Use std::string and ::string explicitly in gtest and gmock code.Nico Weber2017-05-151-25/+28
| | | | | | | | | This merges a Google-internal change (117235625). Original CL description: This CL was created manually in about an hour with sed, a Python script to find all the places unqualified 'string' was mentioned, and some help from Emacs to add the "std::" qualifications, plus a few manual tweaks.
* move googlemock files into googlemock/ subdirBilly Donahue2015-08-251-0/+1847