eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,876 Commits 13 Branches 14 Tags 23 MiB
0293e00f1c
Commit Graph

213 Commits

Author SHA1 Message Date
misterg
3b4c2f167b Googletest export 
Remove scoped_ptr replace with std::unique_ptr

PiperOrigin-RevId: 219291284
 2018-10-30 21:20:43 -04:00
Gennadiy Civil
53bd2a5119 Merge pull request #1941 from barkovv:master 
PiperOrigin-RevId: 219134349
 2018-10-29 13:46:24 -04:00
misterg
7e9920053e Googletest export 
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 219129336
 2018-10-29 13:46:16 -04:00
Vadim Barkov
dbe9230f64 Replaced all NULLs with nullptr in googlemock 2018-10-28 03:27:51 +03:00
Abseil Team
63ad9ec911 Googletest export 
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218618184
 2018-10-26 14:19:59 -04:00
misterg
55c37984f7 Googletest export 
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218571466
 2018-10-26 14:19:51 -04:00
Gennadiy Civil
4887e99ed1 Merge pull request #1911 from BrukerJWD:isnice 
PiperOrigin-RevId: 218384341
 2018-10-23 15:13:42 -04:00
Jonathan Wendeborn
3dc4516fa1 Removed last reference to internal::kDefault 2018-10-16 08:51:33 +02:00
BrukerJWD
55d2fbfe0d Merge branch 'master' into isnice 2018-10-16 08:37:56 +02:00
Jonathan Wendeborn
ad519f83db Don't fully qualify enum member 2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
7014070b27 Added Mock::IsNaggy, IsNice, and IsStrict 2018-10-16 08:07:15 +02:00
Abseil Team
697d8f386e Project import generated by Copybara. 
PiperOrigin-RevId: 216423319
 2018-10-11 12:44:00 -04:00
misterg
82922524f4 Internal Change 
PiperOrigin-RevId: 216417182
 2018-10-11 12:43:52 -04:00
misterg
b208478537 Remove non-variadic pre C++11 AnyOf 
PiperOrigin-RevId: 216411381
 2018-10-09 16:30:37 -04:00
Abseil Team
dd4e36663c Unconditionally use std::tuple. 
Remove all mention of TR1 tuple and our own implementation of tuple.

PiperOrigin-RevId: 216395043
 2018-10-09 16:25:58 -04:00
misterg
f4fea9ea8c Fixing AllOfMatches test, where it properly belongs 
PiperOrigin-RevId: 216193701
 2018-10-08 17:07:05 -04:00
misterg
a48e4d2375 Remove non-variadic pre C++11 AllOf 
PiperOrigin-RevId: 216183352
 2018-10-08 10:51:03 -04:00
Abseil Team
7a6bc673ea Apply clang-tidy modernize-use-nullptr to googletest. 
Now that googletest has moved to C++11, it should no longer
use NULL or 0 for the null pointer. This patch converts all
such usages to nullptr using clang-tidy.

This prevents LLVM from issuing -Wzero-as-null-pointer-constant
warnings.

PiperOrigin-RevId: 215814400
 2018-10-05 12:54:14 -04:00
Marco Bubke
db0cd0e1ee Merge 86fe8a25eb into 440527a61e 
Closes #1867

PiperOrigin-RevId: 215392714
 2018-10-02 13:03:35 -04:00
Abseil Team
ccce843d80 Googletest export 
Treat default-constructed string_view same as constructed from "".
In the context of string comparison (e.g. HasSubstr, StartsWith, EndsWith,
etc.), a default-constructed string_view (nullptr) should be semantically same
as a empty string "".

PiperOrigin-RevId: 212816839
 2018-09-14 11:13:48 -04:00
Abseil Team
b8dfc2efee No longer require a functor passed to ResultOf matcher to define result_of type. 
This makes ResultOf more convenient to use. In particular, the matcher now accepts
lambdas.

PiperOrigin-RevId: 210118509
 2018-08-27 12:22:26 -04:00
Gennadiy Civil
f0bcc9b875 Comments changes, no functionality changes. 2018-08-14 15:04:11 -04:00
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
97eced2f22 Update gmock_output_test.py 2018-08-09 15:24:43 -04:00
Gennadiy Civil
509653b8f6 Formatting change for auto code management, no functionality changes 
Merge branch 'master' of https://github.com/google/googletest
 2018-08-09 10:51:49 -04:00
