zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,655 Commits 10 Branches 30 Tags
main
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhanyong.wan 88080ee943 adds gmock_doctor.py to the distro 2013-11-21 18:38:42 +00:00
zhanyong.wan 35877b7967 avoids clash with the max() macro on Windows 2013-09-18 17:51:08 +00:00
zhanyong.wan 6e0fba4de0 fixes the bug reported by Andrzej Jarzabek where 2 gmock tests fail when built with VS 2013-09-16 05:50:53 +00:00
zhanyong.wan 45fef502fa makes googlemock generator handle some class templates; pulls in gtest r662 2013-09-06 22:52:14 +00:00
zhanyong.wan 778358e3f1 adds more files to gmock's distro 2013-08-27 21:31:58 +00:00
zhanyong.wan 35da814a99 fixes a typo 2013-08-27 21:04:16 +00:00
zhanyong.wan 64bd62daf2 adds gmock-more-matchers.h to the distro 2013-08-27 20:56:21 +00:00
zhanyong.wan 1cc1d4bcec Makes some container matchers accept initializer lists in C++11 mode and work with stream-like containers that don't have size() or empty(); exposes StringMatchResultListener for defining composite matchers. 2013-08-08 18:41:51 +00:00
zhanyong.wan 5579c1a8b1 Makes UnorderedElementsAre*() work with containers that don't have size() or empty(). 2013-07-30 06:16:21 +00:00
zhanyong.wan fb25d53911 Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls in 
gtest r660.
 2013-07-28 08:24:00 +00:00
zhanyong.wan 2989703ed8 Fixes uses of pair to std::pair; pulls in gtest r655. 2013-06-20 18:59:15 +00:00
zhanyong.wan 616180e684 New floating-point matchers: DoubleNear() and friends; 
AllOf() and AnyOf() can accept any number of arguments now in C++11 mode.
 2013-06-18 18:49:51 +00:00
zhanyong.wan f4274520da Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653 2013-04-24 02:49:43 +00:00
zhanyong.wan 061f1d4d16 Updates version number to 1.7.0 2013-04-07 03:16:38 +00:00
zhanyong.wan c10a35a26a Fixes some compatibility issues with STLport. 2013-04-04 22:45:59 +00:00
zhanyong.wan a9a59e06dd Makes WhenSorted() support associative containers (by billydonahue@google.com). 2013-03-27 16:14:55 +00:00
zhanyong.wan 1f122a06e6 Adds special support for matching StringPiece. Pulls in gtest r646. 2013-03-25 16:27:03 +00:00
zhanyong.wan 2eab17b76d Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic mode. 2013-03-08 17:53:24 +00:00
zhanyong.wan a1a98f840e Adds a cmake target for gmock_ex_test; also fixes name shadowing warnings. 2013-03-01 21:28:40 +00:00
zhanyong.wan c896504e41 Improves the tests for nice, naggy, and strict mocks. 2013-03-01 07:10:07 +00:00
zhanyong.wan 20d1a235bc Allows the return type of a mock method to contain unprotected commas. 2013-03-01 06:58:38 +00:00
zhanyong.wan 29be92385e Removes unused variables and functions. 2013-03-01 06:53:35 +00:00
zhanyong.wan 844fa94976 Implements NaggyMock. 2013-03-01 01:54:22 +00:00
zhanyong.wan a31d9ce290 Implements matcher SizeIs(). 2013-03-01 01:50:17 +00:00
zhanyong.wan 83f6b08b5f Clarifies how to implement MatcherInterface. 2013-03-01 01:47:35 +00:00
zhanyong.wan 320814aca0 Implements matcher IsEmpty(); also pulls in gtest r643. 2013-03-01 00:20:30 +00:00
zhanyong.wan edd4ab4945 Makes googlemock throw a runtime_error instead of abort when a mock 
method with no default value is invoked (if exceptions are enabled).
 2013-02-28 22:58:51 +00:00
zhanyong.wan cf40604cf0 Adds -pthread and switches -I to -isystem in build instructions; 
also pulls in the latest gtest revision (r638).
 2013-02-27 17:53:45 +00:00
zhanyong.wan 2fd619edd3 Pulls in gtest r615. 
Renames internal enums to the kFoo naming style.

Fixes gmock doctor to work with newer versions of Clang.
 2012-05-31 20:40:56 +00:00
zhanyong.wan 898725cf47 Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595. 2011-09-16 16:45:39 +00:00
zhanyong.wan 8d3dc0cdd8 simplifies TrulyMatcher and adds a test for it 2011-04-14 19:37:06 +00:00
zhanyong.wan 8d7c5ad6d3 Documents latest changes and pulls in gtest r570 2011-04-14 07:49:05 +00:00
zhanyong.wan 52277c919e disables 'make install' 2011-04-07 07:37:28 +00:00
zhanyong.wan 8e68753288 fixes link errors in 'make check' 2011-04-07 07:19:40 +00:00
zhanyong.wan 86d2eeb112 Prevents ADL in AllOf() and AnyOf() (by Manuel Klimek). 2011-03-16 17:10:39 +00:00
zhanyong.wan fc8c6c479a Disables SetArgPointee("string literal") for GCC 4.0- and Symbian, and 
adds support for SetArgPointee(L"wide string literal") -- by Vlad Losev.
 2011-03-09 01:18:08 +00:00
zhanyong.wan 62a35fbc5d Adds CMake scripts to gmock's release package. 2011-02-24 21:59:54 +00:00
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
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
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
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
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
zhanyong.wan ab5b77c179 Implements Pointwise(). 2010-05-17 19:32:48 +00:00
zhanyong.wan 02f7106557 Moves the universal printer from gmock to gtest (by Vlad Losev). 2010-05-10 17:14:29 +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
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
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
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