123 Commits

Author SHA1 Message Date
zhanyong.wan
d19f58677b Improves Makefile.am (by Vlad Losev); fixes Makefile and updates README (by Zhanyong Wan). 2010-04-14 16:26:57 +00:00
zhanyong.wan
aa28b178c4 Updates the release notes. 2010-03-26 05:38:55 +00:00
zhanyong.wan
439df04138 Adds Manuel to CONTRIBUTORS, and pulls in gtest r405. 2010-03-25 20:17:31 +00:00
zhanyong.wan
b1c7f93c52 Improves matcher messages across the board. 2010-03-24 17:35:11 +00:00
zhanyong.wan
676e8cc609 Fixes the explanation generated by many composite matchers (by Manuel Klimek); publishes the gmock value printer as testing::PrintToString() (by Zhanyong Wan). 2010-03-16 20:01:51 +00:00
zhanyong.wan
a862f1de30 Adds IsInterested() to MatchResultListener; clarifies the format of matcher description and match result explanation; renames the free function MatchAndExplain() to ExplainMatchResult() to avoid it being hidden inside a MATCHER* definition. 2010-03-15 21:23:04 +00:00
zhanyong.wan
34b034c21e Adds a free function MatchAndExplain(). 2010-03-05 21:23:23 +00:00
zhanyong.wan
5905ba00fe Adds threading support (by Vlad Losev); updates the version number (by Zhanyong Wan); adds release notes for 1.5.0 (by Vlad Losev). 2010-02-24 17:21:37 +00:00
zhanyong.wan
470df42bad Enables tests depending on stdout capturing (by Vlad Losev). 2010-02-02 22:34:58 +00:00
zhanyong.wan
db22c22782 BREAKING CHANGE: drops the old matcher API. See http://code.google.com/p/googlemock/wiki/FrequentlyAskedQuestions for details. 2010-01-28 21:52:29 +00:00
zhanyong.wan
99643d2d1f Removes 'make install' instructions from README. 2010-01-17 08:42:48 +00:00
zhanyong.wan
d14aaed74b Enables regex matchers on all platforms. 2010-01-14 05:36:32 +00:00
zhanyong.wan
6953a725fc Allows Field() and Property() to work when the matcher argument is a pointer passed by reference. 2010-01-13 05:15:07 +00:00
zhanyong.wan
e122e457a6 Converts more matchers to the new API; fixes MatchAndExplain() for polymorphic matchers to allow non-const reference arguments. 2010-01-12 09:03:52 +00:00
zhanyong.wan
821133180c Implements the new matcher API. 2010-01-08 21:55:40 +00:00
zhanyong.wan
7f8eb725b5 Removes support for MSVC 7.1 from the scons scripts. 2009-12-23 20:48:53 +00:00
zhanyong.wan
32de5f5376 Fixes a slew of compiler warnings and turns on "warning as error" in the scons build. 2009-12-23 00:13:23 +00:00
zhanyong.wan
284b54d304 Trims the autotools build script. 2009-12-18 08:00:42 +00:00
zhanyong.wan
39bf784f83 Removes uses of GTEST_HAS_STD_STRING. 2009-12-16 23:36:08 +00:00
zhanyong.wan
5a3c1691a1 Removes gmock_output_test_.vcproj. 2009-12-09 18:21:28 +00:00
zhanyong.wan
099e3b93c5 Makes gmock_doctor work with gcc 4.4.0. 2009-12-09 17:58:37 +00:00
zhanyong.wan
a95c6a5a69 Fixes a C++-standard-compliance bug in gmock-printers.h. 2009-12-02 08:36:42 +00:00
zhanyong.wan
f6d6a22b8e Fixes Cygwin compatibility (by Vlad Losev); Improves Python tests (by Vlad Losev); Fixes ambiguous call to implicit_cast; Uses gtest's SkipPrefix() instead gmock's own (by Vlad Losev). 2009-12-01 19:42:25 +00:00
zhanyong.wan
19eb9e9e3d Pulls in gtest r344; improves implicit_cast (by Zhanyong Wan); makes the Python tests work on Windows (by Vlad Losev); adds run_tests.py (by Vlad Losev). 2009-11-24 20:23:18 +00:00
vladlosev
e56daa7de1 Tests NotNull/IsNull with testing::internal::scoped_ptr. 2009-11-18 01:08:08 +00:00
vladlosev
b006f165b1 Adds SCons build files for Google Mock 2009-11-18 00:44:26 +00:00
vladlosev
79b83505bc Updates IsNull and NotNull matchers to work with smart pointers. 2009-11-18 00:43:37 +00:00
vladlosev
a63be0bd91 Adjusts gMock Doctor to work with Return implementation updated in r233 2009-11-18 00:42:27 +00:00
vladlosev
201ac16191 Enables gmock's implicit_cast to work with source types that have a non-const conversion operator (by Zhanyong Wan). 2009-11-18 00:12:05 +00:00
vladlosev
a070cbd91c Enables gmock's implicit_cast to work with source types that 2009-11-18 00:09:28 +00:00
zhanyong.wan
2871bb4d34 Adds gmock_all_test.cc for compiling most gmock tests in a single file. 2009-11-12 19:18:48 +00:00
zhanyong.wan
21a5846afd Makes gmock-generated-function-mockers.h conform to the C++ standard. 2009-11-12 19:18:08 +00:00
zhanyong.wan
4910d29e1e Makes gmock-all.cc catch errors in fuse_gmock.py. 2009-11-10 19:16:27 +00:00
zhanyong.wan
2e7c475e16 Adds a dummy test to gmock-port.test.cc. 2009-11-06 23:43:30 +00:00
vladlosev
6c54a5e1f9 Enables more verbose output for expectations (by Sverre Sundsdal); Fixes information loss warning when compiled by VC8.0 with /Wp64; Skips two tests on Windows Mobile that don't work there. 2009-10-21 06:15:34 +00:00
zhanyong.wan
7db42db1c6 Updates the 1.4.0 release notes. 2009-10-01 23:31:41 +00:00
zhanyong.wan
7c95d8346e Works around a Symbian compiler bug that causes memory leak (by Mika Raento). 2009-10-01 21:56:16 +00:00
zhanyong.wan
79643f51ed Changes gmock's version to 1.4.0. Also fixes a compiler warning. 2009-09-30 20:24:30 +00:00
zhanyong.wan
f3aa4d2934 Implements the MockFunction class. 2009-09-25 22:34:47 +00:00
zhanyong.wan
95b12332c3 Makes gmock work on Symbian (both 3rd & 5th editions), original patch contributed by Mika Raento. 2009-09-25 18:55:50 +00:00
zhanyong.wan
2d970ee3ba Adds the IsNull() matcher. 2009-09-24 21:41:36 +00:00
zhanyong.wan
f7af24c7de Simplifies gmock code using gtest's OS-indicating macros. 2009-09-24 21:17:24 +00:00
zhanyong.wan
b0d1c08ff2 Bumps up the version number for release 1.2.0. 2009-09-24 20:55:18 +00:00
zhanyong.wan
f47a2df57b Makes gmock compile on minGW, which uses gcc 3.4.5. 2009-09-24 16:39:30 +00:00
zhanyong.wan
a89034c802 Removes gmock's dependency on python2.4. 2009-09-22 16:18:42 +00:00
zhanyong.wan
bbd6e105e7 Picks up gtest r314. 2009-09-18 18:17:19 +00:00
zhanyong.wan
93244dc369 Disbles two tests that crash on Symbian. 2009-09-17 19:11:00 +00:00
zhanyong.wan
4bd79e4f25 Simplifies the definition of NativeArray. Works around a VC bug in StrictMock & NiceMock. 2009-09-16 17:38:08 +00:00
zhanyong.wan
f5e1ce5b92 Adds new matcher Pair(). Replaces GMOCK_CHECK_ with GTEST_CHECK_ (by Vlad Losev). 2009-09-16 07:02:02 +00:00
zhanyong.wan
c53b3dca1b Removes dead code in gmock-more-actions_test.cc. 2009-09-12 06:46:26 +00:00
zhanyong.wan
04d6ed817e Simplifies the tests using EXPECT_DEATH_IF_SUPPORTED. 2009-09-11 07:01:08 +00:00
zhanyong.wan
d6ffd13698 Adds gmock-more-actions.h to the distribution ('make distcheck' passes). 2009-09-08 17:15:49 +00:00
zhanyong.wan
5bc7cfe817 Updates CHANGES. 2009-09-04 18:10:53 +00:00
zhanyong.wan
46642857b1 Depends on gtest r300, which allows String to contain NUL. 2009-09-01 19:10:50 +00:00
zhanyong.wan
2b43a9ecd1 Adds mutable_impl() and impl() to PolymorphicMatcher (by Zhanyong Wan); Enables gMock to compile with VC 7.1 (by Vlad Losev). 2009-08-31 23:51:23 +00:00
zhanyong.wan
0ea67f88ae Improves protobuf print format. 2009-08-14 04:50:02 +00:00
zhanyong.wan
9571b28675 Removes duplicated definition of SetArgumentPointee (by Vlad Losev); Makes gmock compilable on platforms that don't have ::abort() (by Acadeli Checa); Fixes compatibility with Symbian's STLport (by Acadeli Checa). 2009-08-07 07:15:56 +00:00
zhanyong.wan
a18423e0ee Re-organizes the file structure for actions. 2009-07-22 23:58:19 +00:00
zhanyong.wan
1afe1c7971 Adds the ReturnArg<k>() action (by Tim Hockin); refactors gmock-matchers.h (by Zhanyong Wan). 2009-07-21 23:26:31 +00:00
zhanyong.wan
387bdd551d Makes ByRef(x) printable as a reference to x. 2009-07-20 21:16:35 +00:00
zhanyong.wan
b5937dab69 Adds the Key() matcher, by Marcus Borger. 2009-07-16 20:26:41 +00:00
zhanyong.wan
41b9b0b561 Implements Expectation, ExpectationSet, and After for specifying expectation orders. 2009-07-01 19:04:51 +00:00
zhanyong.wan
4019819dbb A trivial comment fix. 2009-07-01 05:03:39 +00:00
zhanyong.wan
81476f2f90 Makes gmock-spec-builders_test.cc and gmock-internal-utils_test.cc work where both ::string and ::std::string are defined. 2009-06-22 23:30:47 +00:00
zhanyong.wan
90c90f9250 Switches from Boost TR1 tuple to gtest's TR1 tuple. 2009-06-17 22:11:04 +00:00
zhanyong.wan
4cd148e588 Removes the .WithArguments() clause from ON_CALL and EXPECT_CALL. 2009-06-11 20:07:00 +00:00
zhanyong.wan
07587e9db4 Works around a gcc bug that causes tr1/tuple to fail to compile when RTTI is disabled. 2009-06-11 04:04:06 +00:00
zhanyong.wan
bf55085d45 Implements .With() as a synonym of .WithArguments(); implements AllArgs(m) as a synonym of m; relies on gtest-port to #include tuple; fixes a compatibility with Symbian. 2009-06-09 06:09:53 +00:00
zhanyong.wan
2661c6821a Implements the Args<k1, ..., kn>(m) matcher. 2009-06-09 05:42:12 +00:00
zhanyong.wan
240fe5a0cf Fixes errors in the autotools scripts. 2009-06-05 06:42:33 +00:00
zhanyong.wan
b82431625d Makes all container matchers work with (possibly multi-dimensional) native arrays; makes Contains() accept a matcher; adds Value(x, m); improves gmock doctor to diagnose the Type in Template Base disease. 2009-06-04 05:48:20 +00:00
zhanyong.wan
c2ad46a5df Improves gmock generator and adds a test for it (by Neal Norwitz). 2009-06-02 20:41:21 +00:00
zhanyong.wan
9413f2ff61 Avoids unnecessary printing of call into to internal buffers;
Made the universal value printer safer when printing char[];
Removed duplicated code in InvokeWith;
Improved gmock_doctor.py.
2009-05-29 19:50:06 +00:00
zhanyong.wan
16cf473930 Finishes SafeMatcherCast by catching lossy arithmetic conversions at compile-time; uses ACTION_TEMPLATE to simplify the definition of many actions; makes mock object uncopyable; teaches gmock doctor about wrong MOCK_METHODn. 2009-05-14 20:55:30 +00:00
zhanyong.wan
c6a412397b Adds more tests for using SetArgumentPointee with protobufs; works around a compiler bug on Symbian that gmock-printers.h triggers; reduces template code bloat in gmock-matchers.h; avoids RTTI when it's disabled. 2009-05-13 23:38:40 +00:00
zhanyong.wan
18490653e8 Partially implemented SafeMatcherCast (by Vlad Losev); updated the 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). 2009-05-11 18:54:08 +00:00
zhanyong.wan
d955e83bee Makes the mock generator work with python2.3.5, which comes with Mac OS X Tiger. 2009-05-07 21:20:57 +00:00
zhanyong.wan
84b8e4c65d Cleans up the mock generator script:
- updates the doc string.
- adds a version number.
- fixes the condition for error messages in _GenerateMocks().
2009-05-07 20:38:25 +00:00
nnorwitz
ce60784fb5 Allow any number of ClassNames to be specified on the command line.
0 ClassNames means emit all classes found in the file.
2009-05-06 05:57:09 +00:00
nnorwitz
60df3efe39 Fix grammar in comment 2009-05-06 05:31:57 +00:00
nnorwitz
987a978c3c Issue 44: "const" is missing for const return types
The modifiers (things like const, volatile, etc) were not being added
to return types.
2009-05-06 05:01:46 +00:00
zhanyong.wan
e7bb5ededa Improves the error message for leaked mocks to include the test name (by Zhanyong Wan). 2009-05-05 23:14:47 +00:00
zhanyong.wan
125783fb87 Fixes tr1 tuple's path when compiled with gcc version < 4.0.0 (by Zhanyong Wan). 2009-05-05 19:36:44 +00:00
zhanyong.wan
bf0d0a4481 Turns --gmock_catch_leaked_mocks on by default. 2009-04-29 23:52:29 +00:00
zhanyong.wan
df35a763b9 Implements --gmock_catch_leaked_mocks and Mock::AllowLeak. 2009-04-22 22:25:31 +00:00
zhanyong.wan
1c8eb1c059 Adds actions ReturnNew<T>(...) and DeleteArg<k>(), by Jason Hsueh. 2009-04-09 07:29:58 +00:00
zhanyong.wan
56fe7460a8 Adds fuse_gmock_files.py to fuse all Google Mock and Google Test source files (by Zhanyong Wan). 2009-04-09 03:01:25 +00:00
zhanyong.wan
33c0af07c4 Makes gmock compile clean with gcc -Wall -Wextra. 2009-04-03 00:10:12 +00:00
zhanyong.wan
7e571ef537 Makes googlemock compile with gcc 3.3. 2009-03-31 18:26:29 +00:00
zhanyong.wan
946bc64fcf Fixes an error when compiling with gcc 4.4. 2009-03-31 00:05:30 +00:00
zhanyong.wan
3fbd2dd020 Makes gmock compile with gcc -Wall -Wextra -Wno-unused-parameter. 2009-03-26 19:06:45 +00:00
zhanyong.wan
68be111b4c Allows mock methods overloaded on argument number or the const-ness of this object to appear on the same source line. 2009-03-25 03:56:48 +00:00
zhanyong.wan
62417be8f3 Fixes outdated info in README about compatibility with other testing frameworks. 2009-03-19 18:39:41 +00:00
zhanyong.wan
da579bd681 Adds release note for 1.1.0 and switches to use gtest 1.3.0. 2009-03-17 23:34:45 +00:00
zhanyong.wan
5b5d62f190 Makes the code compile on Windows CE. 2009-03-11 23:37:56 +00:00
zhanyong.wan
93ad3551c0 Fixes gmock-port_test on Windows. 2009-03-06 01:21:45 +00:00
zhanyong.wan
6f14769e86 Allows a mock object to delete itself in an action. By Simon Bowden. 2009-03-03 06:44:08 +00:00
zhanyong.wan
652540a278 Cleans up macro definitions. 2009-02-23 23:37:29 +00:00
zhanyong.wan
1bee7b2f1d Implements Contains(element) matcher. By Gary Morain. 2009-02-20 18:31:04 +00:00
zhanyong.wan
7f4c2c0f95 Adds two actions: SaveArg and SetArgReferee. 2009-02-19 22:38:27 +00:00