3party/googletest
0
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-01-08 13:15:43 +08:00
Code Issues Projects Releases Wiki Activity
3,168 Commits 7 Branches 27 Tags 37 MiB
Commit Graph

228 Commits

Author SHA1 Message Date
Matt Calabrese
88ba008c23 Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355 
PiperOrigin-RevId: 284234675
 2019-12-13 12:57:35 -05:00
Mark Barolak
1d563578c8 Merge pull request #2594 from kuzkry:remove-workaround_msvc-unneeded-const-dropping 
PiperOrigin-RevId: 283979494
 2019-12-05 14:41:50 -05:00
Gennadiy Rozental
b155875f32 Merge pull request #2583 from ChristophStrehle:master 
PiperOrigin-RevId: 282817206
 2019-11-27 16:20:38 -05:00
Gennadiy Rozental
db13ff1f0b Merge pull request #2597 from kuzkry:remove-workaround_Nokia-Sybian-SafeMatcherCastImpl 
PiperOrigin-RevId: 282581402
 2019-11-26 15:47:21 -05:00
Abseil Team
717ce7feb8 Googletest export 
Use standard C++11 integer types in gtest-port.h.

Remove testing::internal::{Int,Uint}{32,64} in favor of types
guaranteed to be in <cstdint> since C++11.

Tests for built-in integer type coverage are switched from
{Int,Uint}64 to [unsigned] long long, which is guaranteed by
C++11 to exist and be at least 64-bit wide.

PiperOrigin-RevId: 281565263
 2019-11-22 16:33:15 -05:00
Krystian Kuzniarek
bbbc5d8a4b remove Nokia's Symbian compiler workaround: SafeMatcherCastImpl 2019-11-22 17:25:34 +01:00
Krystian Kuzniarek
e0c80b0a6e consistency fix for SafeMatcherCastImpl member functions 2019-11-22 17:25:34 +01:00
Krystian Kuzniarek
6748df1eab remove MSVC workaround: cease const dropping 2019-11-22 17:17:41 +01:00
Krystian Kuzniarek
ecefcbd4aa remove MSVC workaround: warning 4355 2019-11-22 17:15:23 +01:00
Christoph Strehle
6a9d6d5c28 Fix compile break for Microsoft Visual Studio 2017 v141 
This is a workaround, for those who have to compile with v141 build tools,
for a bug in msvc that the compiler can't compile the WithArgsAction.

see the following link for more details:
https://developercommunityapi.westus.cloudapp.azure.com/content/problem/420339/googlemocks-withargs-doesnt-compile-with-permissiv.html
 2019-11-21 14:58:09 +01:00
Abseil Team
50cfbb726b Googletest export 
Update stale comments to point to proper location.

PiperOrigin-RevId: 281157036
 2019-11-19 11:25:59 -05:00
Krystian Kuzniarek
f658561ef2 fix a typo 2019-11-02 01:18:21 +01:00
vslashg
057ee5063d Merge pull request #2533 from thejcannon:noexcept_spec 
PiperOrigin-RevId: 277924721
 2019-11-01 16:02:05 -04:00
Abseil Team
2db3df9c4f Googletest export 
Change variable name to match comment.

PiperOrigin-RevId: 277713621
 2019-10-31 15:11:41 -04:00
Abseil Team
e2fc3a9c9c Googletest export 
Tolerate std::string's explicit copy construction from std::string_view.

PiperOrigin-RevId: 277583394
 2019-10-31 15:11:31 -04:00
Abseil Team
755f853c6b Googletest export 
Avoid temporary matcher instances.
They are unnecessary and can be relatively more expensive than the rest of the
algorithm.

PiperOrigin-RevId: 277084853
 2019-10-29 16:51:31 -04:00
vslashg
b5fb5ba05c Merge pull request #2527 from PiotrNycz:gmock_prevent_return_ref_to_store_temporaries_2 
PiperOrigin-RevId: 277061341
 2019-10-29 16:51:12 -04:00
Abseil Team
37f3227831 Googletest export 
Add a matcher `testing::ReturnRoundRobin` which, on each call, returns the next element in the sequence, restarting at the beginning once it has reached the end.

PiperOrigin-RevId: 276312136
 2019-10-23 15:54:45 -04:00
Joshua Cannon
676d0444bf Revert "Merge pull request #2498 from thejcannon:noexcept_spec" 
This reverts commit ba513d2c9525a7c986c115ed5d603f2cf17c6016, reversing
changes made to a3ca5b9e0bf9abc3bc639684966085c4d3182578.
 2019-10-23 14:46:46 -05:00
