158 Commits

Author SHA1 Message Date
zhanyong.wan
79d82b6ef7 Changes gmock's version to 1.6.0 and adds release notes. 2011-02-24 07:31:48 +00:00
zhanyong.wan
658ac0b71a Indents preprocessor directives. 2011-02-24 07:29:13 +00:00
zhanyong.wan
ed6c9277bb Makes Google Mock compile much faster and use much less memory; reviewed by Nico Weber. This fixes issue 68. 2011-02-23 19:39:27 +00:00
vladlosev
b3e904227f Adds project files for MSVC 2010 (by Fredrik Roubert). 2011-02-12 01:56:45 +00:00
vladlosev
e5121b5a82 Improves cross-platform compatibility of gmock output. This fixes issue 135. 2011-02-11 23:50:38 +00:00
zhanyong.wan
5b61ce3ee5 Picks up gtest r536; renames implicit_cast and down_cast to reduce the chance of clash (by Roman Perepelitsa); enables gmock_gen.py to handle storage specifiers (by Steve Fox). 2011-02-01 00:00:03 +00:00
zhanyong.wan
a684b5a526 Enables SetArgPointee<>() to accept a string literal; removes a self-assignment warning; teaches gmock doctor to diagnose TTB with Clang; picks up gtest r525. 2010-12-02 23:30:50 +00:00
vladlosev
88032d8e0f Adds comment clarifying the use of default-constructed matchers. 2010-11-17 23:29:21 +00:00
zhanyong.wan
2321b2a675 Adds action SaveArgPointee. 2010-10-14 06:51:27 +00:00
zhanyong.wan
7dfbea4976 Fixes an include order problem in CMakeLists.txt; pulls in gtest r489. 2010-10-05 19:24:04 +00:00
zhanyong.wan
d8e15d9c4a Adds more tests for the gmock generator. 2010-10-05 19:21:38 +00:00
zhanyong.wan
4b16e8ed27 Enables gmock_gen to handle return types that are templates (based on Pride Haveit's patch); also fixes deprecation warnings when using gmock_gen with python 2.6 (by Aaron Jacobs). 2010-10-05 06:11:56 +00:00
zhanyong.wan
5921483640 Adds SetArgPointee to replace SetArgumentPointee. 2010-10-05 05:58:51 +00:00
vladlosev
662d8a2350 Factors out email address in Google Mock Doctor messages. 2010-09-29 00:38:12 +00:00
zhanyong.wan
d43acacf50 Fixes issue 105. 2010-09-27 22:10:44 +00:00
zhanyong.wan
736baa8ac0 Prints the type of the actual value as part of a match message when appropriate. 2010-09-27 17:44:16 +00:00
vladlosev
4c91551c3b Updates the gMock Doctor script to understand Clang error messages. 2010-09-25 00:52:20 +00:00
zhanyong.wan
53e08c44dd Include gtest and gmock headers as user headers instead of system headers. 2010-09-14 05:38:21 +00:00
zhanyong.wan
ad7c462be7 Simplifies the VC projects by using gmock-all.cc and
gmock_all_test.cc.  Also fixes a missing include directory for
gmock_main in the Release mode.  I had to add /bigobj to
gmock_test.vcproj to make the compiler happy, as we now need to
generate code for many functions in the same translation unit.
2010-09-09 22:16:17 +00:00
zhanyong.wan
2516f60da9 Publishes GTEST_HAS_STREAM_REDIRECTION (by Vlad Losev); casts char to unsigned char before calling isspace() etc to avoid undefined behavior (by Zhanyong Wan); fixes the VC projects (by Fredrik Roubert). 2010-08-31 18:28:02 +00:00
zhanyong.wan
ccedc1c933 Removes some gmock internal macros; sorts the file lists in Makefile.am; picks up gtest r454. 2010-08-09 22:46:12 +00:00
zhanyong.wan
c6333dca1c Picks up gtest r453. 2010-08-09 18:20:45 +00:00
zhanyong.wan
d60c5f41c2 Removes unused scons scripts; picks up gtest r446. 2010-07-21 22:21:07 +00:00
zhanyong.wan
e3bd0981ca Implements ReturnPointee() and ReturnRefOfCopy(). 2010-07-03 00:16:42 +00:00
zhanyong.wan
02c1505ebf Increases the maximum arity of AllOf() and AnyOf() to 10, by Marcus Börger. 2010-06-09 19:21:30 +00:00
zhanyong.wan
b4140808f9 Replaces Python-style interpolation with arbitrary C++ string expression in MATCHER* descriptions. 2010-06-08 22:53:57 +00:00
vladlosev
0a781df32a Fixes build failure on Windows/CMake (issue 111). 2010-05-20 22:17:28 +00:00
zhanyong.wan
ab5b77c179 Implements Pointwise(). 2010-05-17 19:32:48 +00:00
vladlosev
0f3f5012d8 Adds CMake build script. 2010-05-13 18:19:26 +00:00
vladlosev
e2e8ba401d Renames test script flags. 2010-05-13 18:16:03 +00:00
zhanyong.wan
02f7106557 Moves the universal printer from gmock to gtest (by Vlad Losev). 2010-05-10 17:14:29 +00:00
vladlosev
76c1c612e2 Fixes tests leaking altered values of GMOCK_FLAG(verbose) (issue 110). 2010-05-05 19:47:46 +00:00
vladlosev
54af9ba50a Adds a synchronization test. 2010-05-04 16:05:11 +00:00
zhanyong.wan
33605ba454 Adds Each(m) (by Wojtek Moczydlowski); removes scripts/test/Makefile (by Zhanyong Wan); pulls in gtest r424. 2010-04-22 23:37:47 +00:00
vladlosev
090c4830dd Fixes a typo in README. 2010-04-16 16:21:17 +00:00
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