Gennadiy Civil
7fd9b32610 small cleanup, np functional changes 2018-08-07 10:38:41 -04:00
Gennadiy Civil
4747aa2321 automatic code sync mgt, comment only 2018-08-06 15:40:21 -04:00
Gennadiy Civil
b9f30b8d67 Formatting changes and upstreaming one test 2018-08-01 11:07:22 -04:00
Gennadiy Civil
c0f448fde4 Formatting changes, code sync 2018-07-25 10:24:13 -04:00
Gennadiy Civil
68683d415c code merge 2018-07-20 11:28:58 -04:00
Gennadiy Civil
21a1dae1b5 code sync 2018-07-19 12:42:39 -04:00
Gennadiy Civil
c38120ec6f Code sync 2018-07-18 11:51:14 -04:00
Gennadiy Civil
db4c08167d Code sync, mostly formatting and removing outdates 2018-07-18 11:30:36 -04:00
Adrian Moran
e7e574767d Put ifdef guard after the includes. 
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
 2018-07-13 08:53:03 +02:00
Adrian Moran
0201c9ddde Avoid full test in no exceptions are enabled. 
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
 2018-07-12 15:10:08 +02:00
Adrian Moran
5cad1bb286 Fix issue #1654. 
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
 2018-07-11 14:59:01 +02:00
Gennadiy Civil
3bde81a48b formatting changes 2018-05-23 11:49:11 -04:00
Gennadiy Civil
5bf664a82c Formatting changes 2018-05-23 11:03:31 -04:00
Scott Graham
7550a4c571 Fix gmock not building when -fno-rtti 
Fixes issue #1554. This is internal cl/195020996.
 2018-05-02 11:14:39 -07:00
Gennadiy Civil
63e8124d63 merged 2018-04-25 13:16:19 -04:00
Gennadiy Civil
edaeb8bc88 merging, 2018-04-25 13:10:41 -04:00
dnsunderland
e7ef46473f Merge branch 'master' into parameterless 2018-04-18 16:32:31 -07:00
David Sunderland
cf7b25961a Clone of unsubmitted cr/176529515. Introduce parameterless expectations. 2018-04-18 19:28:56 -04:00
Gennadiy Civil
609802ef23 193353312 2018-04-18 10:36:12 -04:00
Gennadiy Civil
cdc2f4b725 cl/193060888 2018-04-17 19:32:15 -04:00
Gennadiy Civil
7690cb75a0 http://cl/193060888 2018-04-17 16:22:35 -04:00
Gennadiy Civil
4308455071 http://cl/193060888 2018-04-17 16:12:04 -04:00
Gennadiy Civil
cc258bb44d typo 2018-04-16 12:00:37 -04:00
Gennadiy Civil
9290af3a03 more msvc 2018-04-16 11:52:22 -04:00
Gennadiy Civil
47e8442193 typo 2018-04-16 11:41:36 -04:00
Gennadiy Civil
532cd75c14 msvc warnings 2018-04-16 11:32:16 -04:00
Gennadiy Civil
b15c15ac6e merging gmock generated matchers 2018-04-16 11:18:49 -04:00
Gennadiy Civil
e240d4a180 merging, testing, this should be it 2018-04-16 10:42:08 -04:00
Gennadiy Civil
220fa3589e merging 2018-04-16 10:34:07 -04:00
Gennadiy Civil
f2738b31b2 merging 2018-04-16 10:16:48 -04:00
Gennadiy Civil
0d71fbfef1 more pizza 2018-04-13 16:04:34 -04:00
Gennadiy Civil
e5adb95cc5 more OSX pizzas 2018-04-13 15:48:57 -04:00
Gennadiy Civil
59b7952275 osx pizzas 2018-04-13 11:49:37 -04:00
Gennadiy Civil
cd1ceb89fe merging gmock actions test 2018-04-13 11:02:55 -04:00
Gennadiy Civil
b88d415261 merging, gmock actions test 2018-04-13 11:02:25 -04:00
Gennadiy Civil
bbb66b6d85 merging 2018-04-13 09:16:40 -04:00
Gennadiy Civil
3b75be525c more fixing osx libstd++ bugs 2018-04-12 17:00:31 -04:00
Gennadiy Civil
1d26f6b670 fixing 2018-04-12 16:32:03 -04:00
Gennadiy Civil
278da818bb merging, fix OSX issue 2018-04-12 15:45:21 -04:00
Gennadiy Civil
2cb8105063 merging 2018-04-12 14:46:57 -04:00
Gennadiy Civil
d6bfdebf36 merging 2018-04-12 14:00:38 -04:00
Gennadiy Civil
c5ccc8f35f merging 2018-04-12 13:42:47 -04:00
Gennadiy Civil
b8af6195d7 msvc 2018-04-12 11:32:17 -04:00
Gennadiy Civil
acfc19b62a revert this one 2018-04-12 10:28:02 -04:00
Gennadiy Civil
6ebe245ae7 merge, ... gmock-matchers test 2018-04-12 09:45:07 -04:00
Gennadiy Civil
06f3a861b6 Merge branch 'master' of https://github.com/google/googletest 2018-04-12 09:13:38 -04:00
Gennadiy Civil
dea55d0bf0 small cleanup 2018-04-12 09:12:02 -04:00
Victor Costan
75b1be4ad1 Remove multiple inheritance from "unintesting call" mock classes. 
Internal CL 156157936, which was published in commit
fe402c2779, 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
 2018-04-12 00:48:30 -07:00
