Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'google/master' | Billy Donahue | 2015-08-25 | 25 | -88/+20752 |
|\ | |||||
| * | Merge pull request #182 from BillyDonahue/wiki | Billy Donahue | 2015-08-25 | 15 | -0/+0 |
| |\ | | | | | | | move versioned docs to version directories | ||||
| | * | move versioned docs to version directories | Billy Donahue | 2015-08-25 | 15 | -0/+0 |
| | | | |||||
| * | | Merge pull request #180 from google/wiki | Billy Donahue | 2015-08-25 | 25 | -88/+20752 |
|/| | | | | | | | | merge wiki branch into master | ||||
| * | | Merge pull request #179 from BillyDonahue/wiki | Billy Donahue | 2015-08-25 | 114 | -0/+44775 |
| |\| | | | | | | | Catch up with doc fixes from false-start repo | ||||
| | * | readme.md updates | Billy Donahue | 2015-08-25 | 1 | -88/+69 |
| | | | |||||
| | * | README -> README.md | Billy Donahue | 2015-08-25 | 1 | -0/+0 |
| | | | |||||
| | * | move CheatSheet.md into docs | Billy Donahue | 2015-08-25 | 1 | -0/+0 |
| | | | |||||
| | * | Move all .md files from wiki into docs/ dir. | Billy Donahue | 2015-08-25 | 23 | -0/+0 |
| | | | |||||
| | * | Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki | Billy Donahue | 2015-08-25 | 24 | -0/+20683 |
| |/| |/|/ | |||||
| * | Migrating wiki contents from Google Code | Google Code Exporter | 2015-08-24 | 24 | -0/+20683 |
| | |||||
* | Rename custom/callback-actions.h[.pump] => | kosak | 2015-07-28 | 6 | -16/+16 |
| | | | | custom/gmock-generated-actions.h[.pump]. | ||||
* | Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_ | kosak | 2015-07-28 | 1 | -0/+5 |
| | |||||
* | Inject a mock stack trace getter. | kosak | 2015-07-28 | 1 | -10/+42 |
| | |||||
* | Add an injection point for customizing GMOCK_DECLARE_bool and the like. | kosak | 2015-07-28 | 2 | -0/+51 |
| | |||||
* | Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_. | kosak | 2015-07-27 | 1 | -0/+18 |
| | | | | Pull in gtest 744. | ||||
* | Inject customization point for gmock-matchers.h | kosak | 2015-07-27 | 2 | -1/+43 |
| | |||||
* | Templatize ParseeGoogleMockStringFlag on String type. | kosak | 2015-07-27 | 1 | -1/+2 |
| | |||||
* | Missing diff that should have gone along with the pull of gtest 738. | kosak | 2015-07-27 | 1 | -39/+0 |
| | |||||
* | Explicitly specify return value for lambda in AsStdFunction() to ensure it | kosak | 2015-07-24 | 3 | -12/+22 |
| | | | | works properly where return type is a reference. | ||||
* | Remove some tests. | kosak | 2015-07-19 | 1 | -19/+2 |
| | |||||
* | Move Callback-related generated actions to a custom/ file. | kosak | 2015-07-19 | 5 | -169/+166 |
| | |||||
* | Mark the default constructor of Matcher<> explicit. | kosak | 2015-07-13 | 1 | -1/+1 |
| | | | | This prevents implicitly constructing a matcher from {}. | ||||
* | Fix EXPECT_THAT() to support literal strings as a second argument. | kosak | 2015-04-28 | 2 | -3/+19 |
| | |||||
* | Change IsNull and NotNull to use ==/!= nullptr in C++11. | kosak | 2015-04-28 | 3 | -1/+27 |
| | | | | Also update gmock_doctor due to Clang wording change. | ||||
* | Suppresses the stack trace in a warning for uninteresting call by default; ↵ | kosak | 2015-02-14 | 3 | -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 default | kosak | 2015-02-14 | 4 | -72/+150 |
| | | | | constructible return a default-constructed value by default. | ||||
* | This change adds an explicit invocation of std::move to workaround a problem | kosak | 2015-02-14 | 1 | -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. | kosak | 2015-01-08 | 2 | -1/+19 |
| | |||||
* | Adding support to gmock_gen for nested templates. | kosak | 2015-01-08 | 3 | -4/+41 |
| | |||||
* | Makes DoubleNear() print the diff between the actual and the expected value ↵ | kosak | 2015-01-08 | 3 | -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 ↵ | kosak | 2014-11-17 | 2 | -4/+73 |
| | | | | functions in the gmock generator. | ||||
* | Prevent gmock_gen from returning exit code zero on a failure to parse. | kosak | 2014-11-17 | 1 | -1/+1 |
| | |||||
* | Handle parameters without variable names when the type includes *, & or []. | kosak | 2014-11-17 | 2 | -4/+33 |
| | |||||
* | Update gmock_doctor to accept static_assert output. | kosak | 2014-11-17 | 1 | -0/+9 |
| | |||||
* | Fix gmock-matchers_test's ConstIter. | kosak | 2014-11-17 | 1 | -2/+2 |
| | |||||
* | Fix gmock Action behaviour when return type is Wrapper | kosak | 2014-11-17 | 2 | -2/+26 |
| | |||||
* | Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro. | kosak | 2014-11-17 | 2 | -93/+166 |
| | |||||
* | Call move() by qualified name (::testing::internal::move() or just ↵ | kosak | 2014-11-17 | 2 | -6/+10 |
| | | | | | | internal::move()). Pull in gtest 696. | ||||
* | Silence a signedness-comparison warning in gmock-actions_test. | kosak | 2014-11-17 | 3 | -2/+10 |
| | | | | include <functional> when using std::function in gmock. | ||||
* | Add ByMove() modifier for the Return() action. Pull in gtest 695. | kosak | 2014-11-17 | 3 | -19/+93 |
| | |||||
* | Distinguish between C++11 language and library support for std::function, ↵ | kosak | 2014-11-17 | 6 | -35/+35 |
| | | | | | | std::begin, std::end, and std::move in gtest and gmock. Bring in gtest 694. | ||||
* | Defines the UnorderedPointwise(m, container) matcher, which is like ↵ | kosak | 2014-07-28 | 2 | -68/+336 |
| | | | | Pointwise(m, container) but ignores the order of the elements. | ||||
* | Allows {Unordered,}ElementsAreArray() to accept any STL-style container as ↵ | kosak | 2014-07-28 | 2 | -11/+37 |
| | | | | the parameter. | ||||
* | Add MockFunction::AsStdFunction(). Also pull in gtest 688. | kosak | 2014-06-17 | 3 | -2/+138 |
| | |||||
* | Push several shanges: | billydonahue | 2014-05-19 | 9 | -23/+249 |
| | | | | | | | | | | | | | | | | | | | | | | Make single argument constructors explicit in macros. Remove NOMINMAX macro. Add macros for disabling Microsoft Visual C++ warnings. Add WhenDynamicCastTo<T> matcher. A matcher that matches a pointer that matches inner_matcher when dynamic_cast<T> is applied. Add IWYU export pragmas to the tuple include lines. Fix NativeArray to not require a copy constructor unless we ask for one. This allows ElementsAre() to support non-copyable types. Examine WINAPI_FAMILY_PARTITION macros to better distinguish windows platforms. Author: martin@martin.st From: https://codereview.appspot.com/57220043/ | ||||
* | Export tuple and friends in the ::testing namespace. | kosak | 2014-04-02 | 19 | -375/+306 |
| | |||||
* | Implement threading support for gmock on Windows. | kosak | 2014-03-24 | 2 | -3/+7 |
| | | | | | Replace U+2013 with U+002D in comment lines. Pull in gtest 681. | ||||
* | Make the gmock generator work with the 'override' keyword. Also pull in ↵ | kosak | 2014-03-12 | 3 | -2/+17 |
| | | | | gtest 680. | ||||
* | Introduce a BeginEndDistanceIs matcher for containers such as std::forward_list | kosak | 2014-03-12 | 2 | -0/+133 |
| | | | | | | which lack a size() member. Also pull in gtest 678. |