Commit Graph

28 Commits

Author SHA1 Message Date
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
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
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
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
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
470df42bad Enables tests depending on stdout capturing (by Vlad Losev). 2010-02-02 22:34:58 +00:00
zhanyong.wan
d14aaed74b Enables regex matchers on all platforms. 2010-01-14 05:36:32 +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
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
bbd6e105e7 Picks up gtest r314. 2009-09-18 18:17:19 +00:00
zhanyong.wan
04d6ed817e Simplifies the tests using EXPECT_DEATH_IF_SUPPORTED. 2009-09-11 07:01:08 +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
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
41b9b0b561 Implements Expectation, ExpectationSet, and After for specifying expectation orders. 2009-07-01 19:04:51 +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
4cd148e588 Removes the .WithArguments() clause from ON_CALL and EXPECT_CALL. 2009-06-11 20:07:00 +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
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
df35a763b9 Implements --gmock_catch_leaked_mocks and Mock::AllowLeak. 2009-04-22 22:25:31 +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
5b95fa7b16 Improves error messages for undefined return value (by Sverre Sundsdal); improves gmock_doctor. 2009-01-27 22:28:45 +00:00
shiqian
e35fdd936d Initial drop of Google Mock. The files are incomplete and thus may not build correctly yet. 2008-12-10 05:08:54 +00:00