vslashg
8bab7883a6 Merge pull request #2514 from thejcannon:msvc_macro_issue 
PiperOrigin-RevId: 276134684
 2019-10-23 13:35:26 -04:00
Piotr Nycz
b11fb80e9e Prevent using ReturnRef on reference to temporary 
Fixed issue: 2471
 2019-10-22 15:58:00 +02:00
Abseil Team
611a321a6e Googletest export 
Remove bool_constant in favor of std::integral_constant<bool, ...>;
The one non-trivial use of bool_constant has been changed to have significantly
fewer template specializations.

PiperOrigin-RevId: 275842490
 2019-10-22 09:38:12 -04:00
Abseil Team
011c4e23d5 Googletest export 
Rolling forward IsNan() matcher with fixes in test for -Wconversion issues. Use
std::nanf and std::nanl where appropriate.
PiperOrigin-RevId: 275523003
 2019-10-22 09:37:46 -04:00
misterg
f966ed1581 Googletest export 
Added IsNan matcher

PiperOrigin-RevId: 275473218
 2019-10-18 11:34:08 -04:00
Abseil Team
1f9edcd969 Googletest export 
Addressing https://github.com/google/googletest/issues/2502

Add MOCK_METHOD support for returning function pointers.

PiperOrigin-RevId: 275323671
 2019-10-18 11:33:59 -04:00
Abseil Team
bbe4b7363b Googletest export 
Added IsNan matcher

PiperOrigin-RevId: 275278634
 2019-10-17 13:08:00 -04:00
Joshua Cannon
e1b67b07f7 Avoid recursive macros 2019-10-11 17:13:24 -05:00
Robert Luberda
3cddd56e19 Add more override keywords 
Mark more functions with "override" keyword, just like
it was done in commit 2460f97152c.

This should prevent compiler from complaining while compiling both
user code, and the googletest code itself with the -Wsuggest-override
option turned on; with the exception of:
 * calls to new MOCK_METHOD() in test/gmock-function-mocker_test.cc
 * calls to old MOCK_METHODx()/MOCK_CONST_METHODx() in other
   unit test files.

Closes #2493
 2019-10-11 23:45:31 +02:00
Joshua Cannon
3e813465a4 Removing extraneous parenthesis 2019-10-11 12:37:59 -05:00
Joshua Cannon
f8961b99f4 Evaluate and cat NARG in different macros 2019-10-11 12:13:15 -05:00
Joshua Cannon
d935e8e3ed Fix preprocessor tests 2019-10-11 10:41:47 -05:00
Joshua Cannon
c081ceebfb Workaround MSVC VA_ARGS weirdness 2019-10-11 09:28:25 -05:00
Gennadiy Civil
ba513d2c95 Merge pull request #2498 from thejcannon:noexcept_spec 
PiperOrigin-RevId: 274155281
 2019-10-11 08:48:11 -04:00
Gennadiy Civil
37905b9d8c Merge pull request #2498 from thejcannon:noexcept_spec 
PiperOrigin-RevId: 274097989
 2019-10-11 07:07:12 -04:00
Abseil Team
ed78e54f38 Googletest export 
Fix the O(n^2) number of instantiations in ElemFromList.
It is now O(n). It still has O(1) instantiation depth.

PiperOrigin-RevId: 273980821
 2019-10-11 07:06:56 -04:00
Gennadiy Civil
cb1d5db1a1 Merge pull request #2448 from kuzkry:bad-googletest-export 
PiperOrigin-RevId: 273585026
 2019-10-10 09:21:38 -04:00
Joshua Cannon
0eadff8a93 Fix spacing 2019-10-07 14:37:39 -05:00
Joshua Cannon
10c1d8c4fa Use the verbatim noexcept spec in MOCKED_METHOD 2019-10-07 14:30:10 -05:00
Abseil Team
cb3f7ce1de Googletest export 
Makes testing::ResultOf() work with non-copyable arguments.

PiperOrigin-RevId: 271222632
 2019-09-27 16:48:33 -04:00
Krystian Kuzniarek
7c2bd3af98 square away the stuff that hasn't been merged in a manual review 
This fixes up ab8f346b (a manual merge) that has abandoned some things
from PR #2395.
 2019-09-16 19:21:37 +02:00
kuzkry
f2fb48c3b3 Googletest export 
Merge 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd into fb49e6c164490a227bbb7cf5223b846c836a0305

Closes #2407

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2407 from kuzkry:StaticAssertTypeEq 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd
PiperOrigin-RevId: 269255328
 2019-09-16 11:47:35 -04:00
