aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #512 from google/unificationBilly Donahue2015-08-25314-428/+65882
|\ | | | | Unify googlemock into googletest
| * Merge pull request #511 from BillyDonahue/unificationBilly Donahue2015-08-25115-31/+65485
| |\ | | | | | | Bring GoogleMock into the GoogleTest repository
| | * tiny fixBilly Donahue2015-08-251-5/+6
| | |
| | * unified project homeBilly Donahue2015-08-251-58/+62
| | |
| | * cat _home.md files into README.mdBilly Donahue2015-08-252-41/+32
| | |
| | * move ProjectHome files into rootBilly Donahue2015-08-252-0/+0
| | |
| | * Merge branch 'unification' of github.com:BillyDonahue/googlemock into ↵Billy Donahue2015-08-25114-0/+65458
| |/| | | | | | | | | | unification
| | * move googlemock files into googlemock/ subdirBilly Donahue2015-08-25114-0/+0
| | |
| | * Merge remote-tracking branch 'google/master'Billy Donahue2015-08-2525-88/+20752
| | |\
| | | * Merge pull request #182 from BillyDonahue/wikiBilly Donahue2015-08-2515-0/+0
| | | |\ | | | | | | | | | | move versioned docs to version directories
| | | | * move versioned docs to version directoriesBilly Donahue2015-08-2515-0/+0
| | | | |
| | | * | Merge pull request #180 from google/wikiBilly Donahue2015-08-2525-88/+20752
| | |/| | | | | | | | | | | | merge wiki branch into master
| | | * | Merge pull request #179 from BillyDonahue/wikiBilly Donahue2015-08-25114-0/+44775
| | | |\| | | | | | | | | | | Catch up with doc fixes from false-start repo
| | | | * readme.md updatesBilly Donahue2015-08-251-88/+69
| | | | |
| | | | * README -> README.mdBilly Donahue2015-08-251-0/+0
| | | | |
| | | | * move CheatSheet.md into docsBilly Donahue2015-08-251-0/+0
| | | | |
| | | | * Move all .md files from wiki into docs/ dir.Billy Donahue2015-08-2523-0/+0
| | | | |
| | | | * Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wikiBilly Donahue2015-08-2524-0/+20683
| | | |/| | | |/|/
| | | * Migrating wiki contents from Google CodeGoogle Code Exporter2015-08-2424-0/+20683
| | |
| | * Rename custom/callback-actions.h[.pump] =>kosak2015-07-286-16/+16
| | | | | | | | | | | | custom/gmock-generated-actions.h[.pump].
| | * Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_kosak2015-07-281-0/+5
| | |
| | * Inject a mock stack trace getter.kosak2015-07-281-10/+42
| | |
| | * Add an injection point for customizing GMOCK_DECLARE_bool and the like.kosak2015-07-282-0/+51
| | |
| | * Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_.kosak2015-07-271-0/+18
| | | | | | | | | | | | Pull in gtest 744.
| | * Inject customization point for gmock-matchers.hkosak2015-07-272-1/+43
| | |
| | * Templatize ParseeGoogleMockStringFlag on String type.kosak2015-07-271-1/+2
| | |
| | * Missing diff that should have gone along with the pull of gtest 738.kosak2015-07-271-39/+0
| | |
| | * Explicitly specify return value for lambda in AsStdFunction() to ensure itkosak2015-07-243-12/+22
| | | | | | | | | | | | works properly where return type is a reference.
| | * Remove some tests.kosak2015-07-191-19/+2
| | |
| | * Move Callback-related generated actions to a custom/ file.kosak2015-07-195-169/+166
| | |
| | * Mark the default constructor of Matcher<> explicit.kosak2015-07-131-1/+1
| | | | | | | | | | | | This prevents implicitly constructing a matcher from {}.
| | * Fix EXPECT_THAT() to support literal strings as a second argument.kosak2015-04-282-3/+19
| | |
| | * Change IsNull and NotNull to use ==/!= nullptr in C++11.kosak2015-04-283-1/+27
| | | | | | | | | | | | Also update gmock_doctor due to Clang wording change.
| | * Suppresses the stack trace in a warning for uninteresting call by default; ↵kosak2015-02-143-13/+27
| | | | | | | | | | | | the stack trace will still be printed when --gmock_verbose=info is printed.
| | * In C++11 and above, makes a mock method whose return type is defaultkosak2015-02-144-72/+150
| | | | | | | | | | | | constructible return a default-constructed value by default.
| | * This change adds an explicit invocation of std::move to workaround a problemkosak2015-02-141-0/+7
| | | | | | | | | | | | | | | | | | in VC++'s /analyze compiler that was causing build errors in Chrome: https://code.google.com/p/googlemock/issues/detail?id=172
| | * Make ReturnNull() support unique_ptr and shared_ptr.kosak2015-01-082-1/+19
| | |
| | * Adding support to gmock_gen for nested templates.kosak2015-01-083-4/+41
| | |
| | * Makes DoubleNear() print the diff between the actual and the expected value ↵kosak2015-01-083-37/+73
| | | | | | | | | | | | | | | | | | | | | when the match fails. Also fix bogus MSVC warning about "alignment of a member was sensitive to packing". Also bring in gtest 701.
| | * Add support for C++11 explicitly defaulted and deleted special member ↵kosak2014-11-172-4/+73
| | | | | | | | | | | | functions in the gmock generator.
| | * Prevent gmock_gen from returning exit code zero on a failure to parse.kosak2014-11-171-1/+1
| | |
| | * Handle parameters without variable names when the type includes *, & or [].kosak2014-11-172-4/+33
| | |
| | * Update gmock_doctor to accept static_assert output.kosak2014-11-171-0/+9
| | |
| | * Fix gmock-matchers_test's ConstIter.kosak2014-11-171-2/+2
| | |
| | * Fix gmock Action behaviour when return type is Wrapperkosak2014-11-172-2/+26
| | |
| | * Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro.kosak2014-11-172-93/+166
| | |
| | * Call move() by qualified name (::testing::internal::move() or just ↵kosak2014-11-172-6/+10
| | | | | | | | | | | | | | | | | | internal::move()). Pull in gtest 696.
| | * Silence a signedness-comparison warning in gmock-actions_test.kosak2014-11-173-2/+10
| | | | | | | | | | | | include <functional> when using std::function in gmock.
| | * Add ByMove() modifier for the Return() action. Pull in gtest 695.kosak2014-11-173-19/+93
| | |
| | * Distinguish between C++11 language and library support for std::function, ↵kosak2014-11-176-35/+35
| | | | | | | | | | | | | | | | | | std::begin, std::end, and std::move in gtest and gmock. Bring in gtest 694.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 07:41:55 +0000