summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* points gmock 1.7.0 to released gtest 1.7.0release-1.7.0zhanyong.wan2013-09-190-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/tags/release-1.7.0@453 8415998a-534a-0410-bf83-d39667b30386
* Cuts release 1.7.0zhanyong.wan2013-09-190-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/tags/release-1.7.0@452 8415998a-534a-0410-bf83-d39667b30386
* avoids clash with the max() macro on Windowszhanyong.wan2013-09-181-95/+60
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@451 8415998a-534a-0410-bf83-d39667b30386
* fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when ↵zhanyong.wan2013-09-161-2/+2
| | | | | | built with VS git-svn-id: http://googlemock.googlecode.com/svn/trunk@450 8415998a-534a-0410-bf83-d39667b30386
* makes googlemock generator handle some class templates; pulls in gtest r662zhanyong.wan2013-09-066-14/+103
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@449 8415998a-534a-0410-bf83-d39667b30386
* adds more files to gmock's distrozhanyong.wan2013-08-271-1/+3
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@448 8415998a-534a-0410-bf83-d39667b30386
* fixes a typozhanyong.wan2013-08-271-1/+1
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@446 8415998a-534a-0410-bf83-d39667b30386
* adds gmock-more-matchers.h to the distrozhanyong.wan2013-08-271-0/+1
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@445 8415998a-534a-0410-bf83-d39667b30386
* pulls in gtest r661zhanyong.wan2013-08-270-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@444 8415998a-534a-0410-bf83-d39667b30386
* 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. git-svn-id: http://googlemock.googlecode.com/svn/trunk@443 8415998a-534a-0410-bf83-d39667b30386
* Makes UnorderedElementsAre*() work with containers that don't have size() or ↵zhanyong.wan2013-07-302-8/+38
| | | | | | empty(). git-svn-id: http://googlemock.googlecode.com/svn/trunk@441 8415998a-534a-0410-bf83-d39667b30386
* Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls inzhanyong.wan2013-07-287-605/+1664
| | | | | | | gtest r660. git-svn-id: http://googlemock.googlecode.com/svn/trunk@438 8415998a-534a-0410-bf83-d39667b30386
* Fixes uses of pair to std::pair; pulls in gtest r655.zhanyong.wan2013-06-201-3/+3
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@437 8415998a-534a-0410-bf83-d39667b30386
* 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. git-svn-id: http://googlemock.googlecode.com/svn/trunk@433 8415998a-534a-0410-bf83-d39667b30386
* Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653zhanyong.wan2013-04-243-3/+34
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@432 8415998a-534a-0410-bf83-d39667b30386
* Updates version number to 1.7.0zhanyong.wan2013-04-072-2/+6
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@430 8415998a-534a-0410-bf83-d39667b30386
* Fixes some compatibility issues with STLport.zhanyong.wan2013-04-041-3/+3
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@429 8415998a-534a-0410-bf83-d39667b30386
* Makes WhenSorted() support associative containers (by billydonahue@google.com).zhanyong.wan2013-03-273-1/+179
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@427 8415998a-534a-0410-bf83-d39667b30386
* Adds special support for matching StringPiece. Pulls in gtest r646.zhanyong.wan2013-03-253-0/+118
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@426 8415998a-534a-0410-bf83-d39667b30386
* Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic ↵zhanyong.wan2013-03-081-1/+1
| | | | | | mode. git-svn-id: http://googlemock.googlecode.com/svn/trunk@425 8415998a-534a-0410-bf83-d39667b30386
* Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings.zhanyong.wan2013-03-012-7/+8
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@424 8415998a-534a-0410-bf83-d39667b30386
* Improves the tests for nice, naggy, and strict mocks.zhanyong.wan2013-03-015-25/+77
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@422 8415998a-534a-0410-bf83-d39667b30386
* Allows the return type of a mock method to contain unprotected commas.zhanyong.wan2013-03-013-329/+446
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@421 8415998a-534a-0410-bf83-d39667b30386
* Removes unused variables and functions.zhanyong.wan2013-03-013-57/+27
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@420 8415998a-534a-0410-bf83-d39667b30386
* Implements NaggyMock.zhanyong.wan2013-03-014-81/+302
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@419 8415998a-534a-0410-bf83-d39667b30386
* Implements matcher SizeIs().zhanyong.wan2013-03-012-0/+123
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@418 8415998a-534a-0410-bf83-d39667b30386
* Clarifies how to implement MatcherInterface.zhanyong.wan2013-03-011-4/+21
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@417 8415998a-534a-0410-bf83-d39667b30386
* Implements matcher IsEmpty(); also pulls in gtest r643.zhanyong.wan2013-03-013-2/+95
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@416 8415998a-534a-0410-bf83-d39667b30386
* 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). git-svn-id: http://googlemock.googlecode.com/svn/trunk@415 8415998a-534a-0410-bf83-d39667b30386
* Pulls in gtest r639, which fixes dangling reference in make/cmake files.zhanyong.wan2013-02-270-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@414 8415998a-534a-0410-bf83-d39667b30386
* Adds -pthread and switches -I to -isystem in build instructions;zhanyong.wan2013-02-272-10/+21
| | | | | | | also pulls in the latest gtest revision (r638). git-svn-id: http://googlemock.googlecode.com/svn/trunk@413 8415998a-534a-0410-bf83-d39667b30386
* Adds the LICENSE file to the distribution.vladlosev2013-01-311-1/+1
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@412 8415998a-534a-0410-bf83-d39667b30386
* Unfortunately, the svn repo is a bit out of date. This commit contains 8jgm@google.com2012-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. git-svn-id: http://googlemock.googlecode.com/svn/trunk@410 8415998a-534a-0410-bf83-d39667b30386
* Makes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin).vladlosev2012-08-142-1/+33
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@408 8415998a-534a-0410-bf83-d39667b30386
* 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. git-svn-id: http://googlemock.googlecode.com/svn/trunk@407 8415998a-534a-0410-bf83-d39667b30386
* Reduced template instantiation depth for the AllOf and AnyOf matchers. Also ↵jgm@google.com2012-04-1020-336/+661
| | | | | | some formatting changes. git-svn-id: http://googlemock.googlecode.com/svn/trunk@405 8415998a-534a-0410-bf83-d39667b30386
* Fixes a lock reentrancy when destroying a mock causes destruction of another ↵vladlosev2011-10-243-5/+85
| | | | | | mock (issue 79) (by Aaron Jacobs). git-svn-id: http://googlemock.googlecode.com/svn/trunk@403 8415998a-534a-0410-bf83-d39667b30386
* Expressed the thread-safety annotations in code, replacing the existing ↵vladlosev2011-10-242-158/+168
| | | | | | comment-based system (by Aaron Jacobs). git-svn-id: http://googlemock.googlecode.com/svn/trunk@402 8415998a-534a-0410-bf83-d39667b30386
* Fixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg ↵vladlosev2011-10-241-1/+1
| | | | | | Miller). git-svn-id: http://googlemock.googlecode.com/svn/trunk@401 8415998a-534a-0410-bf83-d39667b30386
* Modifies gmock_doctor.py to work with GCC output that contains ↵vladlosev2011-09-281-1/+4
| | | | | | file:line:char positions and left and right quote characters (U+2018 and U+2019) instead of apostrophes (U+0027). git-svn-id: http://googlemock.googlecode.com/svn/trunk@399 8415998a-534a-0410-bf83-d39667b30386
* Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595.zhanyong.wan2011-09-162-0/+180
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@397 8415998a-534a-0410-bf83-d39667b30386
* Renames the license files.vladlosev2011-09-094-2/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@396 8415998a-534a-0410-bf83-d39667b30386
* More Clang support improvements in Google Mock Doctor.vladlosev2011-08-251-5/+5
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@395 8415998a-534a-0410-bf83-d39667b30386
* Improves support for Clang in Google Mock Doctor.vladlosev2011-08-161-2/+3
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@394 8415998a-534a-0410-bf83-d39667b30386
* Fixes issue 139 and issue 140.vladlosev2011-05-202-12/+73
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@393 8415998a-534a-0410-bf83-d39667b30386
* Adds a DLL-related section to Google Mock's README.vladlosev2011-05-201-1/+8
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@392 8415998a-534a-0410-bf83-d39667b30386
* Adds support for building Google Mock as a shared library (DLL).vladlosev2011-05-2014-65/+86
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@391 8415998a-534a-0410-bf83-d39667b30386
* A test to verify correcteness of Google Mock on multiple threads.vladlosev2011-05-112-1/+326
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@390 8415998a-534a-0410-bf83-d39667b30386
* Makes generation of fused sources contingent on availability of Python and ↵vladlosev2011-04-211-10/+14
| | | | | | pulls in gtest r580. git-svn-id: http://googlemock.googlecode.com/svn/trunk@388 8415998a-534a-0410-bf83-d39667b30386
* pulls in gtest r572zhanyong.wan2011-04-150-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@384 8415998a-534a-0410-bf83-d39667b30386
View Lorry Controller Status