summaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-nice-strict_test.cc
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1911 from BrukerJWD:isniceGennadiy Civil2018-10-231-0/+28
|\ | | | | | | PiperOrigin-RevId: 218384341
| * Removed last reference to internal::kDefaultrefs/pull/1911/headJonathan Wendeborn2018-10-161-1/+0
| |
| * Merge branch 'master' into isniceBrukerJWD2018-10-161-17/+103
| |\ | |/ |/|
| * Don't fully qualify enum memberJonathan Wendeborn2018-10-161-2/+1
| |
| * Added Mock::IsNaggy, IsNice, and IsStrictJonathan Wendeborn2018-10-161-0/+30
| |
* | Comments changes, no functionality changesrefs/pull/1740/headGennadiy Civil2018-08-141-2/+1
| |
* | merging refs/pull/1567/headGennadiy Civil2018-04-121-3/+47
| |
* | Remove multiple inheritance from "unintesting call" mock classes.refs/pull/1557/headVictor Costan2018-04-121-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/headMaurice Gilden2017-08-211-1/+0
| |
* | Added "explicit" as per compiler suggestionGennadiy Civil2017-08-201-1/+1
| |
* | Proposing these changes, please reviewGennadiy Civil2017-08-201-12/+9
| | | | | | | | Slightly better names and cleaner tests. Please review
* | Change tabs to spaces in test caseMaurice Gilden2017-08-181-11/+11
| |
* | Switch return type to class without default constructorMaurice Gilden2017-08-181-1/+7
| |
* | Fix test if exceptions are not supportedMaurice Gilden2017-08-181-0/+6
| |
* | adds test for NiceMock with unknown return valueMaurice Gilden2017-08-181-0/+15
| |
* | Use std::string and ::string explicitly in gtest and gmock code.refs/pull/1089/headNico Weber2017-05-151-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/ subdirBilly Donahue2015-08-251-0/+424