Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1911 from BrukerJWD:isnice | Gennadiy Civil | 2018-10-23 | 1 | -0/+28 |
|\ | | | | | | | PiperOrigin-RevId: 218384341 | ||||
| * | Removed last reference to internal::kDefaultrefs/pull/1911/head | Jonathan Wendeborn | 2018-10-16 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'master' into isnice | BrukerJWD | 2018-10-16 | 1 | -17/+103 |
| |\ | |/ |/| | |||||
| * | Don't fully qualify enum member | Jonathan Wendeborn | 2018-10-16 | 1 | -2/+1 |
| | | |||||
| * | Added Mock::IsNaggy, IsNice, and IsStrict | Jonathan Wendeborn | 2018-10-16 | 1 | -0/+30 |
| | | |||||
* | | Comments changes, no functionality changesrefs/pull/1740/head | Gennadiy Civil | 2018-08-14 | 1 | -2/+1 |
| | | |||||
* | | merging refs/pull/1567/head | Gennadiy Civil | 2018-04-12 | 1 | -3/+47 |
| | | |||||
* | | Remove multiple inheritance from "unintesting call" mock classes.refs/pull/1557/head | Victor Costan | 2018-04-12 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Remove unused variablerefs/pull/1206/head | Maurice Gilden | 2017-08-21 | 1 | -1/+0 |
| | | |||||
* | | Added "explicit" as per compiler suggestion | Gennadiy Civil | 2017-08-20 | 1 | -1/+1 |
| | | |||||
* | | Proposing these changes, please review | Gennadiy Civil | 2017-08-20 | 1 | -12/+9 |
| | | | | | | | | Slightly better names and cleaner tests. Please review | ||||
* | | Change tabs to spaces in test case | Maurice Gilden | 2017-08-18 | 1 | -11/+11 |
| | | |||||
* | | Switch return type to class without default constructor | Maurice Gilden | 2017-08-18 | 1 | -1/+7 |
| | | |||||
* | | Fix test if exceptions are not supported | Maurice Gilden | 2017-08-18 | 1 | -0/+6 |
| | | |||||
* | | adds test for NiceMock with unknown return value | Maurice Gilden | 2017-08-18 | 1 | -0/+15 |
| | | |||||
* | | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/head | Nico Weber | 2017-05-15 | 1 | -14/+13 |
|/ | | | | | | | | | 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/ subdir | Billy Donahue | 2015-08-25 | 1 | -0/+424 |