Gennadiy Civil
d0923d2754 more 2018-04-11 09:55:36 -04:00
Gennadiy Civil
720527ec6c pizza work, cont 2018-04-11 09:47:38 -04:00
Gennadiy Civil
1b1d0bc874 osx pizzas, cont 2018-04-11 09:33:51 -04:00
Gennadiy Civil
1d07a24ea0 fixing osx pizza 2018-04-11 09:20:48 -04:00
Gennadiy Civil
fed44cc0c2 merging 2018-04-10 16:22:50 -04:00
Gennadiy Civil
346f1f5734 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
ec1df5b40f RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 2018-04-10 15:57:16 -04:00
Gennadiy Civil
3f59eb6a59 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil
ca798e29e1 ... and this 2018-04-09 16:24:30 -04:00
Gennadiy Civil
d1a6cb501e formatting 2018-04-09 15:50:19 -04:00
Gennadiy Civil
9d1fb0287a tuning 2018-04-09 15:39:12 -04:00
Gennadiy Civil
2df7aec89a tuning 2018-04-09 15:38:38 -04:00
Gennadiy Civil
781a196953 cont 2018-04-09 15:23:00 -04:00
Gennadiy Civil
6d43c5d6dd msvc 2018-04-09 13:51:01 -04:00
Gennadiy Civil
2852279601 more msvc 2018-04-09 12:03:40 -04:00
Gennadiy Civil
7ca71c7766 msvc 14 2018-04-09 11:48:02 -04:00
Gennadiy Civil
96af90153f testing msvc again 2018-04-09 11:35:01 -04:00
Gennadiy Civil
d3eb463a53 More msvc 14 2018-04-09 11:22:11 -04:00
Gennadiy Civil
c69e76c165 more warnings 2018-04-06 11:40:04 -04:00
Gennadiy Civil
7857d8da7a merging gmock-actions 2 2018-04-06 09:50:01 -04:00
Gennadiy Civil
f906f8446e Merging gMock, 2 2018-04-05 16:09:17 -04:00
Gennadiy Civil
87494ebad5 Have to wait for this one 2018-04-05 11:59:59 -04:00
Gennadiy Civil
22aa2e3632 Have to wait for this one 2018-04-05 11:55:25 -04:00
Gennadiy Civil
0e34a61d3b Merging matchers test 2018-04-05 11:35:20 -04:00
Gennadiy Civil
cef7e53700 Merging matchers test 2018-04-05 11:34:19 -04:00
Gennadiy Civil
ea3f268c4f bad cut/paste 2018-04-04 15:46:04 -04:00
Gennadiy Civil
2c88d98934 More on MSVC warning C4503, decorated name length exceeded 2018-04-04 15:44:27 -04:00