summaryrefslogtreecommitdiffstats
path: root/googlemock/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4146 from lygstate:fixes_std_pair_diffCopybara-Service2023-05-022-9/+4
|\ | | | | | | | | PiperOrigin-RevId: 528781910 Change-Id: I4038332a6255921792bfb4a8098aa84243d48e15
| * Merge branch 'main' into fixes_std_pair_diffrefs/pull/4146/headAndy Soffer2023-05-0117-83/+138
| |\ | |/ |/|
* | Use GTEST_INTERNAL_CPLUSPLUS_LANG instead of __cplusplusDino Radakovic2023-04-282-2/+5
| | | | | | | | | | | | | | | | Some versions of MSVC provide incorrect values for the latter and rely on _MSVC_LANG instead. Fixes #4226. PiperOrigin-RevId: 527919195 Change-Id: Ifcca4612074f5ebc5337094426866a187f79f90a
* | Add qualifier to avoid argument dependent lookupTom Hughes2023-04-281-1/+1
| | | | | | | | | | PiperOrigin-RevId: 527740306 Change-Id: I61308cc232c346d5ff8b0548d4c552a59633fffc
* | gmock: fix issue #4222refs/pull/4225/headPatryk Gawroński2023-04-241-13/+13
| | | | | | | | | | Rename 'Result' struct to 'NonMoveableStruct' in gmock-spec-builders_test.cc in ExpectCallTest.NonMoveableType test
* | Use '=default' to define trivial constructor/destructorsrefs/pull/4221/headTom Hughes2023-04-2111-35/+35
| | | | | | | | | | | | | | https://clang.llvm.org/extra/clang-tidy/checks/modernize/use-equals-default.html PiperOrigin-RevId: 526079054 Change-Id: Ia4db21e3e5f58b90de05d52fd94b291ed06d785d
* | Use the empty method to check for emptinessTom Hughes2023-04-211-1/+1
| | | | | | | | | | PiperOrigin-RevId: 526046714 Change-Id: I6ad0deff2a7f6dfef75a643c95ad914c83b9ba38
* | Add missing std includesTom Hughes2023-04-209-0/+38
| | | | | | | | | | PiperOrigin-RevId: 525850646 Change-Id: I64387f5b933beb79cd05636dca81b7a75213383e
* | gtest.cc: add a newline after a failure when there is no OS stack trace.Aaron Jacobs2023-03-231-0/+18
| | | | | | | | | | | | | | | | This makes the behavior consistent when GTEST_STACK_TRACE_DEPTH is set to zero and not: there is always vertical whitespace separating failure messages. PiperOrigin-RevId: 518744611 Change-Id: I5b4af40633849850660504c3f497a76601d4311d
* | Introduce std::make_unique and bool literals where possibleAbseil Team2023-03-203-12/+9
| | | | | | | | | | PiperOrigin-RevId: 517910526 Change-Id: I398704f4b2ca0a55c86a06ca8b47d34c8670ddd7
* | Use "#ifdef" with public macrosTom Hughes2023-03-062-2/+2
| | | | | | | | | | | | | | This allows compilation with "-Wundef" (#3267). PiperOrigin-RevId: 513944726 Change-Id: I1a3854bb2333d5dec6c0ff91ee1eddd9a766ab91
* | Use "#ifdef GTEST_OS_..." instead of "#if GTEST_OS_..."Tom Hughes2023-03-064-12/+12
| | | | | | | | | | | | | | This is compatible with compiling with "-Wundef" (#3267). PiperOrigin-RevId: 513943378 Change-Id: I47cf5fabbb77be061c4483a0adc54511af6b191c
* | Fix link in ReportUninterestingCall messageAbseil Team2023-02-162-5/+5
| | | | | | | | | | | | | | | | | | | | This CL changes the link in the ReportUninterestingCall message from .../gmock_cook_book.md#knowing-when-to-expect to .../gmock_cook_book.md#knowing-when-to-expect-useoncall. This is necessary following https://github.com/google/googletest/commit/31ff597. PiperOrigin-RevId: 510138974 Change-Id: Ic98c84b07751d27dfc95eddbe7874f76d68b456f
| * Fixes the test gmock_output_test.py with MSVCYonggang Luo2023-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For MSVC, gmock_output_test.py output struct std::pair<int,bool>, for GCC, it's output std::pair<int, bool>, it's not the same, my intention is getting these to be same by removing struct for MSVC's outptu, and strip redundant space for GCC. As a by-product, ``` #ifdef _MSC_VER #define ERROR_DESC "class std::runtime_error" #else #define ERROR_DESC "std::runtime_error" #endif ``` can be simplified to ``` #define ERROR_DESC "std::runtime_error" ``` Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
| * Revert "Fix gmock_output_test when using MSVC"Yonggang Luo2023-02-092-9/+4
|/ | | | This reverts commit 0a3b403fe037ff80daa1826ae99eed41e94dea05.
* Remove GTEST_USES_PCRE referencesTom Hughes2023-02-071-11/+2
| | | | | | | | | | | | | Nothing defines GTEST_USES_PCRE anymore. It was only meant for internal use, so nothing public should be relying on it: https://github.com/google/googletest/issues/2735#issuecomment-644849438. Found when compiling with "-Wundef". Fixes #2735. PiperOrigin-RevId: 507823660 Change-Id: Ie19e576ff01dc3b16381338578ece92adccfc09b
* Add support for the alternative base64 encoding in RFC 4648 section 5 to ↵Abseil Team2023-02-061-0/+3
| | | | | | | `WhenBase64Unescaped`. PiperOrigin-RevId: 507527786 Change-Id: Ie5e088b1814981f6c760d7e25418a430172705ec
* Fix include orderTom Hughes2023-02-011-2/+2
| | | | | PiperOrigin-RevId: 506424617 Change-Id: If7f0beb92022589523db204a6b5cbe9249cebf62
* Remove GMOCK_RENAME_MAINTom Hughes2023-02-011-7/+0
| | | | | | | GMOCK_RENAME_MAIN appears unused. PiperOrigin-RevId: 506387823 Change-Id: I732c1f64f9038991a5c9aea1f2ad6fff07622afa
* Fix gmock_output_test when using MSVCTom Hughes2023-02-012-4/+9
| | | | | | | | | | | | | std::pair is printed as "struct std::pair<int,bool>" when using MSVC vs "std::pair<int,bool>" with other compilers. Switch to "std::tuple", which is the same for all compilers. See https://learn.microsoft.com/en-us/cpp/standard-library/pair-structure https://learn.microsoft.com/en-us/cpp/standard-library/tuple-class PiperOrigin-RevId: 506340295 Change-Id: Ib4ce2f74d54888a4e4173f42da1b55cc5583f7d4
* Use GTEST_DISABLE_MSC_WARNINGS macros to disable warningsTom Hughes2023-01-3010-95/+52
| | | | | | | | | Prior to this change we had a mixture of pragmas and GTEST_DISABLE_MSC_WARNINGS; this change consolidates all instances to use the macros. PiperOrigin-RevId: 505786926 Change-Id: I2be8f6304387393995081af42ed32c2ad1bba5a7
* Use explicit short to fix MSVC compiler warningTom Hughes2023-01-301-4/+4
| | | | | | | | warning C4244: 'initializing': conversion from 'int' to 'short', possible loss of data PiperOrigin-RevId: 505774670 Change-Id: I3524040334a4b265bae12cfacdd2b615cbb1cfc8
* Merge pull request #4115 from SunBlack:codespellCopybara-Service2023-01-301-2/+2
|\ | | | | | | | | PiperOrigin-RevId: 505740434 Change-Id: I963f6a6b667a030c87f211173f578f7c35733e68
| * Fix typos found by codespellrefs/pull/4115/headSunBlack2023-01-041-2/+2
| |
* | Remove pylint disable comments that no longer trigger warningsTom Hughes2023-01-251-5/+0
| | | | | | | | | | PiperOrigin-RevId: 504633130 Change-Id: I3fdbc83975fea97aa53f7325d323adead0a30e24
* | Fix formatting in subset of Python filesTom Hughes2023-01-252-27/+40
| | | | | | | | | | | | | | | | These files were formatted with automated tools. The remaining Python files require some manual fix ups, so they will be fixed separately. PiperOrigin-RevId: 504579820 Change-Id: I3923bd414bffe3ded6163ec496cd09ace3951928
* | Fix formatting of C++ filesTom Hughes2023-01-243-7/+7
| | | | | | | | | | PiperOrigin-RevId: 504325204 Change-Id: Iaa1d6d0ab1dccaaeef26f9cb109d530835499240
* | Remove FloatingPoint::Max() in favor of std::numeric_limits::max()Derek Mauro2023-01-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | In #4113 a user says Max clashes with a macro. Since it is only used in a test, use std::numeric_limits::max() instead. Note that in headers, the macro issue can be mitigated with parenthesis like this: `(std::numeric_limits<T>::max)()` PiperOrigin-RevId: 504284906 Change-Id: Ibf430caec1a6afdf6b303534fec6a4fd00a6373f
* | Replace deprecated python callsTom Hughes2023-01-171-2/+2
| | | | | | | | | | | | | | | | assert_ -> assertTrue/assertFalse/assertIn/assertNotIn assertEquals -> assertEqual PiperOrigin-RevId: 502654909 Change-Id: I25d30095a83c3806606cb80d676b3c979495e6bd
* | gmock_output_test: normalize golden file output to unix line endingsAbseil Team2023-01-171-0/+3
| | | | | | | | | | | | | | | | When checked out on Windows, the repo might use \r\n line endings, and so the golden output has them. Adjust for that. PiperOrigin-RevId: 502577222 Change-Id: Iabfe537f6d95a49bf6bdcb934e855d28c65f6f89
* | Fix -Wshadow warningsTom Hughes2023-01-121-2/+2
|/ | | | | | | | | | | | | | | | | | | | ../googlemock/test/gmock-actions_test.cc:687:36: warning: declaration of ‘v’ shadows a member of ‘testing::{anonymous}::ReturnTest_SupportsReferenceLikeReturnType_Test::TestBody()::Result’ [-Wshadow] 687 | Result(const std::vector<int>& v) : v(&v) {} // NOLINT | ~~~~~~~~~~~~~~~~~~~~~~~~^ ../googlemock/test/gmock-actions_test.cc:686:29: note: shadowed declaration is here 686 | const std::vector<int>* v; | ^ ../googlemock/test/gmock-actions_test.cc: In constructor ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out::Out(int)’: ../googlemock/test/gmock-actions_test.cc:720:28: warning: declaration of ‘x’ shadows a member of ‘testing::{anonymous}::ReturnTest_PrefersConversionOperator_Test::TestBody()::Out’ [-Wshadow] 720 | explicit Out(const int x) : x(x) {} | ~~~~~~~~~~^ ../googlemock/test/gmock-actions_test.cc:718:9: note: shadowed declaration is here 718 | int x; | ^ PiperOrigin-RevId: 501580618 Change-Id: I584710fbbe440ec724f88746e51f3be5653c32d5
* Make SizeIsMatcher::Impl conform to the contract of MatcherDescriberInterface.Abseil Team2022-11-301-2/+2
| | | | | | | MatcherDescriberInterface specifies that DescribeTo "should print a verb phrase", but "size ..." is not a verb phrase. Currently, ElementsAre(SizeIs(9)) is described as "has 1 element that size is equal to 9". With this change, it will be described as "has 1 element that has a size that is equal to 9". PiperOrigin-RevId: 492022324 Change-Id: I4083335f2419462464957521c1e033643b53b763
* Disables `-Wunused-member-function` and `-Wused-but-marked-unused` that ↵Abseil Team2022-11-292-0/+29
| | | | | | | | trigger via `MOCK_METHOD()` and `EXPECT_THAT()` macros. Fixes: #4052, #4055 PiperOrigin-RevId: 491647393 Change-Id: I8e2ad838156fa8c7e9dccd1740af797e694992b6
* Merge pull request #4041 from zloylos:allow-naming-expectationsCopybara-Service2022-10-251-7/+10
| | | | | PiperOrigin-RevId: 483683590 Change-Id: Id22de3a22018324e5c1e21e262ac5e027a83bf3e
* Add support of 19-member structs to gmock UnpackStructImpl.Hardik Vala2022-08-221-0/+5
| | | | | PiperOrigin-RevId: 469171380 Change-Id: Ic75fc0523924e40e620552d4c04b79dad22a68e0
* Merge pull request #3918 from assafpr:master2mainCopybara-Service2022-08-012-5/+5
|\ | | | | | | | | PiperOrigin-RevId: 464586117 Change-Id: Icda62f13b962f7408bb5698ae2b627391257d152
| * Update gmock-spec-builders_test.ccassafpr2022-06-271-1/+1
| | | | | | master branch changed to main in link
| * Update gmock_output_test_golden.txtassafpr2022-06-221-4/+4
| |
* | Add support of 18-member structs to gmock UnpackStructImpl.refs/pull/3966/headAbseil Team2022-07-291-0/+10
| | | | | | | | | | PiperOrigin-RevId: 463961734 Change-Id: Ib62e320a745c190955f181c1f4f12e4cd407ef22
* | Add IsEmpty overload for C-style stringsDino Radakovic2022-07-251-0/+26
| | | | | | | | | | | | | | Fixes #3937 PiperOrigin-RevId: 463180144 Change-Id: I21b528acc4c3f3aba4234642be01fcead7fe7f00
* | fix: typo in test nameyutotnh2022-07-011-1/+1
| |
* | fix: some typos in commentyutotnh2022-07-012-3/+3
|/
* gmock-spec-builders: add support for non-moveable types.Aaron Jacobs2022-05-271-53/+55
| | | | | | | | | 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-271-1/+29
| | | | | | | | | | | | | | | 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-actions: add support for move-only values to Return.Aaron Jacobs2022-05-131-18/+38
| | | | | | | | `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-121-15/+52
| | | | | | | | 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-112-17/+34
| | | | | | | | | | 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-111-1/+1
| | | | | | | | 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
* gmock-actions: improve comments and tests for the implicit cast in Return.Aaron Jacobs2022-04-271-0/+31
| | | | | | | | | | 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-261-2/+23
| | | | | PiperOrigin-RevId: 444671005 Change-Id: I7df5f038caf17afb60d4fb35434ff0b656d4c954