Shaindel Schwartz
c7a03daa99 Merge pull request #2387 from kuzkry:iff 
PiperOrigin-RevId: 268693457
 2019-09-12 12:10:51 -04:00
Hosein Ghahremanzadeh
ac24edd6e0 Googletest export 
Merge 4c9ef099b29d2c840c04643cd9662fd7be712f7b into 565f1b848215b77c3732bca345fe76a0431d8b34

Closes #2403

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2403 from IYP-Programer-Yeah:remove-compile-assert-type-equal 4c9ef099b29d2c840c04643cd9662fd7be712f7b
PiperOrigin-RevId: 268681883
 2019-09-12 12:10:41 -04:00
kuzkry
ab8f346b07 Googletest export 
Merge 7f4f58da20e1066a888d3e4bcbef541db798a605 into 90a443f9c2437ca8a682a1ac625eba64e1d74a8a

Closes #2395

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2395 from kuzkry:custom-type-traits-remove_reference 7f4f58da20e1066a888d3e4bcbef541db798a605
PiperOrigin-RevId: 266189044
 2019-09-06 08:00:03 -04:00
Gennadiy Civil
d9c55a48ed Merge pull request #2426 from kuzkry:#2396-postreview 
PiperOrigin-RevId: 265785837
 2019-08-27 21:30:42 -04:00
Gennadiy Civil
fdd6a1dc8c Merge pull request #2382 from kuzkry:dead-metafunction 
PiperOrigin-RevId: 265730482
 2019-08-27 16:59:59 -04:00
misterg
6a3d632f40 Googletest export 
Add tuple version of Optional() matches. This allows Optional() to be used in Pointwise matchers.

PiperOrigin-RevId: 265501882
 2019-08-26 14:43:56 -04:00
