misterg
81f0026066
Googletest export
...
Internal Change
PiperOrigin-RevId: 225231727
2018-12-13 16:00:11 -05:00
Abseil Team
6ef5913813
Googletest export
...
The gmock matchers have a concept of MatchAndExpain; where the details of the
matching are written to a "result listener". A matcher can avoid creating
expensive debug info by checking result_listener->IsInterested(); but,
unfortunately, the default matcher code (called from EXPECT_THAT) is always
"interested".
This change implements EXPECT_THAT matching to first run the matcher in a "not
interested" mode; and then run it a second time ("interested") only if the
match fails.
PiperOrigin-RevId: 225036073
2018-12-12 11:54:22 -05:00
misterg
6cbd3753dc
Googletest export
...
rollback of 224929783
PiperOrigin-RevId: 225008559
2018-12-11 11:36:30 -05:00
Abseil Team
06bb8d4d6d
Googletest export
...
The gmock matchers have a concept of MatchAndExpain; where the details of the
matching are written to a "result listener". A matcher can avoid creating
expensive debug info by checking result_listener->IsInterested(); but,
unfortunately, the default matcher code (called from EXPECT_THAT) is always
"interested".
This change implements EXPECT_THAT matching to first run the matcher in a "not
interested" mode; and then run it a second time ("interested") only if the
match fails.
PiperOrigin-RevId: 224929783
2018-12-11 10:11:01 -05:00
Abseil Team
3d71ab4c37
Googletest export
...
Deduce SizeType for SizeIs() from the return value of the size() member function
PiperOrigin-RevId: 223835674
2018-12-04 09:45:03 -05:00
Abseil Team
26743363be
Googletest export
...
Applied fixes for ClangTidy modernize-use-override and modernize-use-using.
PiperOrigin-RevId: 223800219
2018-12-03 12:54:11 -05:00
Abseil Team
a42cdf2abd
Googletest export
...
Replace pump'd Args() matcher with variadic templates.
PiperOrigin-RevId: 223794430
2018-12-03 12:54:02 -05:00
misterg
a3013cceff
Googletest export
...
Fix broken OSS build
PiperOrigin-RevId: 222244158
2018-11-20 13:30:32 -05:00
Abseil Team
f7779eb3cb
Googletest export
...
Remove unintended dependency.
PiperOrigin-RevId: 222243874
2018-11-20 13:30:24 -05:00
Abseil Team
64368e0584
Googletest export
...
Remove redundant Base/Derived types.
PiperOrigin-RevId: 222243634
2018-11-20 13:30:16 -05:00
misterg
b492666068
Googletest export
...
Internal Change
PiperOrigin-RevId: 222123106
2018-11-20 13:29:55 -05:00
Abseil Team
c2989fe29b
Googletest export
...
Add stringization based tests for gmock-pp.h macros
PiperOrigin-RevId: 221961835
2018-11-20 13:29:47 -05:00
Abseil Team
5dab7be70d
Googletest export
...
Validate spec modifiers.
PiperOrigin-RevId: 221810235
2018-11-20 13:29:40 -05:00
Abseil Team
aac18185eb
Googletest export
...
Upgrade WithArgs family of actions to C++11.
PiperOrigin-RevId: 221671690
2018-11-20 13:29:12 -05:00
Abseil Team
c5f08bf919
Googletest export
...
One macro to rule them all.
PiperOrigin-RevId: 221462515
2018-11-15 16:11:19 -05:00
Gennadiy Civil
7a0680dc22
Merge pull request #1959 from robinlinden:remove-msvc-workarounds
...
PiperOrigin-RevId: 221356626
2018-11-13 21:10:42 -05:00
Robin Lindén
826656b25f
Remove workarounds for unsupported MSVC versions
2018-11-10 15:20:26 +01:00
krzysio
105579a6e4
Googletest export
...
Improve Bazel build files.
New target gtest_prod allows access to the FRIEND_TEST macro without depending on the entirety of GTest in production executables. Additionally, duplicate config_setting rules were removed and formatting was adjusted.
PiperOrigin-RevId: 220279205
2018-11-07 14:37:18 -05:00
misterg
e857f9cdd9
Googletest export
...
Remove scoped_ptr replace with std::unique_ptr
PiperOrigin-RevId: 219291284
2018-10-30 21:20:43 -04:00
Gennadiy Civil
e9085769d4
Merge pull request #1941 from barkovv:master
...
PiperOrigin-RevId: 219134349
2018-10-29 13:46:24 -04:00
misterg
80b43d900b
Googletest export
...
Remove linked_ptr and use std::shared_ptr instead
PiperOrigin-RevId: 219129336
2018-10-29 13:46:16 -04:00
Vadim Barkov
3feffddd1e
Replaced all NULLs with nullptr in googlemock
2018-10-28 03:27:51 +03:00
Abseil Team
b57c703963
Googletest export
...
Remove linked_ptr and use std::shared_ptr instead
PiperOrigin-RevId: 218618184
2018-10-26 14:19:59 -04:00
misterg
a50e4f05b3
Googletest export
...
Remove linked_ptr and use std::shared_ptr instead
PiperOrigin-RevId: 218571466
2018-10-26 14:19:51 -04:00
Gennadiy Civil
20eaf6e3a9
Merge pull request #1911 from BrukerJWD:isnice
...
PiperOrigin-RevId: 218384341
2018-10-23 15:13:42 -04:00
Jonathan Wendeborn
0cefda7749
Removed last reference to internal::kDefault
2018-10-16 08:51:33 +02:00
BrukerJWD
8c82ba48e4
Merge branch 'master' into isnice
2018-10-16 08:37:56 +02:00
Jonathan Wendeborn
6bbf911a8d
Don't fully qualify enum member
2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
67a240a107
Added Mock::IsNaggy, IsNice, and IsStrict
2018-10-16 08:07:15 +02:00
Abseil Team
bc6a4ce380
Project import generated by Copybara.
...
PiperOrigin-RevId: 216423319
2018-10-11 12:44:00 -04:00
misterg
0e71eb069a
Internal Change
...
PiperOrigin-RevId: 216417182
2018-10-11 12:43:52 -04:00
misterg
78761b58fc
Remove non-variadic pre C++11 AnyOf
...
PiperOrigin-RevId: 216411381
2018-10-09 16:30:37 -04:00
Abseil Team
7d3b73c85a
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
4ac07de8de
Fixing AllOfMatches test, where it properly belongs
...
PiperOrigin-RevId: 216193701
2018-10-08 17:07:05 -04:00
misterg
fab35920ad
Remove non-variadic pre C++11 AllOf
...
PiperOrigin-RevId: 216183352
2018-10-08 10:51:03 -04:00
Abseil Team
4bb49ed640
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
7796273056
Merge 86fe8a25eb5a6e4546f9e39cf23a5c764217bf85 into 440527a61e
...
Closes #1867
PiperOrigin-RevId: 215392714
2018-10-02 13:03:35 -04:00
Abseil Team
ffc9baeb4c
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
a0e62d9f1a
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
265efde9a5
Comments changes, no functionality changes.
2018-08-14 15:04:11 -04:00
Gennadiy Civil
a3c0dd0f4d
Comments changes, no functionality changes
2018-08-14 14:04:07 -04:00
Gennadiy Civil
5eb263569b
Update gmock_output_test.py
2018-08-09 15:24:43 -04:00
Gennadiy Civil
063a90b391
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
b78c3b8e00
small cleanup, np functional changes
2018-08-07 10:38:41 -04:00
Gennadiy Civil
24edf4e3bf
automatic code sync mgt, comment only
2018-08-06 15:40:21 -04:00
Gennadiy Civil
539ee4bc54
Formatting changes and upstreaming one test
2018-08-01 11:07:22 -04:00
Gennadiy Civil
ed1edf641d
Formatting changes, code sync
2018-07-25 10:24:13 -04:00
Gennadiy Civil
a02af2f689
code merge
2018-07-20 11:28:58 -04:00
Gennadiy Civil
0c17888bcf
code sync
2018-07-19 12:42:39 -04:00
Gennadiy Civil
3530ab9e43
Code sync
2018-07-18 11:51:14 -04:00
Gennadiy Civil
8d07cfd053
Code sync, mostly formatting and removing outdates
2018-07-18 11:30:36 -04:00
Adrian Moran
cbd07191f4
Put ifdef guard after the includes.
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-13 08:53:03 +02:00
Adrian Moran
0acdf79642
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
93bfdde0ee
Fix issue #1654 .
...
Signed-off-by: Adrian Moran <amoran@ikerlan.es>
2018-07-11 14:59:01 +02:00
Gennadiy Civil
8977af0ecf
formatting changes
2018-05-23 11:49:11 -04:00
Gennadiy Civil
28c91e2cea
Formatting changes
2018-05-23 11:03:31 -04:00
Scott Graham
a9653c401e
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
9af3793103
merged
2018-04-25 13:16:19 -04:00
Gennadiy Civil
b539167cf0
merging,
2018-04-25 13:10:41 -04:00
dnsunderland
08cb06b197
Merge branch 'master' into parameterless
2018-04-18 16:32:31 -07:00
David Sunderland
f437f8ca0d
Clone of unsubmitted cr/176529515. Introduce parameterless expectations.
2018-04-18 19:28:56 -04:00
Gennadiy Civil
4707c0ffd4
193353312
2018-04-18 10:36:12 -04:00
Gennadiy Civil
80d6e26a9c
cl/193060888
2018-04-17 19:32:15 -04:00
Gennadiy Civil
5dccf6b79e
http://cl/193060888
2018-04-17 16:22:35 -04:00
Gennadiy Civil
dff32aff97
http://cl/193060888
2018-04-17 16:12:04 -04:00
Gennadiy Civil
ec425d7160
typo
2018-04-16 12:00:37 -04:00
Gennadiy Civil
e4ab316c85
more msvc
2018-04-16 11:52:22 -04:00
Gennadiy Civil
1944bc0f51
typo
2018-04-16 11:41:36 -04:00
Gennadiy Civil
e9eff488f9
msvc warnings
2018-04-16 11:32:16 -04:00
Gennadiy Civil
bd2a1aed03
merging gmock generated matchers
2018-04-16 11:18:49 -04:00
Gennadiy Civil
9fba103156
merging, testing, this should be it
2018-04-16 10:42:08 -04:00
Gennadiy Civil
1c6e68cf6c
merging
2018-04-16 10:34:07 -04:00
Gennadiy Civil
26c10dc7e6
merging
2018-04-16 10:16:48 -04:00
Gennadiy Civil
d84eb86df5
more pizza
2018-04-13 16:04:34 -04:00
Gennadiy Civil
f45728a5ac
more OSX pizzas
2018-04-13 15:48:57 -04:00
Gennadiy Civil
b74a1af00f
osx pizzas
2018-04-13 11:49:37 -04:00
Gennadiy Civil
f9bd6180de
merging gmock actions test
2018-04-13 11:02:55 -04:00
Gennadiy Civil
0bfa823785
merging, gmock actions test
2018-04-13 11:02:25 -04:00
Gennadiy Civil
2dc576ec55
merging
2018-04-13 09:16:40 -04:00
Gennadiy Civil
f7330f9f14
more fixing osx libstd++ bugs
2018-04-12 17:00:31 -04:00
Gennadiy Civil
65380492b2
fixing
2018-04-12 16:32:03 -04:00
Gennadiy Civil
dc4f5638c2
merging, fix OSX issue
2018-04-12 15:45:21 -04:00
Gennadiy Civil
092ca91072
merging
2018-04-12 14:46:57 -04:00
Gennadiy Civil
a79851f2c2
merging
2018-04-12 14:00:38 -04:00
Gennadiy Civil
fa658e0cc0
merging
2018-04-12 13:42:47 -04:00
Gennadiy Civil
c67f51b5dc
msvc
2018-04-12 11:32:17 -04:00
Gennadiy Civil
9b5940e040
revert this one
2018-04-12 10:28:02 -04:00
Gennadiy Civil
b2d81b4fb2
merge, ... gmock-matchers test
2018-04-12 09:45:07 -04:00
Gennadiy Civil
07f3bdd4c9
Merge branch 'master' of https://github.com/google/googletest
2018-04-12 09:13:38 -04:00
Gennadiy Civil
e77deb29a6
small cleanup
2018-04-12 09:12:02 -04:00
Victor Costan
1324e2d706
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
6a7573a7de
more
2018-04-11 09:55:36 -04:00
Gennadiy Civil
039d9b54c2
pizza work, cont
2018-04-11 09:47:38 -04:00
Gennadiy Civil
f15fd9610b
osx pizzas, cont
2018-04-11 09:33:51 -04:00
Gennadiy Civil
b15be9a819
fixing osx pizza
2018-04-11 09:20:48 -04:00
Gennadiy Civil
9bc82ce725
merging
2018-04-10 16:22:50 -04:00
Gennadiy Civil
39c58da187
merge
2018-04-10 16:10:34 -04:00
Gennadiy Civil
e1071eb949
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
ca54b67303
Revert "gmock actions 2"
2018-04-09 22:10:12 -04:00
Gennadiy Civil
64d24b810f
... and this
2018-04-09 16:24:30 -04:00
Gennadiy Civil
05b5a53898
formatting
2018-04-09 15:50:19 -04:00
Gennadiy Civil
2de24fbf7a
tuning
2018-04-09 15:39:12 -04:00
Gennadiy Civil
055f32199a
tuning
2018-04-09 15:38:38 -04:00
Gennadiy Civil
44da2b9ac5
cont
2018-04-09 15:23:00 -04:00
Gennadiy Civil
e93a0ece26
msvc
2018-04-09 13:51:01 -04:00
Gennadiy Civil
c4684b49cf
more msvc
2018-04-09 12:03:40 -04:00
Gennadiy Civil
431bfdcaf4
msvc 14
2018-04-09 11:48:02 -04:00
Gennadiy Civil
8bc7c631e8
testing msvc again
2018-04-09 11:35:01 -04:00
Gennadiy Civil
c4e3d77ddc
More msvc 14
2018-04-09 11:22:11 -04:00
Gennadiy Civil
5fe8de5ded
more warnings
2018-04-06 11:40:04 -04:00
Gennadiy Civil
88fc7d7552
merging gmock-actions 2
2018-04-06 09:50:01 -04:00
Gennadiy Civil
fe402c2779
Merging gMock, 2
2018-04-05 16:09:17 -04:00
Gennadiy Civil
7045138a0d
Have to wait for this one
2018-04-05 11:59:59 -04:00
Gennadiy Civil
66eaf9f0eb
Have to wait for this one
2018-04-05 11:55:25 -04:00
Gennadiy Civil
af93d59eb7
Merging matchers test
2018-04-05 11:35:20 -04:00
Gennadiy Civil
0cd6a4f5f5
Merging matchers test
2018-04-05 11:34:19 -04:00
Gennadiy Civil
d81b6a0c4c
bad cut/paste
2018-04-04 15:46:04 -04:00
Gennadiy Civil
a608d4a362
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:44:27 -04:00
Gennadiy Civil
6f4e93943a
More on MSVC warning C4503, decorated name length exceeded
2018-04-04 15:29:05 -04:00
Gennadiy Civil
5b3d27729b
Address MSVC warning C4503, decorated name length exceeded, name was truncated
2018-04-04 15:07:52 -04:00
Gennadiy Civil
aa14cc4285
Fixing build break on MSVC
2018-04-04 14:48:06 -04:00
Gennadiy Civil
e55089ec11
merging gmock matchers 1
2018-04-04 14:05:00 -04:00
Gennadiy Civil
b7c568326c
merging, gmock -1
2018-03-22 15:35:37 -04:00
Gennadiy Civil
af463c43ac
More merges, removing old dead code
2018-03-13 11:13:37 -04:00
Gennadiy Civil
a518bd5cf2
Merge branch 'master' of https://github.com/google/googletest
2018-03-05 12:26:24 -05:00
Gennadiy Civil
0d5e01ad7b
Merges-1
2018-03-05 12:26:15 -05:00
Gennadiy Civil
f8fbe1c821
Merge branch 'master' into unsigned-wchar
2018-03-01 11:18:17 -05:00
Xiaoyi Zhang
576d689c19
Merge branch 'master' into variant_matcher
2018-02-27 16:03:36 -05:00
Gennadiy Civil
2bd1750ba7
gmock merging -2
2018-02-27 13:51:09 -05:00
Xiaoyi Zhang
190e2cdd0b
Add matcher for std::variant.
2018-02-27 11:36:21 -05:00
Scott Graham
567b40eeb1
Try to handle unsigned wchar_t (arm) a bit better
2018-02-23 12:28:09 -08:00
Gennadiy Civil
225e6741ac
moving JoinAsTuple to internal
2018-02-12 16:42:12 -05:00
Gennadiy Civil
22a115055a
Merge pull request #1446 from tholsapp/master
...
Fixed typos
2018-02-09 11:34:26 -05:00
Gennadiy Civil
ec7faa943d
merges
2018-02-09 10:41:09 -05:00
Troy Holsapple
c8510504dd
Fixed typos
2018-02-07 22:06:00 -08:00
Gennadiy Civil
6c0c389601
Adding tests to googlemock bazel
2018-01-26 16:30:57 -05:00
Gennadiy Civil
fbb48a7708
Code merges
2018-01-26 11:57:58 -05:00
Loo Rong Jie
cbd15d417e
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc
...
and x64_windows_msvc
2018-01-09 08:29:44 +08:00
Gennadiy Civil
6b4967a23a
Merge branch 'master' into missing-declarations
2018-01-04 22:01:38 -05:00
Gennadiy Civil
1c09831acc
upstreaming cl 124976692
2018-01-03 16:57:05 -05:00
David Benjamin
b3d9be5c1d
Pass the -Wmissing-declarations warning.
...
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
2018-01-03 14:50:22 -05:00
Carlos O'Ryan
cf3adad594
Add licenses() directive for googlemock/tests.
...
Without the directive embedding googletest into third_party breaks
any //... target.
2017-12-08 12:08:25 -05:00
Arkady Shapkin
840c711e7b
Fix gmock tests when std::unary_function unavailable
2017-10-25 16:04:01 +03:00
Arkadiy Shapkin
2641b021fc
Fix tests with VS2015 and VS2017
2017-10-25 16:04:01 +03:00
Jonathan Wakely
b70cf1a663
Use gender-neutral pronouns in comments and docs
2017-09-27 13:31:13 +01:00
Alyssa Wilk
fa5d3b3845
Applying lint checks from upstream google3
2017-08-28 16:13:41 -04:00
Alyssa Wilk
c00373320d
Merge branch 'refs/heads/master' into flag-default
2017-08-28 16:10:12 -04:00
Roman Perepelitsa
966b549c88
Support ref-qualified member functions in Property().
2017-08-22 16:06:26 +02:00
Maurice Gilden
1ee8079651
Remove unused variable
2017-08-21 10:10:14 +02:00
Gennadiy Civil
3cf65b5d86
Added "explicit" as per compiler suggestion
2017-08-20 15:20:13 -04:00