aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Silence a signedness-comparison warning in gmock-actions_test.kosak2014-11-172-0/+8
| | | | include <functional> when using std::function in gmock.
* Add ByMove() modifier for the Return() action. Pull in gtest 695.kosak2014-11-172-16/+54
|
* Distinguish between C++11 language and library support for std::function, ↵kosak2014-11-173-25/+25
| | | | | | std::begin, std::end, and std::move in gtest and gmock. Bring in gtest 694.
* Defines the UnorderedPointwise(m, container) matcher, which is like ↵kosak2014-07-281-1/+144
| | | | Pointwise(m, container) but ignores the order of the elements.
* Allows {Unordered,}ElementsAreArray() to accept any STL-style container as ↵kosak2014-07-281-10/+11
| | | | the parameter.
* Add MockFunction::AsStdFunction(). Also pull in gtest 688.kosak2014-06-172-2/+125
|
* Push several shanges:billydonahue2014-05-196-12/+105
| | | | | | | | | | | | | | | | | | | | | | 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.kosak2014-04-0212-348/+282
|
* Introduce a BeginEndDistanceIs matcher for containers such as std::forward_listkosak2014-03-121-0/+72
| | | | | | which lack a size() member. Also pull in gtest 678.
* Support mocking methods with move-only return types.kosak2014-01-293-41/+146
|
* Make Google Mock build cleanly on Visual Studio 2010, 2012, 2013.kosak2014-01-131-7/+17
|
* Adds a note in the "uninteresting mock method call" warning to advise people ↵kosak2014-01-121-4/+12
| | | | | | | 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.
* Distinguish between C++11 language and library support for <initializer_list>.kosak2013-12-041-4/+4
| | | | | Fix spelling: repositary -> repository. Pull in gtest 671.
* Don't copy the argument in SafeMatcherCast because it's not safe.kosak2013-12-031-5/+5
|
* Makes some container matchers accept initializer lists in C++11 mode and ↵zhanyong.wan2013-08-081-53/+102
| | | | work with stream-like containers that don't have size() or empty(); exposes StringMatchResultListener for defining composite matchers.
* Makes UnorderedElementsAre*() work with containers that don't have size() or ↵zhanyong.wan2013-07-301-7/+7
| | | | empty().
* Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls inzhanyong.wan2013-07-283-597/+860
| | | | gtest r660.
* Fixes uses of pair to std::pair; pulls in gtest r655.zhanyong.wan2013-06-201-3/+3
|
* New floating-point matchers: DoubleNear() and friends;zhanyong.wan2013-06-181-16/+194
| | | | AllOf() and AnyOf() can accept any number of arguments now in C++11 mode.
* Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653zhanyong.wan2013-04-241-2/+4
|
* Makes WhenSorted() support associative containers (by billydonahue@google.com).zhanyong.wan2013-03-272-1/+18
|
* Adds special support for matching StringPiece. Pulls in gtest r646.zhanyong.wan2013-03-251-0/+45
|
* Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic ↵zhanyong.wan2013-03-081-1/+1
| | | | mode.
* Improves the tests for nice, naggy, and strict mocks.zhanyong.wan2013-03-011-1/+2
|
* Allows the return type of a mock method to contain unprotected commas.zhanyong.wan2013-03-012-328/+397
|
* Implements NaggyMock.zhanyong.wan2013-03-013-75/+202
|
* Implements matcher SizeIs().zhanyong.wan2013-03-011-0/+64
|
* Clarifies how to implement MatcherInterface.zhanyong.wan2013-03-011-4/+21
|
* Implements matcher IsEmpty(); also pulls in gtest r643.zhanyong.wan2013-03-012-2/+61
|
* Makes googlemock throw a runtime_error instead of abort when a mockzhanyong.wan2013-02-281-7/+20
| | | | | method with no default value is invoked (if exceptions are enabled).
* Unfortunately, the svn repo is a bit out of date. This commit contains 8jgm2012-11-155-154/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes that haven't made it to svn. The descriptions of each change are listed below. - Fixes some python shebang lines. - Add ElementsAreArray overloads to gmock. ElementsAreArray now makes a copy of its input elements before the conversion to a Matcher. ElementsAreArray can now take a vector as input. ElementsAreArray can now take an iterator pair as input. - Templatize MatchAndExplain to allow independent string types for the matcher and matchee. I also templatized the ConstCharPointer version of MatchAndExplain to avoid calls with "char*" from using the new templated MatchAndExplain. - Fixes the bug where the constructor of the return type of ElementsAre() saves a reference instead of a copy of the arguments. - Extends ElementsAre() to accept arrays whose sizes aren't known. - Switches gTest's internal FilePath class from testing::internal::String to std::string. testing::internal::String was introduced when gTest couldn't depend on std::string. It's now deprecated. - Switches gTest & gMock from using testing::internal::String objects to std::string. Some static methods of String are still in use. We may be able to remove some but not all of them. In particular, String::Format() should eventually be removed as it truncates the result at 4096 characters, often causing problems.
* Makes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin).vladlosev2012-08-141-1/+1
|
* Pulls in gtest r615.zhanyong.wan2012-05-314-20/+13
| | | | | | Renames internal enums to the kFoo naming style. Fixes gmock doctor to work with newer versions of Clang.
* Reduced template instantiation depth for the AllOf and AnyOf matchers. Also ↵jgm2012-04-1011-292/+553
| | | | some formatting changes.
* Fixes a lock reentrancy when destroying a mock causes destruction of another ↵vladlosev2011-10-241-3/+18
| | | | mock (issue 79) (by Aaron Jacobs).
* Expressed the thread-safety annotations in code, replacing the existing ↵vladlosev2011-10-241-106/+116
| | | | comment-based system (by Aaron Jacobs).
* Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595.zhanyong.wan2011-09-161-0/+99
|
* Adds support for building Google Mock as a shared library (DLL).vladlosev2011-05-206-33/+36
|
* simplifies TrulyMatcher and adds a test for itzhanyong.wan2011-04-141-9/+9
|
* Updates conditional directives to be consistent with the rest of the project.vladlosev2011-04-141-2/+2
|
* Corrects condition to compile out MSVC's pragmas. This fixes the build on MinGW.vladlosev2011-04-131-4/+4
|
* Removes commas from last items in enums (a C++ standard compliance fix).vladlosev2011-04-082-4/+4
|
* Prevents ADL in AllOf() and AnyOf() (by Manuel Klimek).zhanyong.wan2011-03-162-22/+25
|
* Disables SetArgPointee("string literal") for GCC 4.0- and Symbian, andzhanyong.wan2011-03-091-0/+14
| | | | adds support for SetArgPointee(L"wide string literal") -- by Vlad Losev.
* Indents preprocessor directives.zhanyong.wan2011-02-248-29/+30
|
* Makes Google Mock compile much faster and use much less memory; reviewed by ↵zhanyong.wan2011-02-234-559/+422
| | | | Nico Weber. This fixes issue 68.
* Improves cross-platform compatibility of gmock output. This fixes issue 135.vladlosev2011-02-111-2/+2
|
* Picks up gtest r536; renames implicit_cast and down_cast to reduce the ↵zhanyong.wan2011-02-014-35/+35
| | | | chance of clash (by Roman Perepelitsa); enables gmock_gen.py to handle storage specifiers (by Steve Fox).
* Enables SetArgPointee<>() to accept a string literal; removes a ↵zhanyong.wan2010-12-021-0/+8
| | | | self-assignment warning; teaches gmock doctor to diagnose TTB with Clang; picks up gtest r525.
* Adds comment clarifying the use of default-constructed matchers.vladlosev2010-11-171-2/+3
|