Commit Graph

240 Commits

Author SHA1 Message Date
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
vladlosev
40fa8ffc9e Adds the LICENSE file to the distribution. 2013-01-31 19:53:54 +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
vladlosev
4d60a596b4 Expressed the thread-safety annotations in code, replacing the existing comment-based system (by Aaron Jacobs). 2011-10-24 21:16:22 +00:00
vladlosev
f44bdc7398 Fixed Google Mock Doctor Clang regexes to work on both k8 and piii (by Greg Miller). 2011-10-24 17:48:54 +00:00
vladlosev
0fd8396827 Modifies gmock_doctor.py to work with GCC output that contains file:line:char positions and left and right quote characters (U+2018 and U+2019) instead of apostrophes (U+0027). 2011-09-28 18:32:59 +00:00
zhanyong.wan
898725cf47 Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595. 2011-09-16 16:45:39 +00:00
vladlosev
5aa8dd99e2 Renames the license files. 2011-09-09 07:06:32 +00:00
vladlosev
eca38cd7ec More Clang support improvements in Google Mock Doctor. 2011-08-25 21:35:10 +00:00
vladlosev
787146bdb7 Improves support for Clang in Google Mock Doctor. 2011-08-16 00:51:14 +00:00
vladlosev
f4eeaedb39 Fixes issue 139 and issue 140. 2011-05-20 21:44:14 +00:00
vladlosev
bce8134d89 Adds a DLL-related section to Google Mock's README. 2011-05-20 21:15:36 +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
vladlosev
a63da04126 Makes generation of fused sources contingent on availability of Python and pulls in gtest r580. 2011-04-21 21:56:01 +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
vladlosev
dd28d536eb Updates conditional directives to be consistent with the rest of the project. 2011-04-14 02:42:15 +00:00
vladlosev
e73cf452a5 Corrects condition to compile out MSVC's pragmas. This fixes the build on MinGW. 2011-04-13 22:12:00 +00:00
vladlosev
ab29bb6fcd Removes commas from last items in enums (a C++ standard compliance fix). 2011-04-08 01:32:32 +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
vladlosev
aa43220fe5 Changes diagnostic output of the question mark from '\?' to '?'. 2011-04-01 21:58:42 +00:00
vladlosev
71d08627a3 Fixes Google Mock Doctor affected by the latest tweaks to Clang. 2011-03-29 22:29:51 +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
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