summaryrefslogtreecommitdiffstats
path: root/googlemock
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-0128-141/+244
| |\ | |/ |/|
* | 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-2116-48/+48
| | | | | | | | | | | | | | 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-2013-0/+43
| | | | | | | | | | PiperOrigin-RevId: 525850646 Change-Id: I64387f5b933beb79cd05636dca81b7a75213383e
* | Merge pull request #4219 from jerylvaz:mainCopybara-Service2023-04-171-1/+2
|\ \ | | | | | | | | | | | | PiperOrigin-RevId: 524932412 Change-Id: Ie70282f7e82cb3b9442bd15bbe49bb9b00e56eb9
| * | Suppress a clang-tidy warning in the MATCHER_P macrorefs/pull/4219/headJeryl Vaz2023-04-141-0/+1
|/ /
* | Fix FunctionMocker compilation slowdown in ↵Abseil Team2023-04-111-18/+55
| | | | | | | | | | | | | | | | | | | | | | 9d21db9e0a60a1ea61ec19331c9bc0dd33e907b1 The slowdown appears to be due to an implicit conversion of distinct (yet semantically identical) lambdas to `std::function`. Lifting out the lambdas into functors that don't get re-instantiated reduces compilation times by nearly half. Fixes #4156 PiperOrigin-RevId: 523447948 Change-Id: Ib0ae0761a54d7b1f2b706b14b2858eedf47e2297
* | Fix redundant redeclaration warningDerek Mauro2023-03-281-0/+2
| | | | | | | | | | | | | | Fixes #4200 PiperOrigin-RevId: 520017094 Change-Id: Id707a1c0489edde083771ccd412d7035612474dc
* | 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
* | Internal Code ChangeAbseil Team2023-03-211-5/+5
| | | | | | | | | | PiperOrigin-RevId: 518213370 Change-Id: I88d0acc195dadf8d03cd15c8534c721141db14ea
* | Introduce std::make_unique and bool literals where possibleAbseil Team2023-03-203-12/+9
| | | | | | | | | | PiperOrigin-RevId: 517910526 Change-Id: I398704f4b2ca0a55c86a06ca8b47d34c8670ddd7
* | Internal Code ChangeAbseil Team2023-03-111-0/+1
| | | | | | | | | | PiperOrigin-RevId: 515855852 Change-Id: I8016eefd45c36089e189bbd1ebbe9fdabe68255b
* | [gtest] Drop custom-rolled heterogeneous comparator functors in favor of C++ ↵Lawrence Wolf-Sonkin2023-03-101-6/+7
| | | | | | | | | | | | | | | | | | | | standard ones * Standard heterogeneous comparator functors such as `std::equal_to<>` and `std::less<>` [have been available since C++14](https://en.cppreference.com/w/cpp/utility/functional/less_void) * Now that [C++14 is the minimum supported version of C++ in Googletest](https://github.com/google/oss-policies-info/blob/main/foundational-cxx-support-matrix.md), let's delete these duplications of the standard library PiperOrigin-RevId: 515743068 Change-Id: I1563a2f94039c3a6688429298555545a922f6d7e
* | Internal Code ChangeAbseil Team2023-03-071-1/+2
| | | | | | | | | | PiperOrigin-RevId: 514678702 Change-Id: I5b0089d905152ccb85022be395ed340e42586234
* | 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-068-22/+22
| | | | | | | | | | | | | | This is compatible with compiling with "-Wundef" (#3267). PiperOrigin-RevId: 513943378 Change-Id: I47cf5fabbb77be061c4483a0adc54511af6b191c
* | Internal Code ChangeAbseil Team2023-03-033-3/+3
| | | | | | | | | | PiperOrigin-RevId: 513770561 Change-Id: I82fbed177c6ba4e2e5b776ae3e0255c868e32e25
* | Fix link in ReportUninterestingCall messageAbseil Team2023-02-163-6/+6
| | | | | | | | | | | | | | | | | | | | 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
* Fix GTEST_HAS_ABSL define check for [-Werror=undef] compilationsMartijn Vels2023-02-071-2/+2
| | | | | PiperOrigin-RevId: 507788664 Change-Id: Ib8cfbf3102a38e210fdae8a548fd84f0723ccc10
* Add support for the alternative base64 encoding in RFC 4648 section 5 to ↵Abseil Team2023-02-062-1/+9
| | | | | | | `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-3015-134/+68
| | | | | | | | | 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-247-49/+50
| | | | | | | | | | 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
* | IWYU: Add missing std includesTom Hughes2023-01-052-0/+2
|/ | | | | PiperOrigin-RevId: 499893032 Change-Id: I33304802b7c82ae2d008f3ee89df38866e5f57ba
* Shut up a Clang warning.Abseil Team2022-12-151-1/+6
| | | | | | | | | | | | | | | Clang warns on this pattern because it looks like the author might have meant to use the value of the first part of the comma operator, so it warns that it isn't being used. The cast here signals to Clang that this behavior is intentional. This was discovered while updating gmock in Android. Clang's -Wcomma warning is on by default with either -Wall or -Werror, so users of gmock with those on in combination with -Werror are unable to build without this fix. PiperOrigin-RevId: 495655990 Change-Id: Iaf27e2199669f5b6185a877738234e551b6b6556
* Refactor matrix verification into VerifyMatchMatrix.refs/pull/4082/headAbseil Team2022-12-122-17/+17
| | | | | PiperOrigin-RevId: 494786543 Change-Id: I7769558dd2ca046d8957bf352dc04cfb48ff7c3a
* Make SizeIsMatcher::Impl conform to the contract of MatcherDescriberInterface.Abseil Team2022-11-302-4/+4
| | | | | | | 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-295-3/+59
| | | | | | | | trigger via `MOCK_METHOD()` and `EXPECT_THAT()` macros. Fixes: #4052, #4055 PiperOrigin-RevId: 491647393 Change-Id: I8e2ad838156fa8c7e9dccd1740af797e694992b6
* Remove incorrect GTEST_ATTRIBUTE_UNUSED_ from InSequence class.Abseil Team2022-11-081-1/+1
| | | | | | Fixes: #4048 PiperOrigin-RevId: 486951561 Change-Id: I4fae101b5ac5ed4f46c32aba8c36519e1f784db1
* Merge pull request #4041 from zloylos:allow-naming-expectationsCopybara-Service2022-10-253-11/+48
|\ | | | | | | | | PiperOrigin-RevId: 483683590 Change-Id: Id22de3a22018324e5c1e21e262ac5e027a83bf3e
| * Fix format without expectation namerefs/pull/4041/headDenis Hananein2022-10-211-2/+2
| | | | | | | | Signed-off-by: Denis Hananein <i@zloylos.me>
| * Change messagesDenis Hananein2022-10-212-10/+9
| | | | | | | | Signed-off-by: Denis Hananein <i@zloylos.me>
generated by cgit v0.12 at 2024-09-02 21:01:00 (GMT)