aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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.
| | * Defines the UnorderedPointwise(m, container) matcher, which is like ↵kosak2014-07-282-68/+336
| | | | | | | | | | | | Pointwise(m, container) but ignores the order of the elements.
| | * Allows {Unordered,}ElementsAreArray() to accept any STL-style container as ↵kosak2014-07-282-11/+37
| | | | | | | | | | | | the parameter.
| | * Add MockFunction::AsStdFunction(). Also pull in gtest 688.kosak2014-06-173-2/+138
| | |
| | * Push several shanges:billydonahue2014-05-199-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.kosak2014-04-0219-375/+306
| | |
| | * Implement threading support for gmock on Windows.kosak2014-03-242-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 ↵kosak2014-03-123-2/+17
| | | | | | | | | | | | gtest 680.
| | * Introduce a BeginEndDistanceIs matcher for containers such as std::forward_listkosak2014-03-122-0/+133
| | | | | | | | | | | | | | | | | | which lack a size() member. Also pull in gtest 678.
| | * Suppress "Conditional expression is constant" warning on Visual Studio.kosak2014-01-292-0/+4
| | |
| | * Support mocking methods with move-only return types.kosak2014-01-295-44/+208
| | |
| | * Make Google Mock build cleanly on Visual Studio 2010, 2012, 2013.kosak2014-01-134-23/+59
| | |
| | * Adds a note in the "uninteresting mock method call" warning to advise people ↵kosak2014-01-124-9/+36
| | | | | | | | | | | | | | | | | | | | | 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-044-10/+10
| | | | | | | | | | | | | | | Fix spelling: repositary -> repository. Pull in gtest 671.
| | * Fix warnings encountered with clang -Wall, and pull in gtest 670.kosak2013-12-032-37/+33
| | |
| | * Clarify the rationale for gmock_all_test.cc, and pull in gtest 669kosak2013-12-031-2/+5
| | |
| | * Don't copy the argument in SafeMatcherCast because it's not safe.kosak2013-12-032-5/+28
| | |
| | * adds gmock_doctor.py to the distrozhanyong.wan2013-11-211-0/+4
| | |
| | * avoids clash with the max() macro on Windowszhanyong.wan2013-09-181-95/+60
| | |
| | * fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when ↵zhanyong.wan2013-09-161-2/+2
| | | | | | | | | | | | built with VS
| | * makes googlemock generator handle some class templates; pulls in gtest r662zhanyong.wan2013-09-066-14/+103
| | |
| | * adds more files to gmock's distrozhanyong.wan2013-08-271-1/+3
| | |
| | * fixes a typozhanyong.wan2013-08-271-1/+1
| | |
| | * adds gmock-more-matchers.h to the distrozhanyong.wan2013-08-271-0/+1
| | |
| | * Makes some container matchers accept initializer lists in C++11 mode and ↵zhanyong.wan2013-08-084-54/+214
| | | | | | | | | | | | 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-302-8/+38
| | | | | | | | | | | | empty().
| | * Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls inzhanyong.wan2013-07-287-605/+1664
| | | | | | | | | | | | 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-185-20/+455
| | | | | | | | | | | | 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-243-3/+34
| | |
| | * Updates version number to 1.7.0zhanyong.wan2013-04-072-2/+6
| | |
| | * Fixes some compatibility issues with STLport.zhanyong.wan2013-04-041-3/+3
| | |
| | * Makes WhenSorted() support associative containers (by billydonahue@google.com).zhanyong.wan2013-03-273-1/+179
| | |
| | * Adds special support for matching StringPiece. Pulls in gtest r646.zhanyong.wan2013-03-253-0/+118
| | |
| | * Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic ↵zhanyong.wan2013-03-081-1/+1
| | | | | | | | | | | | mode.
| | * Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings.zhanyong.wan2013-03-012-7/+8
| | |
| | * Improves the tests for nice, naggy, and strict mocks.zhanyong.wan2013-03-015-25/+77
| | |
| | * Allows the return type of a mock method to contain unprotected commas.zhanyong.wan2013-03-013-329/+446
| | |
| | * Removes unused variables and functions.zhanyong.wan2013-03-013-57/+27
| | |
| | * Implements NaggyMock.zhanyong.wan2013-03-014-81/+302
| | |
| | * Implements matcher SizeIs().zhanyong.wan2013-03-012-0/+123
| | |
| | * Clarifies how to implement MatcherInterface.zhanyong.wan2013-03-011-4/+21
| | |
| | * Implements matcher IsEmpty(); also pulls in gtest r643.zhanyong.wan2013-03-013-2/+95
| | |
| | * Makes googlemock throw a runtime_error instead of abort when a mockzhanyong.wan2013-02-284-101/+277
| | | | | | | | | | | | | | | method with no default value is invoked (if exceptions are enabled).
| | * Adds -pthread and switches -I to -isystem in build instructions;zhanyong.wan2013-02-272-10/+21
| | | | | | | | | | | | also pulls in the latest gtest revision (r638).
| | * Adds the LICENSE file to the distribution.vladlosev2013-01-311-1/+1
| | |
| | * Unfortunately, the svn repo is a bit out of date. This commit contains 8jgm2012-11-1511-191/+392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-1/+33
| | |
| | * Pulls in gtest r615.zhanyong.wan2012-05-318-57/+61
| | | | | | | | | | | | | | | | | | Renames internal enums to the kFoo naming style. Fixes gmock doctor to work with newer versions of Clang.