summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Creates release branch 1.4 off trunk head.release-1.4zhanyong.wan2009-10-020-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/branches/release-1.4@221 8415998a-534a-0410-bf83-d39667b30386
* Pulls in gtest release 1.4.0.zhanyong.wan2009-10-020-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@220 8415998a-534a-0410-bf83-d39667b30386
* Pulls in r327 of gtest.zhanyong.wan2009-10-020-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@219 8415998a-534a-0410-bf83-d39667b30386
* Updates the 1.4.0 release notes.zhanyong.wan2009-10-011-7/+9
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@218 8415998a-534a-0410-bf83-d39667b30386
* Works around a Symbian compiler bug that causes memory leak (by Mika Raento).zhanyong.wan2009-10-012-3/+18
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@217 8415998a-534a-0410-bf83-d39667b30386
* Changes gmock's version to 1.4.0. Also fixes a compiler warning.zhanyong.wan2009-09-302-2/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@216 8415998a-534a-0410-bf83-d39667b30386
* Implements the MockFunction class.zhanyong.wan2009-09-253-0/+204
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@213 8415998a-534a-0410-bf83-d39667b30386
* Makes gmock work on Symbian (both 3rd & 5th editions), original patch ↵zhanyong.wan2009-09-259-92/+185
| | | | | | contributed by Mika Raento. git-svn-id: http://googlemock.googlecode.com/svn/trunk@212 8415998a-534a-0410-bf83-d39667b30386
* Adds the IsNull() matcher.zhanyong.wan2009-09-243-0/+53
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@210 8415998a-534a-0410-bf83-d39667b30386
* Simplifies gmock code using gtest's OS-indicating macros.zhanyong.wan2009-09-245-19/+19
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@209 8415998a-534a-0410-bf83-d39667b30386
* Bumps up the version number for release 1.2.0.zhanyong.wan2009-09-241-2/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@208 8415998a-534a-0410-bf83-d39667b30386
* Makes gmock compile on minGW, which uses gcc 3.4.5.zhanyong.wan2009-09-241-3/+6
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@207 8415998a-534a-0410-bf83-d39667b30386
* Removes gmock's dependency on python2.4.zhanyong.wan2009-09-222-2/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@206 8415998a-534a-0410-bf83-d39667b30386
* Picks up gtest r314.zhanyong.wan2009-09-182-3/+7
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@205 8415998a-534a-0410-bf83-d39667b30386
* Disbles two tests that crash on Symbian.zhanyong.wan2009-09-171-3/+13
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@204 8415998a-534a-0410-bf83-d39667b30386
* Simplifies the definition of NativeArray. Works around a VC bug in ↵zhanyong.wan2009-09-166-81/+117
| | | | | | StrictMock & NiceMock. git-svn-id: http://googlemock.googlecode.com/svn/trunk@202 8415998a-534a-0410-bf83-d39667b30386
* Adds new matcher Pair(). Replaces GMOCK_CHECK_ with GTEST_CHECK_ (by Vlad ↵zhanyong.wan2009-09-165-140/+219
| | | | | | Losev). git-svn-id: http://googlemock.googlecode.com/svn/trunk@200 8415998a-534a-0410-bf83-d39667b30386
* Removes dead code in gmock-more-actions_test.cc.zhanyong.wan2009-09-121-132/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@199 8415998a-534a-0410-bf83-d39667b30386
* Simplifies the tests using EXPECT_DEATH_IF_SUPPORTED.zhanyong.wan2009-09-115-60/+23
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@198 8415998a-534a-0410-bf83-d39667b30386
* Adds gmock-more-actions.h to the distribution ('make distcheck' passes).zhanyong.wan2009-09-081-0/+1
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@196 8415998a-534a-0410-bf83-d39667b30386
* Updates CHANGES.zhanyong.wan2009-09-041-1/+24
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@195 8415998a-534a-0410-bf83-d39667b30386
* Depends on gtest r300, which allows String to contain NUL.zhanyong.wan2009-09-011-1/+1
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@194 8415998a-534a-0410-bf83-d39667b30386
* Adds mutable_impl() and impl() to PolymorphicMatcher (by Zhanyong Wan); ↵zhanyong.wan2009-08-315-50/+65
| | | | | | Enables gMock to compile with VC 7.1 (by Vlad Losev). git-svn-id: http://googlemock.googlecode.com/svn/trunk@193 8415998a-534a-0410-bf83-d39667b30386
* Improves protobuf print format.zhanyong.wan2009-08-143-7/+40
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@191 8415998a-534a-0410-bf83-d39667b30386
* Removes duplicated definition of SetArgumentPointee (by Vlad Losev); Makes ↵zhanyong.wan2009-08-075-53/+27
| | | | | | gmock compilable on platforms that don't have ::abort() (by Acadeli Checa); Fixes compatibility with Symbian's STLport (by Acadeli Checa). git-svn-id: http://googlemock.googlecode.com/svn/trunk@188 8415998a-534a-0410-bf83-d39667b30386
* Re-organizes the file structure for actions.zhanyong.wan2009-07-229-1049/+1159
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@187 8415998a-534a-0410-bf83-d39667b30386
* Adds the ReturnArg<k>() action (by Tim Hockin); refactors gmock-matchers.h ↵zhanyong.wan2009-07-216-444/+249
| | | | | | (by Zhanyong Wan). git-svn-id: http://googlemock.googlecode.com/svn/trunk@186 8415998a-534a-0410-bf83-d39667b30386
* Makes ByRef(x) printable as a reference to x.zhanyong.wan2009-07-204-1/+32
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@184 8415998a-534a-0410-bf83-d39667b30386
* Adds the Key() matcher, by Marcus Borger.zhanyong.wan2009-07-162-0/+115
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@182 8415998a-534a-0410-bf83-d39667b30386
* Implements Expectation, ExpectationSet, and After for specifying expectation ↵zhanyong.wan2009-07-013-100/+606
| | | | | | orders. git-svn-id: http://googlemock.googlecode.com/svn/trunk@179 8415998a-534a-0410-bf83-d39667b30386
* A trivial comment fix.zhanyong.wan2009-07-011-1/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@177 8415998a-534a-0410-bf83-d39667b30386
* Makes gmock-spec-builders_test.cc and gmock-internal-utils_test.cc work ↵zhanyong.wan2009-06-222-2/+20
| | | | | | where both ::string and ::std::string are defined. git-svn-id: http://googlemock.googlecode.com/svn/trunk@174 8415998a-534a-0410-bf83-d39667b30386
* Switches from Boost TR1 tuple to gtest's TR1 tuple.zhanyong.wan2009-06-175-88/+114
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@173 8415998a-534a-0410-bf83-d39667b30386
* Removes the .WithArguments() clause from ON_CALL and EXPECT_CALL.zhanyong.wan2009-06-112-42/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@172 8415998a-534a-0410-bf83-d39667b30386
* Works around a gcc bug that causes tr1/tuple to fail to compile when RTTI is ↵zhanyong.wan2009-06-111-0/+10
| | | | | | disabled. git-svn-id: http://googlemock.googlecode.com/svn/trunk@171 8415998a-534a-0410-bf83-d39667b30386
* Implements .With() as a synonym of .WithArguments(); implements AllArgs(m) ↵zhanyong.wan2009-06-0911-101/+176
| | | | | | as a synonym of m; relies on gtest-port to #include tuple; fixes a compatibility with Symbian. git-svn-id: http://googlemock.googlecode.com/svn/trunk@170 8415998a-534a-0410-bf83-d39667b30386
* Implements the Args<k1, ..., kn>(m) matcher.zhanyong.wan2009-06-098-29/+597
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@169 8415998a-534a-0410-bf83-d39667b30386
* Fixes errors in the autotools scripts.zhanyong.wan2009-06-052-2/+2
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@166 8415998a-534a-0410-bf83-d39667b30386
* Makes all container matchers work with (possibly multi-dimensional) native ↵zhanyong.wan2009-06-0412-162/+1026
| | | | | | arrays; makes Contains() accept a matcher; adds Value(x, m); improves gmock doctor to diagnose the Type in Template Base disease. git-svn-id: http://googlemock.googlecode.com/svn/trunk@164 8415998a-534a-0410-bf83-d39667b30386
* Improves gmock generator and adds a test for it (by Neal Norwitz).zhanyong.wan2009-06-023-11/+159
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@161 8415998a-534a-0410-bf83-d39667b30386
* Avoids unnecessary printing of call into to internal buffers;zhanyong.wan2009-05-2910-281/+396
| | | | | | | | | Made the universal value printer safer when printing char[]; Removed duplicated code in InvokeWith; Improved gmock_doctor.py. git-svn-id: http://googlemock.googlecode.com/svn/trunk@159 8415998a-534a-0410-bf83-d39667b30386
* Finishes SafeMatcherCast by catching lossy arithmetic conversions at ↵zhanyong.wan2009-05-149-954/+617
| | | | | | compile-time; uses ACTION_TEMPLATE to simplify the definition of many actions; makes mock object uncopyable; teaches gmock doctor about wrong MOCK_METHODn. git-svn-id: http://googlemock.googlecode.com/svn/trunk@155 8415998a-534a-0410-bf83-d39667b30386
* Adds more tests for using SetArgumentPointee with protobufs; works around a ↵zhanyong.wan2009-05-134-176/+245
| | | | | | compiler bug on Symbian that gmock-printers.h triggers; reduces template code bloat in gmock-matchers.h; avoids RTTI when it's disabled. git-svn-id: http://googlemock.googlecode.com/svn/trunk@154 8415998a-534a-0410-bf83-d39667b30386
* Partially implemented SafeMatcherCast (by Vlad Losev); updated the ↵zhanyong.wan2009-05-117-44/+999
| | | | | | implementation of Not, AnyOf, and AllOf to use SafeMatcherCast (by Vlad Losev); implemented ACTION_TEMPLATE (by Zhanyong Wan); worked around bugs on Symbian (by Zhanyong Wan). git-svn-id: http://googlemock.googlecode.com/svn/trunk@152 8415998a-534a-0410-bf83-d39667b30386
* Makes the mock generator work with python2.3.5, which comes with Mac OS X Tiger.zhanyong.wan2009-05-074-8/+10
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@150 8415998a-534a-0410-bf83-d39667b30386
* Cleans up the mock generator script:zhanyong.wan2009-05-072-22/+31
| | | | | | | | | - updates the doc string. - adds a version number. - fixes the condition for error messages in _GenerateMocks(). git-svn-id: http://googlemock.googlecode.com/svn/trunk@149 8415998a-534a-0410-bf83-d39667b30386
* Ignore .pyc filesnnorwitz2009-05-060-0/+0
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@148 8415998a-534a-0410-bf83-d39667b30386
* Allow any number of ClassNames to be specified on the command line.nnorwitz2009-05-062-7/+18
| | | | | | | 0 ClassNames means emit all classes found in the file. git-svn-id: http://googlemock.googlecode.com/svn/trunk@147 8415998a-534a-0410-bf83-d39667b30386
* Fix grammar in commentnnorwitz2009-05-061-1/+1
| | | | git-svn-id: http://googlemock.googlecode.com/svn/trunk@146 8415998a-534a-0410-bf83-d39667b30386
* Issue 44: "const" is missing for const return typesnnorwitz2009-05-061-1/+5
| | | | | | | | The modifiers (things like const, volatile, etc) were not being added to return types. git-svn-id: http://googlemock.googlecode.com/svn/trunk@145 8415998a-534a-0410-bf83-d39667b30386