zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204 Commits 10 Branches 30 Tags
f4274520da256a3e8dd4fe2aa2e714f44ad89d18
Commit Graph
118 Commits
Author SHA1 Message Date
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 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 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 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
jgm 38513a8bb1 Unfortunately, the svn repo is a bit out of date. This commit contains 8 
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.
 2012-11-15 15:50:36 +00:00
vladlosev ada23475e2 Makes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin). 2012-08-14 15:38:49 +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
jgm 79a367eb21 Reduced template instantiation depth for the AllOf and AnyOf matchers. Also some formatting changes. 2012-04-10 16:02:11 +00:00
vladlosev 9bcb5f9146 Fixes a lock reentrancy when destroying a mock causes destruction of another mock (issue 79) (by Aaron Jacobs). 2011-10-24 23:41:07 +00:00
zhanyong.wan 898725cf47 Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595. 2011-09-16 16:45:39 +00:00
vladlosev 587c1b37c2 Adds support for building Google Mock as a shared library (DLL). 2011-05-20 00:42:22 +00:00
vladlosev 47be72a952 A test to verify correcteness of Google Mock on multiple threads. 2011-05-11 08:18:45 +00:00
zhanyong.wan 8d3dc0cdd8 simplifies TrulyMatcher and adds a test for it 2011-04-14 19:37:06 +00:00
vladlosev aa43220fe5 Changes diagnostic output of the question mark from '\?' to '?'. 2011-04-01 21:58:42 +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 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 e5121b5a82 Improves cross-platform compatibility of gmock output. This fixes issue 135. 2011-02-11 23:50:38 +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 5921483640 Adds SetArgPointee to replace SetArgumentPointee. 2010-10-05 05:58:51 +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 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 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
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
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 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