aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
Commit message (Collapse)AuthorAgeFilesLines
* Googletest exportAbseil Team2020-02-074-34/+68
| | | | | | Fix std::move to std::forward where appropriate to support reference types. PiperOrigin-RevId: 292923058
* Googletest exportAbseil Team2020-02-074-54/+48
| | | | | | | Fix use of reserved names. Minimize code duplication needed for explict-vs-nonexplicit constructor. PiperOrigin-RevId: 292555014
* Googletest exportAbseil Team2020-02-071-0/+3
| | | | | | Add includes for type_traits and utility to gmock-function-mocker.h: macros in the file require these headers. PiperOrigin-RevId: 291782497
* Googletest exportAbseil Team2020-02-073-441/+257
| | | | | | | | | | | Create implementation macroses for matchers to move variadic parameters to the end of parameters list. To save backward compatibility, old macroses will be still taking `description` parameter as the last one. But they will use INTERNAL macro that takes `description` as the second parameter. PiperOrigin-RevId: 291724469
* Googletest exportAbseil Team2020-02-073-208/+122
| | | | | | | | Move part of functionality of Matcher* class to the base one. Reduce copypaste. Make constructor and conversion operator of Matcher* class independent of pump. PiperOrigin-RevId: 291405510
* Googletest exportAbseil Team2020-02-071-1/+1
| | | | | | | | | Add missing explicit keyword for gmock_Impl constructor. When switching to using GMOCK_PP in ACTION* macroses `explicit` keyword was missed in gmock_Impl constructor causing ClangTidy warnings in ACTION_P macro. PiperOrigin-RevId: 291159975
* Googletest exportAbseil Team2020-01-211-1/+1
| | | | | | | | | Allow copying of the string in MatchAndExplain. Otherwise, conversions from std::string_view to std::string will fail as being explicit PiperOrigin-RevId: 290301103
* Merge pull request #2665 from ↵Xiaoyi Zhang2020-01-211-3/+5
|\ | | | | | | | | | | bysreg:fix_noshortcircuitfailure_detectsflakyshortcircuit_test PiperOrigin-RevId: 290256504
| * Use IsReadableTypeName IsReadableTypeName in OfType function in ↵Muhammad Hilman Beyri2020-01-121-1/+1
| | | | | | | | gmock-matchers_test.cc
| * fix unit test failure on NoShortCircuitOnFailure and ↵Muhammad Hilman Beyri2020-01-121-2/+2
| | | | | | | | DetectsFlakyShortCircuit when GTEST_HAS_RTTI is 1
* | Googletest exportAbseil Team2020-01-163-885/+238
| | | | | | | | | | | | | | | | | | Use GMOCK_PP to create GMOCK_INTERNAL_ACTION macro. Create GMOCK_INTERNAL_ACTION macro that generates ACTION_P* macroses using GMOCK_PP. PiperOrigin-RevId: 289815906
* | Googletest exportAbseil Team2020-01-163-198/+58
|/ | | | | | | | | Use GMOCK_PP to generate args boilerplate. Move common args describing part to separate macroses that uses GMOCK_PP to generate sequences. PiperOrigin-RevId: 289655624
* Googletest exportAbseil Team2020-01-093-186/+94
| | | | | | | | Move part of functionality of Action* class to the base one. Reduce copypaste. Make constructor and conversion operator of Action* class independent of pump. PiperOrigin-RevId: 288907005
* Googletest exportAbseil Team2020-01-093-134/+42
| | | | | | | | Use C++11 variadic templates for Invoke in gmock-generated-actions.h. Replace InvokeArgumentAdl with Invoke that uses C++11 variadic templates. PiperOrigin-RevId: 288449236
* Googletest exportAbseil Team2020-01-021-0/+2
| | | | | | | | | | Explicitly default copy constructor in BoundSecondMatcher Since C++11, implicit defaulting of copy constructors is deprecated for types with user-defined copy assignment operators, so we should explicitly default the copy constructor of BoundSecondMatcher. PiperOrigin-RevId: 287587847
* Googletest exportAbseil Team2020-01-021-1/+1
| | | | | | Fix typo in example. PiperOrigin-RevId: 287212448
* Googletest exportAbseil Team2020-01-023-17/+98
| | | | | | | | | Use C++11 variadic templates for InvokeArgumentAdl in gmock-generated-actions.h. Make InvokeArgumentAdl use variadic templates to generate its overloads instead of using pump.py syntax. PiperOrigin-RevId: 286267615
* Googletest exportAbseil Team2020-01-023-98/+17
| | | | | | | | | Use C++11 variadic templates for InvokeArgumentAdl in gmock-generated-actions.h. Make InvokeArgumentAdl use variadic templates to generate its overloads instead of using pump.py syntax. PiperOrigin-RevId: 286148805
* Googletest exportkrzysio2019-12-161-18/+17
| | | | | | | | Don't use fully qualified ::std types in code examples. Having a nested user-defined 'std' namespace anywhere in a program is a minefield and shouldn't be either explicitly supported or implicitly condoned. PiperOrigin-RevId: 285790182
* Googletest exportAbseil Team2019-12-133-175/+40
| | | | | | | | Use C++11 variadic templates for ActionHelper in gmock-generated-actions.h. Make ActionHelper use variadic templates to generate Perform static member function specializations instead of using pump.py syntax. PiperOrigin-RevId: 284988441
* Merge pull request #2595 from kuzkry:remove-workaround_msvc-warning-4355Matt Calabrese2019-12-131-8/+0
|\ | | | | | | PiperOrigin-RevId: 284234675
| * remove MSVC workaround: warning 4355Krystian Kuzniarek2019-11-221-8/+0
| |
* | Merge pull request #2592 from kuzkry:remove-workaround_msvc-error-C2665Matt Calabrese2019-12-131-9/+0
|\ \ | | | | | | | | | PiperOrigin-RevId: 284207090
| * | remove MSVC workaround: error C2665Krystian Kuzniarek2019-11-221-9/+0
| |/
* | Merge pull request #2609 from kuzkry:revert-2596Mark Barolak2019-12-061-3/+10
|\ \ | | | | | | | | | PiperOrigin-RevId: 284041013
| * | Revert "remove MSVC workaround: wmain link error in the static library"Krystian Kuzniarek2019-11-271-2/+9
| | | | | | | | | | | | This reverts commit 298a40f023e6813d2bf73847c3a38ceaf5e46320.
| * | Revert "unify googletest and googlemock main functions"Krystian Kuzniarek2019-11-271-1/+1
| | | | | | | | | | | | This reverts commit a909becdc599c46bcb57346b6123cb57cd07d15d.
* | | Merge pull request #2594 from ↵Mark Barolak2019-12-051-17/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | kuzkry:remove-workaround_msvc-unneeded-const-dropping PiperOrigin-RevId: 283979494
| * | | remove MSVC workaround: cease const droppingKrystian Kuzniarek2019-11-221-14/+3
| | |/ | |/|
* | | Googletest exportAbseil Team2019-12-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify use of IsTrue and IsFalse matchers. These matchers are subtle and confusing: what are they for? The docs in the code are clear, but not very accessible. googletest/googlemock/include/gmock/gmock-more-matchers.h PiperOrigin-RevId: 283393275
* | | Merge pull request #2603 from maximilianschwab:patch-1Mark Barolak2019-12-021-1/+1
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 283349646
| * | | Fixed typoMaximilian Schwab2019-11-251-1/+1
| | | |
* | | | Merge pull request #2583 from ChristophStrehle:masterGennadiy Rozental2019-11-271-1/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | PiperOrigin-RevId: 282817206
| * | | Fix compile break for Microsoft Visual Studio 2017 v141Christoph Strehle2019-11-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround, for those who have to compile with v141 build tools, for a bug in msvc that the compiler can't compile the WithArgsAction. see the following link for more details: https://developercommunityapi.westus.cloudapp.azure.com/content/problem/420339/googlemocks-withargs-doesnt-compile-with-permissiv.html
* | | | Merge pull request #2593 from ↵Gennadiy Rozental2019-11-261-9/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | kuzkry:remove-workaround_msvc-namespace-scope-from-nested-class PiperOrigin-RevId: 282593823
| * | | | remove MSVC workaround: accessing namespace scope from within nested classesKrystian Kuzniarek2019-11-221-9/+4
| | |_|/ | |/| |
* | | | Merge pull request #2596 from kuzkry:remove-workaround_msvc-wmain-link-errorGennadiy Rozental2019-11-261-10/+3
|\ \ \ \ | | | | | | | | | | | | | | | PiperOrigin-RevId: 282589492
| * | | | unify googletest and googlemock main functionsKrystian Kuzniarek2019-11-221-1/+1
| | | | |
| * | | | remove MSVC workaround: wmain link error in the static libraryKrystian Kuzniarek2019-11-221-9/+2
| |/ / /
* | | | Merge pull request #2597 from ↵Gennadiy Rozental2019-11-261-49/+36
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | kuzkry:remove-workaround_Nokia-Sybian-SafeMatcherCastImpl PiperOrigin-RevId: 282581402
| * | | remove Nokia's Symbian compiler workaround: SafeMatcherCastImplKrystian Kuzniarek2019-11-221-49/+36
| | | |
| * | | consistency fix for SafeMatcherCastImpl member functionsKrystian Kuzniarek2019-11-221-1/+1
| |/ /
* | | Googletest exportAbseil Team2019-11-226-25/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard C++11 integer types in gtest-port.h. Remove testing::internal::{Int,Uint}{32,64} in favor of types guaranteed to be in <cstdint> since C++11. Tests for built-in integer type coverage are switched from {Int,Uint}64 to [unsigned] long long, which is guaranteed by C++11 to exist and be at least 64-bit wide. PiperOrigin-RevId: 281565263
* | | Googletest exportAbseil Team2019-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add a breadcrumb about nullopt comparison near the Optional() matcher. Also add a note about how otherwise-spurious 'Eq()' may be needed in some cases. Without this, something like Field(&MyStruct::optional_field_without_equals_equals, absl::nullopt) doesn't work - it converts the nullopt to an optional<> of the non-equalable type, and fails to select the operator==(optional<>, nullopt_t) overload. The Eq() lets the type persist later into the match. PiperOrigin-RevId: 281305519
* | | Googletest exportAbseil Team2019-11-192-2/+2
| |/ |/| | | | | | | | | Update stale comments to point to proper location. PiperOrigin-RevId: 281157036
* | Merge pull request #2556 from ienorand:avoid-pkg-config-lpthread-cflagAndy Getz2019-11-132-2/+2
|\ \ | | | | | | | | | PiperOrigin-RevId: 279375858
| * | pkg-config: Remove pthread link flag from CflagsMartin Erik Werner2019-11-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the threads link library variable references from the pkg-config Cflags: field, removing -lpthread(s) from the compile flags. "-l*" linker flags should only be part of the Libs: section and should not be part of the Cflags: section in pkg-config files. This was first suggested in https://github.com/google/googletest/pull/2006 and further discussed in https://github.com/google/googletest/pull/2483 .
* | | Merge pull request #2549 from kuzkry:pump-support-for-python-3Xiaoyi Zhang2019-11-051-6/+7
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 278702666
| * | | pump.py: add support for Python 3Krystian Kuzniarek2019-11-021-6/+7
| | |/ | |/|
* | | Merge pull request #2548 from kuzkry:update-pump-manualXiaoyi Zhang2019-11-051-12/+9
|\ \ \ | | | | | | | | | | | | PiperOrigin-RevId: 278702531