Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't copy the argument in SafeMatcherCast because it's not safe. | kosak | 2013-12-03 | 1 | -5/+5 |
| | |||||
* | Makes some container matchers accept initializer lists in C++11 mode and ↵ | zhanyong.wan | 2013-08-08 | 1 | -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.wan | 2013-07-30 | 1 | -7/+7 |
| | | | | empty(). | ||||
* | Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls in | zhanyong.wan | 2013-07-28 | 3 | -597/+860 |
| | | | | gtest r660. | ||||
* | Fixes uses of pair to std::pair; pulls in gtest r655. | zhanyong.wan | 2013-06-20 | 1 | -3/+3 |
| | |||||
* | New floating-point matchers: DoubleNear() and friends; | zhanyong.wan | 2013-06-18 | 1 | -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 r653 | zhanyong.wan | 2013-04-24 | 1 | -2/+4 |
| | |||||
* | Makes WhenSorted() support associative containers (by billydonahue@google.com). | zhanyong.wan | 2013-03-27 | 2 | -1/+18 |
| | |||||
* | Adds special support for matching StringPiece. Pulls in gtest r646. | zhanyong.wan | 2013-03-25 | 1 | -0/+45 |
| | |||||
* | Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic ↵ | zhanyong.wan | 2013-03-08 | 1 | -1/+1 |
| | | | | mode. | ||||
* | Improves the tests for nice, naggy, and strict mocks. | zhanyong.wan | 2013-03-01 | 1 | -1/+2 |
| | |||||
* | Allows the return type of a mock method to contain unprotected commas. | zhanyong.wan | 2013-03-01 | 2 | -328/+397 |
| | |||||
* | Implements NaggyMock. | zhanyong.wan | 2013-03-01 | 3 | -75/+202 |
| | |||||
* | Implements matcher SizeIs(). | zhanyong.wan | 2013-03-01 | 1 | -0/+64 |
| | |||||
* | Clarifies how to implement MatcherInterface. | zhanyong.wan | 2013-03-01 | 1 | -4/+21 |
| | |||||
* | Implements matcher IsEmpty(); also pulls in gtest r643. | zhanyong.wan | 2013-03-01 | 2 | -2/+61 |
| | |||||
* | Makes googlemock throw a runtime_error instead of abort when a mock | zhanyong.wan | 2013-02-28 | 1 | -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 8 | jgm | 2012-11-15 | 5 | -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). | vladlosev | 2012-08-14 | 1 | -1/+1 |
| | |||||
* | Pulls in gtest r615. | zhanyong.wan | 2012-05-31 | 4 | -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 ↵ | jgm | 2012-04-10 | 11 | -292/+553 |
| | | | | some formatting changes. | ||||
* | Fixes a lock reentrancy when destroying a mock causes destruction of another ↵ | vladlosev | 2011-10-24 | 1 | -3/+18 |
| | | | | mock (issue 79) (by Aaron Jacobs). | ||||
* | Expressed the thread-safety annotations in code, replacing the existing ↵ | vladlosev | 2011-10-24 | 1 | -106/+116 |
| | | | | comment-based system (by Aaron Jacobs). | ||||
* | Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595. | zhanyong.wan | 2011-09-16 | 1 | -0/+99 |
| | |||||
* | Adds support for building Google Mock as a shared library (DLL). | vladlosev | 2011-05-20 | 6 | -33/+36 |
| | |||||
* | simplifies TrulyMatcher and adds a test for it | zhanyong.wan | 2011-04-14 | 1 | -9/+9 |
| | |||||
* | Updates conditional directives to be consistent with the rest of the project. | vladlosev | 2011-04-14 | 1 | -2/+2 |
| | |||||
* | Corrects condition to compile out MSVC's pragmas. This fixes the build on MinGW. | vladlosev | 2011-04-13 | 1 | -4/+4 |
| | |||||
* | Removes commas from last items in enums (a C++ standard compliance fix). | vladlosev | 2011-04-08 | 2 | -4/+4 |
| | |||||
* | Prevents ADL in AllOf() and AnyOf() (by Manuel Klimek). | zhanyong.wan | 2011-03-16 | 2 | -22/+25 |
| | |||||
* | Disables SetArgPointee("string literal") for GCC 4.0- and Symbian, and | zhanyong.wan | 2011-03-09 | 1 | -0/+14 |
| | | | | adds support for SetArgPointee(L"wide string literal") -- by Vlad Losev. | ||||
* | Indents preprocessor directives. | zhanyong.wan | 2011-02-24 | 8 | -29/+30 |
| | |||||
* | Makes Google Mock compile much faster and use much less memory; reviewed by ↵ | zhanyong.wan | 2011-02-23 | 4 | -559/+422 |
| | | | | Nico Weber. This fixes issue 68. | ||||
* | Improves cross-platform compatibility of gmock output. This fixes issue 135. | vladlosev | 2011-02-11 | 1 | -2/+2 |
| | |||||
* | Picks up gtest r536; renames implicit_cast and down_cast to reduce the ↵ | zhanyong.wan | 2011-02-01 | 4 | -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.wan | 2010-12-02 | 1 | -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. | vladlosev | 2010-11-17 | 1 | -2/+3 |
| | |||||
* | Adds action SaveArgPointee. | zhanyong.wan | 2010-10-14 | 1 | -0/+10 |
| | |||||
* | Adds SetArgPointee to replace SetArgumentPointee. | zhanyong.wan | 2010-10-05 | 1 | -0/+9 |
| | |||||
* | Prints the type of the actual value as part of a match message when appropriate. | zhanyong.wan | 2010-09-27 | 1 | -0/+15 |
| | |||||
* | Include gtest and gmock headers as user headers instead of system headers. | zhanyong.wan | 2010-09-14 | 18 | -44/+44 |
| | |||||
* | Removes some gmock internal macros; sorts the file lists in Makefile.am; ↵ | zhanyong.wan | 2010-08-09 | 6 | -16/+5 |
| | | | | picks up gtest r454. | ||||
* | Implements ReturnPointee() and ReturnRefOfCopy(). | zhanyong.wan | 2010-07-03 | 2 | -0/+60 |
| | |||||
* | Increases the maximum arity of AllOf() and AnyOf() to 10, by Marcus Börger. | zhanyong.wan | 2010-06-09 | 3 | -76/+230 |
| | |||||
* | Replaces Python-style interpolation with arbitrary C++ string expression in ↵ | zhanyong.wan | 2010-06-08 | 3 | -252/+251 |
| | | | | MATCHER* descriptions. | ||||
* | Implements Pointwise(). | zhanyong.wan | 2010-05-17 | 3 | -49/+172 |
| | |||||
* | Renames test script flags. | vladlosev | 2010-05-13 | 3 | -16/+26 |
| | |||||
* | Moves the universal printer from gmock to gtest (by Vlad Losev). | zhanyong.wan | 2010-05-10 | 12 | -1215/+57 |
| | |||||
* | Adds Each(m) (by Wojtek Moczydlowski); removes scripts/test/Makefile (by ↵ | zhanyong.wan | 2010-04-22 | 1 | -21/+123 |
| | | | | Zhanyong Wan); pulls in gtest r424. | ||||
* | Improves matcher messages across the board. | zhanyong.wan | 2010-03-24 | 4 | -98/+123 |
| |