summaryrefslogtreecommitdiffstats
path: root/googlemock/include
Commit message (Collapse)AuthorAgeFilesLines
* Googletest exportmisterg2019-10-181-24/+2
| | | | | | Added IsNan matcher PiperOrigin-RevId: 275473218
* Googletest exportAbseil Team2019-10-181-4/+25
| | | | | | | | Addressing https://github.com/google/googletest/issues/2502 Add MOCK_METHOD support for returning function pointers. PiperOrigin-RevId: 275323671
* Googletest exportAbseil Team2019-10-171-2/+24
| | | | | | Added IsNan matcher PiperOrigin-RevId: 275278634
* Add more override keywordsrefs/pull/2507/headRobert Luberda2019-10-114-62/+62
| | | | | | | | | | | | | | 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
* Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-111-22/+20
|\ | | | | | | PiperOrigin-RevId: 274155281
* \ Merge pull request #2498 from thejcannon:noexcept_specGennadiy Civil2019-10-111-20/+22
|\ \ | |/ | | | | PiperOrigin-RevId: 274097989
| * Fix spacingJoshua Cannon2019-10-071-3/+3
| |
| * Use the verbatim noexcept spec in MOCKED_METHODJoshua Cannon2019-10-071-10/+14
| |
* | Googletest exportAbseil Team2019-10-111-2/+1
| | | | | | | | | | | | | | 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
* | Merge pull request #2448 from kuzkry:bad-googletest-exportGennadiy Civil2019-10-102-4/+2
|\ \ | |/ |/| | | PiperOrigin-RevId: 273585026
| * square away the stuff that hasn't been merged in a manual reviewKrystian Kuzniarek2019-09-162-4/+2
| | | | | | | | | | This fixes up ab8f346b (a manual merge) that has abandoned some things from PR #2395.
* | Googletest exportAbseil Team2019-09-271-2/+4
|/ | | | | | Makes testing::ResultOf() work with non-copyable arguments. PiperOrigin-RevId: 271222632
* Googletest exportkuzkry2019-09-162-17/+16
| | | | | | | | | Merge 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd into fb49e6c164490a227bbb7cf5223b846c836a0305 Closes #2407 COPYBARA_INTEGRATE_REVIEW=https://github.com/google/googletest/pull/2407 from kuzkry:StaticAssertTypeEq 3bdefdb473d304803d2a38e2a2cd5cdc1827c3bd PiperOrigin-RevId: 269255328
* Merge pull request #2387 from kuzkry:iffShaindel Schwartz2019-09-125-56/+64
|\ | | | | | | PiperOrigin-RevId: 268693457
| * restore mistakenly removed iffs in their explicit formrefs/pull/2387/headKrystian Kuzniarek2019-08-205-56/+64
| | | | | | | | | | Due to confusion arisen from "iff" standing for "if and only if", this commit uses the latter.
* | Googletest exportHosein Ghahremanzadeh2019-09-121-2/+2
| | | | | | | | | | | | | | | | | | 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
* | Googletest exportkuzkry2019-09-063-9/+4
| | | | | | | | | | | | | | | | | | 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
* | Merge pull request #2426 from kuzkry:#2396-postreviewGennadiy Civil2019-08-281-9/+9
|\ \ | | | | | | | | | PiperOrigin-RevId: 265785837
| * | post-review to db1b7399 (#2396)refs/pull/2426/headKrystian Kuzniarek2019-08-241-9/+9
| | |
* | | Merge pull request #2382 from kuzkry:dead-metafunctionGennadiy Civil2019-08-271-13/+0
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 265730482
| * | | remove a dead metafunctionrefs/pull/2382/headKrystian Kuzniarek2019-08-161-13/+0
| | | |
* | | | Googletest exportmisterg2019-08-261-50/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add tuple version of Optional() matches. This allows Optional() to be used in Pointwise matchers. PiperOrigin-RevId: 265501882
* | | | Googletest exportAbseil Team2019-08-231-1/+50
| |/ / |/| | | | | | | | | | | | | | Add tuple version of Optional() matches. This allows Optional() to be used in Pointwise matchers. PiperOrigin-RevId: 265110864
* | | Googletest exportkuzkry2019-08-232-30/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #2394 from ↵Xiaoyi Zhang2019-08-231-14/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | kuzkry:custom-type-traits-duplication-of-custom-index_sequence PiperOrigin-RevId: 264863984
| * | | reuse IndexSequence from googletestrefs/pull/2394/headKrystian Kuzniarek2019-08-141-14/+3
| |/ /
* | | Merge pull request #2393 from kuzkry:custom-type-traits-remove_constXiaoyi Zhang2019-08-212-23/+24
|\ \ \ | |_|/ |/| | | | | PiperOrigin-RevId: 264652890
| * | remove a custom implementation of std::remove_constrefs/pull/2393/headKrystian Kuzniarek2019-08-132-23/+24
| |/
* | Merge pull request #2397 from kuzkry:custom-type-traits-is_referenceGennadiy Civil2019-08-194-10/+6
|\ \ | | | | | | | | | PiperOrigin-RevId: 264193098
| * | remove a custom implementation of std::is_referenceKrystian Kuzniarek2019-08-144-10/+6
| |/
* | Googletest exportAbseil Team2019-08-151-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | remove custom implementations of std::is_samerefs/pull/2399/headKrystian Kuzniarek2019-08-142-7/+3
|/
* Merge pull request #2359 from kuzkry:superfluous-mutableCJ Johnson2019-08-061-1/+1
|\ | | | | | | PiperOrigin-RevId: 261947085
| * remove an excessive mutable type specifierrefs/pull/2359/headKrystian Kuzniarek2019-08-011-1/+1
| | | | | | | | | | MockFunction's private member cannot be reached from outside and all its non-static member functions are not const.
* | Merge pull request #2357 from kuzkry:obsolete-documentationGennadiy Civil2019-08-024-20/+12
|\ \ | | | | | | | | | PiperOrigin-RevId: 261343928
| * | update pre-C++11 paragraphsrefs/pull/2357/headKrystian Kuzniarek2019-07-314-20/+12
| | |
* | | Googletest exportAbseil Team2019-08-011-2/+2
| |/ |/| | | | | | | | | Fix ON_CALL/EXPECT_CALL example comment PiperOrigin-RevId: 261150884
* | fix typosrefs/pull/2356/headKrystian Kuzniarek2019-07-305-45/+45
| |
* | Googletest exportAbseil Team2019-07-261-0/+35
|/ | | | | | Add copyright. PiperOrigin-RevId: 259997211
* Add missing <functional> includerefs/pull/2332/headAdam Badura2019-07-161-0/+1
| | | | | | | 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.
* Googletest exportmisterg2019-07-163-3/+3
| | | | | | Fix documentation links PiperOrigin-RevId: 258389329
* Googletest exportAbseil Team2019-07-163-3/+3
| | | | | | Update a broken link in a comment. PiperOrigin-RevId: 257493975
* Renaming doc files to make the file names more palatable and in preparation ↵Gennadiy Civil2019-06-194-4/+4
| | | | for including documentation in sync process
* Don't allow signed/unsigned wchar_t in gcc 9 and laterrefs/pull/2270/headPeter Levine2019-06-041-1/+4
|
* Googletest exportAbseil Team2019-05-031-67/+11
| | | | | | Remove special case for protocol buffers. It is no longer needed. PiperOrigin-RevId: 246550795
* MSVC C5046 warning is unavailable in MSVC 2015.refs/pull/2226/headDavid Benjamin2019-04-091-2/+9
| | | | | | | | | | | | | | | | 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
* Googletest exportAbseil Team2019-04-012-9/+6
| | | | | | | | 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
* Googletest exportAbseil Team2019-03-211-5/+3
| | | | | | Remove mention of unused type ProtocolMessage. PiperOrigin-RevId: 239242706
* Googletest exportAbseil Team2019-03-212-61/+85
| | | | | | Action helpers need to pass by const& so that they can work with unique_ptr. PiperOrigin-RevId: 239062671
* Googletest exportAbseil Team2019-03-011-1/+1
| | | | | | | | | | 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