aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-matchers_test.cc
Commit message (Collapse)AuthorAgeFilesLines
* Fix clang `-Wunused-parameter` warningsEnji Cooper2019-02-131-1/+1
| | | | | | Comment out unused method parameters in their relevant definitions. Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
* Fix clang `-Winconsistent-missing-override` warningsEnji Cooper2019-02-131-3/+3
| | | | | | | | `DescribeTo(..)` and `MatchAndExplain(..)` in `gmock-matchers_test` both override virtual methods. Remove the `virtual` keyword and apply `override` to them instead. Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
* Fix -Wunused-private-field issues with clangEnji Cooper2019-02-121-0/+2
| | | | | | | Provide dummy accessors for private values that are set in initializers, but not actually used. Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
* Googletest exportAbseil Team2019-02-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix matcher comparisons for std::reference_wrapper. The googletest docs indicate that std::reference_wrapper should be used to for objects that should not be copied by the matcher (in fact, the ByRef() function is basically the same as a call to std::cref). However, for many types (such as std::string), the overloaded operator== will not resolve correctly. Specifically, this is problematic if operator== depends on template argument deduction, where the same type is named on LHS and RHS. Because template argument deduction happens before any implict conversions for purposes of overload resolution, attempting to compare T with std::reference_wrapper<T> simply looks like a comparison of unlike types. For exapmle, std::reference_wrapper<std::string> is implicitly convertible to 'const std::string&', which would be able to choose an overload specialization of operator==. However, the implicit conversion can only happen after template argument deduction for operator==, so a specialization that would other be an applicable overload is never considered. Note also that this change only affects matchers. There are good reasons that matchers may need to transparently hold a std::reference_wrapper. Other comparisons (like EXPECT_EQ, et. al.) don't need to capture a reference: they don't need to defer evaluation (as in googlemock), and they don't need to avoid copies (as the call chain of matchers does). PiperOrigin-RevId: 232499175
* Googletest exportmisterg2019-02-041-4/+4
| | | | | | Mark legacy _TEST_CASE_ macros as deprecated PiperOrigin-RevId: 232303251
* Googletest exportAbseil Team2019-01-141-21/+86
| | | | | | Add move-only argument support to almost all remaining matchers. PiperOrigin-RevId: 229030728
* Googletest exportAbseil Team2019-01-141-63/+0
| | | | | | | Deduplicate testing::ReferenceWrapper with std::reference_wrapper. Minor cleanups in matchers_test. PiperOrigin-RevId: 229022872
* Googletest exportAbseil Team2019-01-021-23/+0
| | | | | | | | Remove the #ifs for old, unsupported and buggy compilers: * old versions of GCC & MSVC * Symbian PiperOrigin-RevId: 227116941
* Googletest exportAbseil Team2018-12-201-42/+2
| | | | | | Unifdef c++11-related macros from googletest now that it requires C++11. PiperOrigin-RevId: 225905601
* Googletest exportAbseil Team2018-12-171-4/+103
| | | | | | Allow container matchers to accept move-only containers. PiperOrigin-RevId: 225667441
* Googletest exportAbseil Team2018-12-121-5/+88
| | | | | | | | | | | | | | 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
* Googletest exportmisterg2018-12-111-84/+5
| | | | | | rollback of 224929783 PiperOrigin-RevId: 225008559
* Googletest exportAbseil Team2018-12-111-5/+84
| | | | | | | | | | | | | | 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: 224929783
* Googletest exportAbseil Team2018-12-041-0/+11
| | | | | | Deduce SizeType for SizeIs() from the return value of the size() member function PiperOrigin-RevId: 223835674
* Googletest exportAbseil Team2018-12-031-14/+7
| | | | | | Applied fixes for ClangTidy modernize-use-override and modernize-use-using. PiperOrigin-RevId: 223800219
* Googletest exportAbseil Team2018-12-031-3/+149
| | | | | | Replace pump'd Args() matcher with variadic templates. PiperOrigin-RevId: 223794430
* Googletest exportmisterg2018-10-301-2/+0
| | | | | | Remove scoped_ptr replace with std::unique_ptr PiperOrigin-RevId: 219291284
* Merge pull request #1941 from barkovv:masterGennadiy Civil2018-10-291-3/+3
|\ | | | | | | PiperOrigin-RevId: 219134349
| * Replaced all NULLs with nullptr in googlemockVadim Barkov2018-10-281-3/+3
| |
* | Googletest exportmisterg2018-10-291-26/+6
|/ | | | | | Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 219129336
* Googletest exportAbseil Team2018-10-261-6/+26
| | | | | | Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 218618184
* Googletest exportmisterg2018-10-261-26/+6
| | | | | | Remove linked_ptr and use std::shared_ptr instead PiperOrigin-RevId: 218571466
* Remove non-variadic pre C++11 AnyOfmisterg2018-10-091-26/+16
| | | | PiperOrigin-RevId: 216411381
* Unconditionally use std::tuple.Abseil Team2018-10-091-48/+45
| | | | | | Remove all mention of TR1 tuple and our own implementation of tuple. PiperOrigin-RevId: 216395043
* Fixing AllOfMatches test, where it properly belongsmisterg2018-10-081-8/+8
| | | | PiperOrigin-RevId: 216193701
* Remove non-variadic pre C++11 AllOfmisterg2018-10-081-58/+37
| | | | PiperOrigin-RevId: 216183352
* Apply clang-tidy modernize-use-nullptr to googletest.Abseil Team2018-10-051-62/+62
| | | | | | | | | | | Now that googletest has moved to C++11, it should no longer use NULL or 0 for the null pointer. This patch converts all such usages to nullptr using clang-tidy. This prevents LLVM from issuing -Wzero-as-null-pointer-constant warnings. PiperOrigin-RevId: 215814400
* Googletest exportAbseil Team2018-09-141-10/+29
| | | | | | | | | Treat default-constructed string_view same as constructed from "". In the context of string comparison (e.g. HasSubstr, StartsWith, EndsWith, etc.), a default-constructed string_view (nullptr) should be semantically same as a empty string "". PiperOrigin-RevId: 212816839
* No longer require a functor passed to ResultOf matcher to define `result_of` ↵Abseil Team2018-08-271-0/+18
| | | | | | | | | type. This makes ResultOf more convenient to use. In particular, the matcher now accepts lambdas. PiperOrigin-RevId: 210118509
* Comments changes, no functionality changesGennadiy Civil2018-08-141-2/+1
|
* code mergeGennadiy Civil2018-07-201-1/+4
|
* code syncGennadiy Civil2018-07-191-0/+1
|
* Code syncGennadiy Civil2018-07-181-3/+20
|
* Fix gmock not building when -fno-rttiScott Graham2018-05-021-4/+2
| | | | Fixes issue #1554. This is internal cl/195020996.
* mergedGennadiy Civil2018-04-251-1/+0
|\
| * Merge branch 'master' into parameterlessdnsunderland2018-04-181-0/+27
| |\
| * | Clone of unsubmitted cr/176529515. Introduce parameterless expectations.David Sunderland2018-04-181-1/+38
| | |
* | | merging, Gennadiy Civil2018-04-251-13/+54
| |/ |/|
* | 193353312Gennadiy Civil2018-04-181-0/+9
| |
* | cl/193060888Gennadiy Civil2018-04-171-3/+3
| |
* | http://cl/193060888Gennadiy Civil2018-04-171-30/+6
| |
* | http://cl/193060888Gennadiy Civil2018-04-171-0/+42
|/
* msvcGennadiy Civil2018-04-121-2/+2
|
* revert this oneGennadiy Civil2018-04-121-1/+1
|
* merge, ... gmock-matchers testGennadiy Civil2018-04-121-3/+3
|
* small cleanupGennadiy Civil2018-04-121-1/+7
|
* Have to wait for this oneGennadiy Civil2018-04-051-2/+2
|
* Have to wait for this oneGennadiy Civil2018-04-051-1/+1
|
* Merging matchers testGennadiy Civil2018-04-051-0/+3
|
* Merging matchers testGennadiy Civil2018-04-051-40/+779
|