summaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* gmock-spec-builders: remove the name for an unused parameter.Aaron Jacobs2022-05-301-7/+1
| | | | | | | | | | | This fixes unused parameter errors under both MSVC and clang (when `-Werror=unused-parameter` is used, as reported [here](https://github.com/google/googletest/commit/9d21db9e0a60a1ea61ec19331c9bc0dd33e907b1#r74769946)). Fixes #3858 PiperOrigin-RevId: 451907906 Change-Id: Ic07da19ea6a547eb1797fbbab19cd57cc2a83fe8
* gmock-spec-builders: add support for non-moveable types.Aaron Jacobs2022-05-272-242/+158
| | | | | | | | | Do this by ripping out the "untyped perform action" machinery, which isn't necessary: we can simply template the entry point on the result type, and use RAII to avoid the need to special case void. This makes it easier to understand the code and harder to introduce type-related undefined behavior, to boot. PiperOrigin-RevId: 451493451 Change-Id: I225305f83164752ca92f2916721972eafba33168
* gmock-actions: properly support non-moveable results in `is_callable_r`.Aaron Jacobs2022-05-272-4/+79
| | | | | | | | | | | | | | | Previously this excluded callables that return non-moveable types. This is the same as the [libc++ std::is_invocable_r bug](https://github.com/llvm/llvm-project/issues/55346) fixed by [this commit](https://github.com/llvm/llvm-project/commit/c3a24882903d): it's wrong to use std::is_convertible for checking the return type, since (despite its name) that doesn't check the standard-defined notion of "implicitly convertible". Instead we must base the check on whether the source type can be used as an argument to a function that accepts the destination type. PiperOrigin-RevId: 451341205 Change-Id: I2530051312a0361ea7a2ce26993ae973c9242089
* gmock-spec-builders: move a method to the header.Aaron Jacobs2022-05-262-133/+134
| | | | | | | | In order to make the diff more readable in an upcoming commit that requires the method to be templated on the action's result type. PiperOrigin-RevId: 451157029 Change-Id: I57beb7544efccd0459efb3a1f039ea45cd7c7602
* gmock-internal-utils.cc: Avoid implicit conversion from int to charDino Radakovic2022-05-171-1/+1
| | | | | | | Fixes #3832 PiperOrigin-RevId: 449158813 Change-Id: Ibe85239ab1f123097b2c1b61616c9d611e5b90d0
* gmock-actions: add support for move-only values to Return.Aaron Jacobs2022-05-132-29/+83
| | | | | | | | `Return(x)` can now be used directly with `WillOnce` (the only place it makes sense in the type system), without using `ByMove`. PiperOrigin-RevId: 448380066 Change-Id: Ia71cc60ccbc3b99720662731a2d309735a5ce7c8
* gmock-actions: provide a const reference when converting in ReturnAction.Aaron Jacobs2022-05-122-47/+67
| | | | | | | | It doesn't make semantic sense for the conversion to modify the input, and the fact that it's allowed to do so appears to have just been a historical accident. PiperOrigin-RevId: 448135555 Change-Id: Id10f17af38cf3947ee25fe10654d97527173ebfc
* gmock-actions: simplify Return and add better documentation.Aaron Jacobs2022-05-113-93/+192
| | | | | | | | | | Better document requirements, API decisions, and historical accidents. Make an implicit conversion easier and in a more appropriate place, and ease the burden of some assertions in the conversion operator. Stop using the legacy ActionInterface style for defining the action. PiperOrigin-RevId: 447894892 Change-Id: I179e23ec2abdd9bf05c204ab18dbb492f1372e8e
* gmock-actions: make OnceAction public.Aaron Jacobs2022-05-112-8/+8
| | | | | | | | So that it can be referenced in conversion operators for actions that need to know the concrete return type. PiperOrigin-RevId: 447889344 Change-Id: I643d3298bc8effd08741282a956c221f9d67d378
* Fix example of DescribeMatcher to properly support negation.Abseil Team2022-05-031-1/+2
| | | | | PiperOrigin-RevId: 446259163 Change-Id: I3ad5f405f44fc233f5cf5a18a274a9104b5c4ab8
* gmock-actions: remove a no-longer-necessary friend declaration.Aaron Jacobs2022-05-021-6/+0
| | | | | PiperOrigin-RevId: 445940487 Change-Id: I26952a72327db0d308bbe57ca4d1d91a0d7defc8
* gmock-actions: support ByMove in a specialization of ReturnAction.Aaron Jacobs2022-05-021-25/+34
| | | | | | | | | | | | | Rather than branching on whether the return type is ByMoveWrapper within ReturnAction itself, hoist the distinction to outside. This allows the main class template to be modified without worrying about this special case, which means we can stop using a shared pointer to the value (introduced as a linked_ptr in commit 3d1c78b2bf to support ByMove) in this commit and simplify the class template further in a future commit with the eventual aim of directly supporting move-only result types. PiperOrigin-RevId: 445938943 Change-Id: I7bc71ea301d5e493ac6ecbe57d62738a48a2721a
* gmock-actions: improve comments and tests for the implicit cast in Return.Aaron Jacobs2022-04-272-7/+39
| | | | | | | | | | Commit a070cbd91c added an implicit cast to this path but didn't leave a very clear explanation for why it was desirable, a clear example, or even test coverage. Add a better comment and a test that fails when the implicit cast is removed. PiperOrigin-RevId: 444871311 Change-Id: I127982fa8d5bce9b6d1b68177c12dc0709449164
* Support move-only and &&-qualified actions in WithArgs.Aaron Jacobs2022-04-262-9/+73
| | | | | PiperOrigin-RevId: 444671005 Change-Id: I7df5f038caf17afb60d4fb35434ff0b656d4c954
* Generalize gmock-matchers_test to handle is_gtest_matcher-style matchers, too.Abseil Team2022-04-265-50/+144
| | | | | PiperOrigin-RevId: 444586594 Change-Id: I0de9b40b3773e3047a492f050266967ea935ae3e
* Support move-only and &&-qualified actions in DoAll.Aaron Jacobs2022-04-263-258/+480
| | | | | | | | This is necessary for generic support of these actions, since `DoAll` is a frequently-used action wrapper. PiperOrigin-RevId: 444561964 Change-Id: I02edb55e35ab4207fbd71e371255a319c8253136
* Remove the legacy internal GTEST_DISALLOW_* macrosDerek Mauro2022-04-2217-46/+101
| | | | | PiperOrigin-RevId: 443715444 Change-Id: I3ffd54b63d2728ae4a668ee7875c8c3c8188087c
* Eliminate the legacy GTEST_COMPILE_ASSERT_ macroDerek Mauro2022-04-212-26/+23
| | | | | PiperOrigin-RevId: 443462203 Change-Id: I0c43f981663a7531ff5da4d4be01fb3d6762273d
* Document two surprises in `DoAllAction::NonFinalType`.Aaron Jacobs2022-04-132-0/+128
| | | | | PiperOrigin-RevId: 441589196 Change-Id: Ic3e483ca70d72261046bad464d817f9dfd4bec65
* Replace infinite recursion call (intentionally invoking undefined behavior ↵Abseil Team2022-04-131-3/+6
| | | | | | | to indicate unreachability) with explicit unreachability marker. PiperOrigin-RevId: 441474979 Change-Id: I1fcbb437026631212fec954c663482bb7e1cf819
* Add support for move-only and &&-qualified actions in WillOnce.Abseil Team2022-04-093-34/+581
| | | | | | | | | | | | This provides a type-safe way for an action to express that it wants to be called only once, or to capture move-only objects. It is a generalization of the type system-evading hack in ByMove, with the improvement that it works for _any_ action (including user-defined ones), and correctly expresses that the action can only be used with WillOnce. I'll make existing actions benefit in a future commit. PiperOrigin-RevId: 440496139 Change-Id: I4145d191cca5655995ef41360bb126c123cb41d3
* gmock: improve SFINAE for actions involving arguments.Abseil Team2022-04-042-2/+4
| | | | | | | | Avoid instantiating functions like std::get<index> for an out of range index when doing SFINAE on the invocability of the action itself. PiperOrigin-RevId: 439415110 Change-Id: Ifc20285a6d526c34830870cd1910c2b2b92e1e81
* Use ResultOf()'s result_description when explaining match result.Abseil Team2022-04-042-1/+16
| | | | | PiperOrigin-RevId: 439389646 Change-Id: Ie34adcdd2b24378e85962efac53b7bb89ed93803
* Use the Abseil flags library when Abseil is presentDerek Mauro2022-04-041-20/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | When built with `--define=absl=1` under Bazel, GoogleTest flags use ABSL_FLAG instead of GoogleTest's own implementation. There are some minor behavior differences in this mode. The most notable difference is that unrecognized flags result in a flag parsing error, and are not returned to the user though a modified argc/argv, unless they appear after the positional argument delimiter ("--"). For example, to pass a non-Abseil flag, you would have to do ./mytest --gtest_color=false -- --myflag=myvalue The documentation at https://abseil.io/docs/cpp/guides/flags may be helpful in understanding the behavior. There are some other minor differences. For example, passing --help results in the program returning 1 instead of 0. https://github.com/google/googletest/issues/3646 PiperOrigin-RevId: 439312700 Change-Id: Id696a25f50f24a5b1785c45ca8fa59794f86fd5c
* Address deprecation warning surfaced by Github presubmit testsAbseil Team2022-03-231-4/+4
| | | | | PiperOrigin-RevId: 436839469 Change-Id: I2bb90dce524c16bcc31569bb98772dcc62d08fbf
* Split gmock-matchers_test into 4 smaller test #3653Mattias Ellert2022-03-239-8645/+8857
| | | | | | | | | The one large test does not link in limited memory environments Closes #3653 PiperOrigin-RevId: 436753193 Change-Id: Idd59b6509994fc642147b88279ee791cd1d7bdd0
* Merge branch 'main' into promote-inclusive-behaviorrefs/pull/3779/headBrad Messer2022-03-1832-1940/+1678
|\
| * Running clang-format over all of GoogleTestAbseil Team2022-03-1532-1940/+1678
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few tests are examining code locations and looking af the resulting line numbers to verify that GoogleTest shows those to users correctly. Some of those locations change when clang-format is run. For those locations, I've wrapped portions in: // clang-format off ... // clang-format on There may be other locations that are currently not tickled by running clang-format. PiperOrigin-RevId: 434844712 Change-Id: I3a9f0a6f39eff741c576b6de389bef9b1d11139d
* | Remove sanity as it is offensive to neurodiverse individuals.Brad Messer2022-03-181-1/+1
|/
* Mark ACTION_Pn()-generated functions as must-use-result, adding ↵Abseil Team2022-03-081-0/+3
| | | | | | | | | | | | | non-compilation tests. This catches when a client creates an action and discards it, thinking that the action has actually been applied to something. This will help people who make the mistake of defining, for example, both `void Use(Foo*, Bar)` and `ACTION_P(Use, bar) { Use(arg, bar); }` for later application to a Foo. With such an overload, a client may then write `Use(bar);`, selecting the Action<> overload and being confused why nothing happens. This also catches when a client defines their own action in terms of an ACTION_P()-generated one, invokes the Action<>'s builder, and then fails to invoke the resulting action, thinking it's operating on the outer action's parameters. PiperOrigin-RevId: 433197479 Change-Id: I98e4389150d01a5e753230113016d9fc38b1d260
* Add a 3-arg overload for ResultOf() matcher that takes a description string ↵Abseil Team2022-02-102-6/+47
| | | | | | | for better error messages. PiperOrigin-RevId: 427598749 Change-Id: I8c7a5d7b2dde017641534f1c7eed8dd56c33e845
* Merge pull request #3617 from Bagira80:fix_3616Copybara-Service2022-02-071-2/+3
|\ | | | | | | | | PiperOrigin-RevId: 426976022 Change-Id: Ib9f49cf84775a50cbc806d331349e61a1060b498
| * CMake: Fix values of INTERFACE_INCLUDE_DIRECTORIES propertyrefs/pull/3617/headDeniz Bahadir2021-10-191-2/+3
| | | | | | | | | | | | | | | | | | | | Replace semicolon by `$<SEMICOLON>` in generator-expressions of target property `INTERFACE_INCLUDE_DIRECTORIES` of CMake targets `gtest`, `gtest_main`, `gmock` and `gmock_main`. Fixes: #3616 Signed-off-by: Deniz Bahadir <deniz@code.bahadir.email>
* | Change `ReturnArg` to use perfect forwarding of arguments (#3733)Dino Radakovic2022-01-262-3/+9
| | | | | | | | | | PiperOrigin-RevId: 424355706 Change-Id: I618e5574b4b2c56a343905c20d8cc6d2a70cbcd1
* | Consistently apply IWYU pragmas across googletest and googlemock headersAbseil Team2022-01-1814-11/+42
| | | | | | | | | | PiperOrigin-RevId: 422559250 Change-Id: I9f630f2186724950e5e9fbd7093d5264e8bf0a71
* | Merge pull request #3725 from bsilver8192:remove-another-disallow-assignCopybara-Service2022-01-111-189/+162
|\ \ | | | | | | | | | | | | PiperOrigin-RevId: 421044680 Change-Id: If585089811f1b67eab6f339125c27174ee5bc290
| * | Remove another GTEST_DISALLOW_ASSIGN_ that crept inrefs/pull/3725/headBrian2022-01-061-2/+0
|/ / | | | | | | | | | | They were all removed in #2815, but it looks like this one got added from a Google export which missed the update. See #2815 for reasons why removing this is desirable.
* | Include the param names in the generated description of the MATCHER_P matchers.Abseil Team2021-12-277-65/+83
| | | | | | | | | | PiperOrigin-RevId: 418497526 Change-Id: Ie53c3c0810c10a32cbcb941e3ca1ee8fb1ddd9f9
* | Makes the Python imports consistently use full paths from the repository root,Derek Mauro2021-12-223-15/+3
| | | | | | | | | | | | | | | | | | unifying the behavior between Bazel and CMake This fixes one of the CI failures on Windows PiperOrigin-RevId: 417872531 Change-Id: I156989323b7e6d4a4420f4f9691b078829db933d
* | Support std::reference_wapper as a smart pointer type in gmockAbseil Team2021-12-032-0/+13
| | | | | | | | | | PiperOrigin-RevId: 413963503 Change-Id: I33440780bf087698f4e4325399227405885430b3
* | fix a typorefs/pull/3664/headKrystian Kuzniarek2021-11-161-1/+1
| |
* | Clarify "Times() after X" error messageTaylor Cramer2021-11-152-5/+5
| | | | | | | | | | | | | | | | The previous error message could be misinterpreted to mean that `Times` could not be used in combination with `WillRepeatedly`, when in fact the call to `Times` just needs to happen *first*. PiperOrigin-RevId: 410070405 Change-Id: I747d34a4334cf2e56d589dcad3a08a8f322d77c8
* | Fix typo in gmock-matchers_test.cc: CanDescribeNegationOfExpectingOneElment ↵Abseil Team2021-11-121-1/+1
| | | | | | | | | | | | | | => CanDescribeNegationOfExpectingOneElement PiperOrigin-RevId: 409484263 Change-Id: I7448d6f04a9868602e0bc8dec40ea3eb63d3e387
* | Replace use of deprecated std::iteratorrefs/pull/3650/headRaul Tambre2021-11-051-5/+7
| | | | | | | | This was deprecated by P0174 in C++17.
* | Googletest exportAbseil Team2021-11-031-3/+3
|/ | | | | | Internal change PiperOrigin-RevId: 405710296
* Merge pull request #3581 from cclauss:codespelldinord2021-10-053-3/+3
|\ | | | | | | PiperOrigin-RevId: 400792845
| * Fix remaining typos discovered by codespellrefs/pull/3581/headChristian Clauss2021-09-243-3/+3
| |
* | Googletest exportAbseil Team2021-09-282-10/+8
|/ | | | | | | | Ensure `.what()` is printed in `ThrowsMessage(...)` to address https://github.com/google/googletest/issues/3582 Closes #3582 PiperOrigin-RevId: 399462851
* Merge pull request #3195 from Inujel:fix-3194dinord2021-09-231-10/+7
|\ | | | | | | PiperOrigin-RevId: 398271948
| * Using auto instead of container::const_iteratorrefs/pull/3195/headJulien JEMINE2020-12-291-10/+7
| |