Commit Graph

274 Commits

Author SHA1 Message Date
Billy Donahue
84b8863dd9 Merge remote-tracking branch 'google/master' 2015-08-25 15:54:26 -04:00
Billy Donahue
65f381be21 Merge pull request #182 from BillyDonahue/wiki
move versioned docs to version directories
2015-08-25 15:44:43 -04:00
Billy Donahue
3e42adb74f move versioned docs to version directories 2015-08-25 15:42:30 -04:00
Billy Donahue
07b2bd1f7b Merge pull request #180 from google/wiki
merge wiki branch into master
2015-08-25 13:54:31 -04:00
Billy Donahue
168ab06783 Merge pull request #179 from BillyDonahue/wiki
Catch up with doc fixes from false-start repo
2015-08-25 13:53:10 -04:00
Billy Donahue
06fcd9ff11 readme.md updates 2015-08-25 13:51:43 -04:00
Billy Donahue
36d1a71bad README -> README.md 2015-08-25 13:47:38 -04:00
Billy Donahue
872c422ec2 move CheatSheet.md into docs 2015-08-25 13:47:06 -04:00
Billy Donahue
3b6c87d413 Move all .md files from wiki into docs/ dir. 2015-08-25 13:32:45 -04:00
Billy Donahue
26effd4ac9 Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki 2015-08-25 13:29:00 -04:00
Google Code Exporter
c3d8269e34 Migrating wiki contents from Google Code 2015-08-24 18:41:02 -04:00
kosak
6e1087218b Rename custom/callback-actions.h[.pump] =>
custom/gmock-generated-actions.h[.pump].
2015-07-28 00:53:13 +00:00
kosak
01db9d469b Injection point for GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_ 2015-07-28 00:24:28 +00:00
kosak
e83085aeb1 Inject a mock stack trace getter. 2015-07-28 00:12:51 +00:00
kosak
58a4bb42c8 Add an injection point for customizing GMOCK_DECLARE_bool and the like. 2015-07-28 00:02:21 +00:00
kosak
cac6c1bb53 Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_.
Pull in gtest 744.
2015-07-27 23:51:16 +00:00
kosak
6702b97d5e Inject customization point for gmock-matchers.h 2015-07-27 23:05:57 +00:00
kosak
c820efcc04 Templatize ParseeGoogleMockStringFlag on String type. 2015-07-27 22:08:34 +00:00
kosak
37a8c1068d Missing diff that should have gone along with the pull of gtest 738. 2015-07-27 20:52:35 +00:00
kosak
a6e32f0a2c Explicitly specify return value for lambda in AsStdFunction() to ensure it
works properly where return type is a reference.
2015-07-24 20:05:26 +00:00
kosak
f6df4c6baf Remove some tests. 2015-07-19 22:58:38 +00:00
kosak
67c377d3b1 Move Callback-related generated actions to a custom/ file. 2015-07-19 20:39:47 +00:00
kosak
d86a723ed9 Mark the default constructor of Matcher<> explicit.
This prevents implicitly constructing a matcher from {}.
2015-07-13 21:19:43 +00:00
kosak
9b1a944ec4 Fix EXPECT_THAT() to support literal strings as a second argument. 2015-04-28 23:06:58 +00:00
kosak
6305ff5a92 Change IsNull and NotNull to use ==/!= nullptr in C++11.
Also update gmock_doctor due to Clang wording change.
2015-04-28 22:36:31 +00:00
kosak
5625dd333a Suppresses the stack trace in a warning for uninteresting call by default; the stack trace will still be printed when --gmock_verbose=info is printed. 2015-02-14 22:05:58 +00:00
kosak
d478a1f46d In C++11 and above, makes a mock method whose return type is default
constructible return a default-constructed value by default.
2015-02-14 02:45:40 +00:00
kosak
02d6479259 This change adds an explicit invocation of std::move to workaround a problem
in VC++'s /analyze compiler that was causing build errors in Chrome:

https://code.google.com/p/googlemock/issues/detail?id=172
2015-02-14 02:22:21 +00:00
kosak
53d49dc43e Make ReturnNull() support unique_ptr and shared_ptr. 2015-01-08 03:03:09 +00:00
kosak
8e838ce0fd Adding support to gmock_gen for nested templates. 2015-01-08 02:48:08 +00:00
kosak
6b81780310 Makes DoubleNear() print the diff between the actual and the expected value when the match fails.
Also fix bogus MSVC warning about "alignment of a member was sensitive to packing".
Also bring in gtest 701.
2015-01-08 02:38:14 +00:00
kosak
61adbcc5c6 Add support for C++11 explicitly defaulted and deleted special member functions in the gmock generator. 2014-11-17 02:49:22 +00:00
kosak
055b6b17d2 Prevent gmock_gen from returning exit code zero on a failure to parse. 2014-11-17 02:46:37 +00:00
kosak
f58b49a2b1 Handle parameters without variable names when the type includes *, & or []. 2014-11-17 02:42:33 +00:00
kosak
6e87b780d3 Update gmock_doctor to accept static_assert output. 2014-11-17 02:22:20 +00:00
kosak
cd99eb0bbd Fix gmock-matchers_test's ConstIter. 2014-11-17 02:18:28 +00:00
kosak
7123d83132 Fix gmock Action behaviour when return type is Wrapper 2014-11-17 02:04:46 +00:00
kosak
506340a66b Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro. 2014-11-17 01:47:54 +00:00
kosak
d370f85b02 Call move() by qualified name (::testing::internal::move() or just internal::move()).
Pull in gtest 696.
2014-11-17 01:14:16 +00:00
kosak
389bad61e2 Silence a signedness-comparison warning in gmock-actions_test.
include <functional> when using std::function in gmock.
2014-11-17 01:08:51 +00:00
kosak
3d1c78b2bf Add ByMove() modifier for the Return() action. Pull in gtest 695. 2014-11-17 00:56:52 +00:00
kosak
5b9cbbb16d Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.
Bring in gtest 694.
2014-11-17 00:28:55 +00:00
kosak
2336e9c171 Defines the UnorderedPointwise(m, container) matcher, which is like Pointwise(m, container) but ignores the order of the elements. 2014-07-28 22:57:30 +00:00
kosak
06678924fa Allows {Unordered,}ElementsAreArray() to accept any STL-style container as the parameter. 2014-07-28 20:01:28 +00:00
kosak
a9e02a9178 Add MockFunction::AsStdFunction(). Also pull in gtest 688. 2014-06-17 23:19:54 +00:00
billydonahue
1f5fdea417 Push several shanges:
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/
2014-05-19 17:54:51 +00:00
kosak
bd0188320d Export tuple and friends in the ::testing namespace. 2014-04-02 20:30:00 +00:00
kosak
15d61e42bd Implement threading support for gmock on Windows.
Replace U+2013 with U+002D in comment lines.
Pull in gtest 681.
2014-03-24 22:08:24 +00:00
kosak
c26f969579 Make the gmock generator work with the 'override' keyword. Also pull in gtest 680. 2014-03-12 23:27:35 +00:00
kosak
b6a348862b Introduce a BeginEndDistanceIs matcher for containers such as std::forward_list
which lack a size() member.

Also pull in gtest 678.
2014-03-12 21:06:46 +00:00