Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement threading support for gmock on Windows. | kosak | 2014-03-24 | 2 | -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 ↵ | kosak | 2014-03-12 | 3 | -2/+17 |
| | | | | gtest 680. | ||||
* | Introduce a BeginEndDistanceIs matcher for containers such as std::forward_list | kosak | 2014-03-12 | 2 | -0/+133 |
| | | | | | | which lack a size() member. Also pull in gtest 678. | ||||
* | Suppress "Conditional expression is constant" warning on Visual Studio. | kosak | 2014-01-29 | 2 | -0/+4 |
| | |||||
* | Support mocking methods with move-only return types. | kosak | 2014-01-29 | 5 | -44/+208 |
| | |||||
* | Make Google Mock build cleanly on Visual Studio 2010, 2012, 2013. | kosak | 2014-01-13 | 4 | -23/+59 |
| | |||||
* | Adds a note in the "uninteresting mock method call" warning to advise people ↵ | kosak | 2014-01-12 | 4 | -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>. | kosak | 2013-12-04 | 4 | -10/+10 |
| | | | | | Fix spelling: repositary -> repository. Pull in gtest 671. | ||||
* | Fix warnings encountered with clang -Wall, and pull in gtest 670. | kosak | 2013-12-03 | 2 | -37/+33 |
| | |||||
* | Clarify the rationale for gmock_all_test.cc, and pull in gtest 669 | kosak | 2013-12-03 | 1 | -2/+5 |
| | |||||
* | Don't copy the argument in SafeMatcherCast because it's not safe. | kosak | 2013-12-03 | 2 | -5/+28 |
| | |||||
* | adds gmock_doctor.py to the distro | zhanyong.wan | 2013-11-21 | 1 | -0/+4 |
| | |||||
* | avoids clash with the max() macro on Windows | zhanyong.wan | 2013-09-18 | 1 | -95/+60 |
| | |||||
* | fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when ↵ | zhanyong.wan | 2013-09-16 | 1 | -2/+2 |
| | | | | built with VS | ||||
* | makes googlemock generator handle some class templates; pulls in gtest r662 | zhanyong.wan | 2013-09-06 | 6 | -14/+103 |
| | |||||
* | adds more files to gmock's distro | zhanyong.wan | 2013-08-27 | 1 | -1/+3 |
| | |||||
* | fixes a typo | zhanyong.wan | 2013-08-27 | 1 | -1/+1 |
| | |||||
* | adds gmock-more-matchers.h to the distro | zhanyong.wan | 2013-08-27 | 1 | -0/+1 |
| | |||||
* | Makes some container matchers accept initializer lists in C++11 mode and ↵ | zhanyong.wan | 2013-08-08 | 4 | -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.wan | 2013-07-30 | 2 | -8/+38 |
| | | | | empty(). | ||||
* | Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls in | zhanyong.wan | 2013-07-28 | 7 | -605/+1664 |
| | | | | 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 | 5 | -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 r653 | zhanyong.wan | 2013-04-24 | 3 | -3/+34 |
| | |||||
* | Updates version number to 1.7.0 | zhanyong.wan | 2013-04-07 | 2 | -2/+6 |
| | |||||
* | Fixes some compatibility issues with STLport. | zhanyong.wan | 2013-04-04 | 1 | -3/+3 |
| | |||||
* | Makes WhenSorted() support associative containers (by billydonahue@google.com). | zhanyong.wan | 2013-03-27 | 3 | -1/+179 |
| | |||||
* | Adds special support for matching StringPiece. Pulls in gtest r646. | zhanyong.wan | 2013-03-25 | 3 | -0/+118 |
| | |||||
* | Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic ↵ | zhanyong.wan | 2013-03-08 | 1 | -1/+1 |
| | | | | mode. | ||||
* | Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings. | zhanyong.wan | 2013-03-01 | 2 | -7/+8 |
| | |||||
* | Improves the tests for nice, naggy, and strict mocks. | zhanyong.wan | 2013-03-01 | 5 | -25/+77 |
| | |||||
* | Allows the return type of a mock method to contain unprotected commas. | zhanyong.wan | 2013-03-01 | 3 | -329/+446 |
| | |||||
* | Removes unused variables and functions. | zhanyong.wan | 2013-03-01 | 3 | -57/+27 |
| | |||||
* | Implements NaggyMock. | zhanyong.wan | 2013-03-01 | 4 | -81/+302 |
| | |||||
* | Implements matcher SizeIs(). | zhanyong.wan | 2013-03-01 | 2 | -0/+123 |
| | |||||
* | 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 | 3 | -2/+95 |
| | |||||
* | Makes googlemock throw a runtime_error instead of abort when a mock | zhanyong.wan | 2013-02-28 | 4 | -101/+277 |
| | | | | | method with no default value is invoked (if exceptions are enabled). | ||||
* | Adds -pthread and switches -I to -isystem in build instructions; | zhanyong.wan | 2013-02-27 | 2 | -10/+21 |
| | | | | also pulls in the latest gtest revision (r638). | ||||
* | Adds the LICENSE file to the distribution. | vladlosev | 2013-01-31 | 1 | -1/+1 |
| | |||||
* | Unfortunately, the svn repo is a bit out of date. This commit contains 8 | jgm | 2012-11-15 | 11 | -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). | vladlosev | 2012-08-14 | 2 | -1/+33 |
| | |||||
* | Pulls in gtest r615. | zhanyong.wan | 2012-05-31 | 8 | -57/+61 |
| | | | | | | 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 | 20 | -336/+661 |
| | | | | some formatting changes. | ||||
* | Fixes a lock reentrancy when destroying a mock causes destruction of another ↵ | vladlosev | 2011-10-24 | 3 | -5/+85 |
| | | | | mock (issue 79) (by Aaron Jacobs). | ||||
* | Expressed the thread-safety annotations in code, replacing the existing ↵ | vladlosev | 2011-10-24 | 2 | -158/+168 |
| | | | | comment-based system (by Aaron Jacobs). | ||||
* | Fixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg ↵ | vladlosev | 2011-10-24 | 1 | -1/+1 |
| | | | | Miller). | ||||
* | Modifies gmock_doctor.py to work with GCC output that contains ↵ | vladlosev | 2011-09-28 | 1 | -1/+4 |
| | | | | file:line:char positions and left and right quote characters (U+2018 and U+2019) instead of apostrophes (U+0027). | ||||
* | Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595. | zhanyong.wan | 2011-09-16 | 2 | -0/+180 |
| | |||||
* | Renames the license files. | vladlosev | 2011-09-09 | 4 | -2/+2 |
| |