Commit Graph

247 Commits

Author SHA1 Message Date
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
kosak
fc4aa1d718 Suppress "Conditional expression is constant" warning on Visual Studio. 2014-01-29 07:30:13 +00:00
kosak
b5c81098a8 Support mocking methods with move-only return types. 2014-01-29 06:41:44 +00:00
kosak
b93d0f10d5 Make Google Mock build cleanly on Visual Studio 2010, 2012, 2013. 2014-01-13 22:28:01 +00:00
kosak
04ce8521f4 Adds a note in the "uninteresting mock method call" warning to advise people how to handle the warning.
Clarifies the purpose of utilities in gmock-port.h and adds guidance w.r.t. gmock-port.h vs gtest-port.h.
Pulls in gtest r674.
2014-01-12 23:42:34 +00:00
kosak
18489fa4f8 Distinguish between C++11 language and library support for <initializer_list>.
Fix spelling: repositary -> repository.
Pull in gtest 671.
2013-12-04 23:49:07 +00:00
kosak
6414d806cd Fix warnings encountered with clang -Wall, and pull in gtest 670. 2013-12-03 23:19:36 +00:00
kosak
b72d18ca55 Clarify the rationale for gmock_all_test.cc, and pull in gtest 669 2013-12-03 22:46:51 +00:00
kosak
5f2a6ca4fd Don't copy the argument in SafeMatcherCast because it's not safe. 2013-12-03 01:43:07 +00:00
zhanyong.wan
88080ee943 adds gmock_doctor.py to the distro 2013-11-21 18:38:42 +00:00
zhanyong.wan
35877b7967 avoids clash with the max() macro on Windows 2013-09-18 17:51:08 +00:00
zhanyong.wan
6e0fba4de0 fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when built with VS 2013-09-16 05:50:53 +00:00
zhanyong.wan
45fef502fa makes googlemock generator handle some class templates; pulls in gtest r662 2013-09-06 22:52:14 +00:00
zhanyong.wan
778358e3f1 adds more files to gmock's distro 2013-08-27 21:31:58 +00:00
zhanyong.wan
35da814a99 fixes a typo 2013-08-27 21:04:16 +00:00
zhanyong.wan
64bd62daf2 adds gmock-more-matchers.h to the distro 2013-08-27 20:56:21 +00:00
zhanyong.wan
1cc1d4bcec Makes some container matchers accept initializer lists in C++11 mode and work with stream-like containers that don't have size() or empty(); exposes StringMatchResultListener for defining composite matchers. 2013-08-08 18:41:51 +00:00
zhanyong.wan
5579c1a8b1 Makes UnorderedElementsAre*() work with containers that don't have size() or empty(). 2013-07-30 06:16:21 +00:00
zhanyong.wan
fb25d53911 Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls in
gtest r660.
2013-07-28 08:24:00 +00:00
zhanyong.wan
2989703ed8 Fixes uses of pair to std::pair; pulls in gtest r655. 2013-06-20 18:59:15 +00:00
zhanyong.wan
616180e684 New floating-point matchers: DoubleNear() and friends;
AllOf() and AnyOf() can accept any number of arguments now in C++11 mode.
2013-06-18 18:49:51 +00:00
zhanyong.wan
f4274520da Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653 2013-04-24 02:49:43 +00:00
zhanyong.wan
061f1d4d16 Updates version number to 1.7.0 2013-04-07 03:16:38 +00:00
zhanyong.wan
c10a35a26a Fixes some compatibility issues with STLport. 2013-04-04 22:45:59 +00:00
zhanyong.wan
a9a59e06dd Makes WhenSorted() support associative containers (by billydonahue@google.com). 2013-03-27 16:14:55 +00:00
zhanyong.wan
1f122a06e6 Adds special support for matching StringPiece. Pulls in gtest r646. 2013-03-25 16:27:03 +00:00
zhanyong.wan
2eab17b76d Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic mode. 2013-03-08 17:53:24 +00:00
zhanyong.wan
a1a98f840e Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings. 2013-03-01 21:28:40 +00:00