Krystian Kuzniarek
38ce18e8e6 post-review to db1b7399 (#2396) 2019-08-24 12:08:13 +02:00
Abseil Team
ed2eef6543 Googletest export 
Add tuple version of Optional() matches. This allows Optional() to be used in Pointwise matchers.

PiperOrigin-RevId: 265110864
 2019-08-23 16:39:21 -04:00
kuzkry
db1b739943 Googletest export 
Merge b8ca465e73ac0954a0c9eec2a84bdd8913d5763b into 90a443f9c2437ca8a682a1ac625eba64e1d74a8a

Closes #2396

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2396 from kuzkry:custom-type-traits-true/false_type-and-bool_constant b8ca465e73ac0954a0c9eec2a84bdd8913d5763b
PiperOrigin-RevId: 265064856
 2019-08-23 16:39:13 -04:00
Xiaoyi Zhang
46525e1e5d Merge pull request #2394 from kuzkry:custom-type-traits-duplication-of-custom-index_sequence 
PiperOrigin-RevId: 264863984
 2019-08-23 16:39:04 -04:00
Xiaoyi Zhang
fb49e6c164 Merge pull request #2393 from kuzkry:custom-type-traits-remove_const 
PiperOrigin-RevId: 264652890
 2019-08-21 17:13:34 -04:00
Krystian Kuzniarek
7bd4a7f3e9 restore mistakenly removed iffs in their explicit form 
Due to confusion arisen from "iff" standing for "if and only if",
this commit uses the latter.
 2019-08-20 12:14:22 +02:00
Gennadiy Civil
d5e9e0c38f Merge pull request #2397 from kuzkry:custom-type-traits-is_reference 
PiperOrigin-RevId: 264193098
 2019-08-19 14:20:11 -04:00
Krystian Kuzniarek
44de869783 remove a dead metafunction 2019-08-16 07:04:49 +02:00
Abseil Team
d44b137fd1 Googletest export 
Remove legacy support for signed wchar_t and unsigned wchar_t.

Clang now errors out on these types as well by default. Rather than making the
condition for these types even more complicated, just remove the tests covering
these types since they don't seem to justify the maintenance burden. We
can reasonably expect these types to work in compilers that support them
without needing specific tests for them since they are treated as standard
integral types.

PiperOrigin-RevId: 263577673
 2019-08-15 17:34:34 -04:00
Krystian Kuzniarek
6a015ca1cb reuse IndexSequence from googletest 2019-08-14 14:21:32 +02:00
Krystian Kuzniarek
ec49fbca4c remove custom implementations of std::is_same 2019-08-14 14:00:44 +02:00
Krystian Kuzniarek
da76d01b98 remove a custom implementation of std::is_reference 2019-08-14 13:33:13 +02:00
Krystian Kuzniarek
364839ab14 remove a custom implementation of std::remove_const 2019-08-14 00:34:04 +02:00
CJ Johnson
07ec69a886 Merge pull request #2359 from kuzkry:superfluous-mutable 
PiperOrigin-RevId: 261947085
 2019-08-06 15:02:42 -04:00
Gennadiy Civil
cc34e8fa7c Merge pull request #2357 from kuzkry:obsolete-documentation 
PiperOrigin-RevId: 261343928
 2019-08-02 13:26:55 -04:00
Abseil Team
da28d30191 Googletest export 
Fix ON_CALL/EXPECT_CALL example comment

PiperOrigin-RevId: 261150884
 2019-08-01 16:05:57 -04:00
Krystian Kuzniarek
637b0411fa remove an excessive mutable type specifier 
MockFunction's private member cannot be reached from outside and all its
non-static member functions are not const.
 2019-08-01 11:33:36 +02:00
Krystian Kuzniarek
287b37f23f update pre-C++11 paragraphs 2019-07-31 08:17:32 +02:00
Krystian Kuzniarek
bf6df7eaee fix typos 2019-07-30 12:52:27 +02:00
Abseil Team
373ed74af5 Googletest export 
Add copyright.

PiperOrigin-RevId: 259997211
 2019-07-25 20:53:34 -04:00
Adam Badura
1f809607b5 Add missing <functional> include 
gmock-spec-builders.h uses std::function (in MockFunction) but did
not include <functional> to provide it. Apparently, it worked since
the header must have been included by something else but better be
safe than sorry.
 2019-07-16 23:15:51 +02:00
misterg
3d9cdd5803 Googletest export 
Fix documentation links

PiperOrigin-RevId: 258389329
 2019-07-16 13:35:16 -04:00
Abseil Team
e4f097b5fb Googletest export 
Update a broken link in a comment.

PiperOrigin-RevId: 257493975
 2019-07-16 11:21:11 -04:00
Gennadiy Civil
5ed950c9e3 Renaming doc files to make the file names more palatable and in preparation for including documentation in sync process 2019-06-19 16:48:38 -04:00
Peter Levine
711fccf831 Don't allow signed/unsigned wchar_t in gcc 9 and later 2019-06-04 01:07:18 -04:00
Abseil Team
3f5b5b8f84 Googletest export 
Remove special case for protocol buffers. It is no longer needed.

PiperOrigin-RevId: 246550795
 2019-05-03 15:11:37 -04:00
David Benjamin
8e9297b503 MSVC C5046 warning is unavailable in MSVC 2015. 
Per the MSVC documentation the warning is new as of Visual Studio 2017,
version 15.8.
https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5046?view=vs-2019

GTest users building on MSVC 2015 or older versions of 2017 will, when
C4616 is enabled, see a warning like:

[...]gtest-matchers.h(53): error C2220: warning treated as error - no 'object' file generated
[...]gtest-matchers.h(53): warning C4619: #pragma warning: there is no warning number '5046'

Guard the mention of 5046 by an _MSC_VER check. VS2017 15.8 corresponds
to an _MSC_VER of 1915.
https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2019
 2019-04-09 18:13:32 -05:00
Abseil Team
d982543131 Googletest export 
Remove support for "global" ::string and ::wstring types.
This support existed for legacy codebases that existed from before namespaces
where a thing. It is no longer necessary.

PiperOrigin-RevId: 241335738
 2019-04-01 15:05:10 -04:00
Abseil Team
f1883b1824 Googletest export 
Remove mention of unused type ProtocolMessage.

PiperOrigin-RevId: 239242706
 2019-03-21 10:43:06 -04:00
Abseil Team
a4b63e7efb Googletest export 
Action helpers need to pass by const& so that they can work with unique_ptr.

PiperOrigin-RevId: 239062671
 2019-03-21 10:42:58 -04:00
Abseil Team
56ef07a203 Googletest export 
Build gmock cleanly with clang -Wextra-semi

For https://crbug.com/926235.
From https://github.com/google/googletest/pull/2139.
Fixes https://github.com/google/googletest/issues/2138.

PiperOrigin-RevId: 235832527
 2019-03-01 16:18:17 -05:00
Gennadiy Civil
bf07131c1d Merge pull request #2041 from ciband:chore/fix_library_json 
PiperOrigin-RevId: 230554814
 2019-01-23 13:27:16 -05:00
Abseil Team
fdc59ffd05 Googletest export 
Add AllOfArray matcher that verifies a value matches all member of some array/container/list/set/..., e.g:
EXPECT_THAT(1, AnyOfArray({1, 2, 3}))
In the simplest form this is identical to AnyOf(1, 2, 3). But unlike that one it works on containers.

Add AnyOfArray matcher that verifies a value matches any member of some
array/container/list/set/...

PiperOrigin-RevId: 230403653
 2019-01-23 13:27:08 -05:00
Abseil Team
569fba4d74 Googletest export 
Make internal FunctionMocker class final

PiperOrigin-RevId: 230332778
 2019-01-22 13:12:13 -05:00
Abseil Team
9518a57428 Googletest export 
Fix mocking method arguments with templated copy constructors.

A previous change removed workarounds for old compilers from googletest and googlemock. Unfortunately, a bit of code that started as a workaround for Symbian's C++ compiler is still needed to avoid copy/move constructor ambiguity when mocking functions with certain argument types.

The test case added by this CL is extracted from Chrome's codebase, and was discovered while attempting to roll googletest.

PiperOrigin-RevId: 229801765
 2019-01-18 14:06:03 -05:00
Abseil Team
0adeadd283 Googletest export 
Refactor the `Invoke` and `InvokeWithoutArgs` actions:
 - Replace pump'd classes and functions with templates.
 - Make the polymorphic actions be polymorphic functors instead.
 - Fix Invoke(Callback*) to work with subclasses of the callbacks, instead of trying to diagnose that in gmock_doctor.

PiperOrigin-RevId: 229604112
 2019-01-17 14:41:08 -05:00
Abseil Team
9acd065a90 Googletest export 
Add move-only argument support to almost all remaining matchers.

PiperOrigin-RevId: 229030728
 2019-01-14 17:02:03 -05:00
Abseil Team
097407fd3c Googletest export 
Deduplicate testing::ReferenceWrapper with std::reference_wrapper.
Minor cleanups in matchers_test.

PiperOrigin-RevId: 229022872
 2019-01-14 17:01:56 -05:00
misterg
f31bf1d362 Googletest export 
Replace testing::internal::ImplicitlyConvertible with std::is_convertible
Fixes #2054

PiperOrigin-RevId: 228334305
 2019-01-08 11:51:05 -05:00
Abseil Team
216c37f057 Googletest export 
Drop generated file gmock-generated-internal-utils.h.

PiperOrigin-RevId: 228232195
 2019-01-08 11:50:56 -05:00
Chris Johnson
0ffa5f9779
Merge branch 'master' into chore/fix_library_json 2019-01-03 21:13:20 -06:00
Chris
4d62b5b9ae fix: Remove Arduino entry points 
Improved flexibility by removing the Arduino entry points in favor of manual calls to setup/loop that the user can call from their entry point.  This is the more common use case for Arudino.

Also added the gtest/gmock_main files to the PlatformIO ignore list since we are not supporting that feature.
 2019-01-03 12:12:19 -06:00
misterg
14c2fba734 Googletest export 
Internal Change

PiperOrigin-RevId: 227575279
 2019-01-02 16:51:40 -05:00
Abseil Team
f8b1c1af17 Googletest export 
Remove the #ifs for old, unsupported and buggy compilers:
* old versions of GCC & MSVC
* Symbian

PiperOrigin-RevId: 227116941
 2019-01-02 16:51:33 -05:00
Abseil Team
34a99e547a Googletest export 
Get rid of code generation for NiceMock / StrictMock.
They got small enough that it doesn't make sense to generate them.

PiperOrigin-RevId: 226455689
 2018-12-21 11:30:20 -05:00
Abseil Team
9494c45e75 Googletest export 
Use std::function to implement type erasure in Action, wrapping the legacy
ActionInterface if necessary.

This makes functors / std::function the primary way to implement Action; the
existing ActionInterface implementations are handled through ActionAdaptor.
The existing actions are not (yet) migrated though; they'll pay the cost of one
additional indirection - but that should be negligible.

PiperOrigin-RevId: 226126137
 2018-12-20 14:09:39 -05:00
Abseil Team
e26a3fa13c Googletest export 
Unifdef c++11-related macros from googletest now that it requires C++11.

PiperOrigin-RevId: 225905601
 2018-12-20 14:09:31 -05:00
Abseil Team
b7dd66519f Googletest export 
Remove GTEST_REFERENCE_TO_CONST_ usage from GMock. In C++11, it's redundant.

PiperOrigin-RevId: 225719210
 2018-12-17 13:53:39 -05:00
Abseil Team
1ec20f87e3 Googletest export 
Allow container matchers to accept move-only containers.

PiperOrigin-RevId: 225667441
 2018-12-17 13:53:33 -05:00
Abseil Team
096fb37a19 Googletest export 
Replace pump'd code for DoAll with variadic templates.

PiperOrigin-RevId: 225584656
 2018-12-17 13:53:26 -05:00
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