1303 Commits

Author SHA1 Message Date
zhanyong.wan
492986a5d0 Updates gtest.xcodeproj to be compatible with OS X 10.8.4 & Xcode 4.6.3 2013-08-27 20:09:54 +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
9ba29fae92 fixes a typo in CMake script; h/t to Jay Mueller for reporting the issue 2013-07-09 04:45:37 +00:00
zhanyong.wan
665faa1622 allows gtest-config.in to work with an absoulte path for @top_srcdir@. h/t to Jimi Xenidis for reporting the issue and the fix. 2013-07-08 05:51:32 +00:00
zhanyong.wan
81ddb8434f makes gtest-death-test_test.cc compile on platforms that don't support death tests; h/t to Steve Robbins for reporting the issue and suggesting the fix. 2013-07-08 04:40:28 +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
48568d0688 Fixes compatibility with C++11: (1 - 1) is no longer a NULL pointer constant. 2013-06-18 18:44:25 +00:00
vladlosev
c506784b08 When --gtest_filter is specified, XML report now doesn't contain information about tests that are filtered out (issue 141). 2013-04-25 17:58:52 +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
c84afbeaf1 Fixes a thread annotation; updates CHANGES for 1.7.0 2013-04-24 02:48:07 +00:00
zhanyong.wan
0fac83390a prints type/value parameters when listing tests 2013-04-10 04:29:33 +00:00
zhanyong.wan
061f1d4d16 Updates version number to 1.7.0 2013-04-07 03:16:38 +00:00
zhanyong.wan
c97e3001cd Updates the version number to 1.7.0 2013-04-07 03:15:36 +00:00
vladlosev
f5fa71f728 Implements support for calling Test::RecordProperty() outside of a test. 2013-04-05 20:50:46 +00:00
zhanyong.wan
c10a35a26a Fixes some compatibility issues with STLport. 2013-04-04 22:45:59 +00:00
zhanyong.wan
5f18b68bfc Fixes some compatibility issues with STLport. 2013-04-04 22:44:57 +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
c08ec2a768 Replaces unportable == with portable = in configure.ac.
Contributed by tk@giga.or.at.
2013-03-19 00:04:54 +00:00
zhanyong.wan
1edbcbad73 Prints a useful message when GetParam() is called in a non-parameterized test. 2013-03-12 21:17:22 +00:00
zhanyong.wan
6b7a167dca Supports colored output on term type screen-256color.
Proposed as a one-line patch by Tom Jakubowski (tom@crystae.net);
finished by Zhanyong Wan.
2013-03-11 17:52:13 +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
fc01f532a6 Fixes unused function warning on Mac, and fixes compatibility with newer GCC. 2013-02-28 23:52:42 +00:00
zhanyong.wan
6a036a5c8c Fixes a nasty issue in gtest's template instantiation. 2013-02-28 23:46:07 +00:00
zhanyong.wan
b3ed14ac17 Implements RUN_ALL_TESTS() as a function. 2013-02-28 23:29:06 +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
1b89db9705 Removes an unused variable; also refactors to support an up-coming
googlemock change.
2013-02-28 22:55:25 +00:00
zhanyong.wan
88fe90793c Removes dangling references in make/cmake files. 2013-02-27 18:51:27 +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
b854938bd0 Adds -pthread and changes -I to -isystem in gtest's build instructions. 2013-02-27 17:49:18 +00:00
kosak
ba072ccca4 Fixes gUnit streaming output format. 2013-02-22 20:25:42 +00:00
kosak
cc1fdb58ca Removes testing::internal::String::Format(), which causes problems as it truncates the result at 4096 chars. Also update an obsolete link in comment. 2013-02-22 20:10:40 +00:00
zhanyong.wan
65b5c22436 Fixes an out-dated URL. 2013-02-02 18:45:13 +00:00
vladlosev
40fa8ffc9e Adds the LICENSE file to the distribution. 2013-01-31 19:53:54 +00:00
vladlosev
d367343685 Adds the LICENSE file to the distribution. 2013-01-29 20:34:47 +00:00
jgm
268ba61815 Unbreak building gtest with -std=c++11 on Mac OS X 10.6. Also, better support for death tests in iOS simulator. 2012-12-03 18:52:06 +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
jgm
87fdda2cf2 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:47:38 +00:00
vladlosev
78bf6d5724 Improves Android support (by David Turner). 2012-09-19 17:58:01 +00:00
vladlosev
b535c1767e Removes obsolete debug code. 2012-09-06 17:09:27 +00:00
vladlosev
ff8d732cef Fixes gtest-tuple.h in Visual C++ 7.1. 2012-09-06 16:41:18 +00:00
vladlosev
ada23475e2 Makes gmock's Pointee() work for optional<T> (by Jeffrey Yasskin). 2012-08-14 15:38:49 +00:00
vladlosev
2147489625 Fixed Native Client build of gtest when using glibc (by Ben Smith). 2012-08-14 15:20:28 +00:00
vladlosev
1f7bb45e07 Prevents pump.py from splitting long IWYU pragma lines. 2012-08-14 15:20:01 +00:00
jgm
4c97512141 fixes a problem in which we pass the address one byte ~/svn/googletest/trunk
after the end of stack space in a call to clone().  According to
Linux's man page on clone(), the 'stack' parameter usually points
to the topmost address of the memory space set up for the child stack.  The existing code points one byte after the end
2012-07-12 16:46:50 +00:00
jgm
a1c4b46bc2 added defines for iOS 2012-07-09 13:22:29 +00:00
zhanyong.wan
a88c9a88e4 Improves gtest's failure messages. In particulars, char pointers and
char arrays are not escapped properly.
2012-06-07 20:34:34 +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
a3b859162d Fixes threading annotations and compatibility with C++11, which doesn't
allow exepctions to be thrown in a destructor.
2012-05-31 20:37:13 +00:00
vladlosev
cdb24f86d5 Teach gtest to autodetect rtti support with clang (by Nico Weber). 2012-05-02 18:09:59 +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
jgm
9a56024c9a Added support for platforms where pthread_t is a struct rather than an integral
type.
2012-04-02 17:41:03 +00:00
jgm
f0b86fc3b0 Misc small updates to some debug death code, and to messages streaming to macros 2012-03-09 17:12:39 +00:00
jgm
cfb40870bc Locking for Notification class. 2012-01-27 21:26:58 +00:00
jgm
4d6f296e8e Adds file and line information to the "message", which is used as the summary
of a failure.
2012-01-17 15:11:32 +00:00
vladlosev
69a071bc0d Removes spurious semicolon. 2011-11-28 19:52:07 +00:00
vladlosev
8965a6a0d2 Improves conformance to the Google C++ Style Guide (by Greg Miller). 2011-11-04 17:56:23 +00:00
vladlosev
829402edcf Adds support for detection of running in death test child processes. 2011-10-28 16:19:04 +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
83fe024fb0 Adds empty methods to Mutex on platforms where Google Test is not thread-safe. This will support a reentrancy fix in Google Mock. 2011-10-24 23:36:46 +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
4c11f25f8c Expressed the thread-safety annotations in code, replacing the existing comment-based system (by Aaron Jacobs). 2011-10-24 21:13:56 +00:00
vladlosev
97ef1c705e Changes to fix gtest-printers_test on VC++ 2010. 2011-10-24 18:33:26 +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
c7c7961d23 Simplifies test assertions in sample5. 2011-10-14 01:18:53 +00:00
vladlosev
431a8be166 Implements the timestamp attribute for the testsuites element in the output XML (external contribution by Dirk Meister). 2011-10-05 05:52:34 +00:00
vladlosev
69a40b7d4a Adds ability to inject death test child arguments for test purposes. 2011-10-05 05:51:10 +00:00
vladlosev
879916a939 Fixes test failure on 32-bit Ubuntu. 2011-10-05 05:49:40 +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
vladlosev
f7d58e81c3 Adds a new macro simplifying use of snprinf on MS platforms. 2011-09-26 17:54:02 +00:00
vladlosev
1b2e509958 Fixes C++0x compatibility problems. 2011-09-26 17:52:19 +00:00
zhanyong.wan
898725cf47 Implements matchers WhenSorted() and WhenSortedBy(); pulls in gtest r595. 2011-09-16 16:45:39 +00:00
zhanyong.wan
2ca4d21500 Simplifies the implementatoin of the test result printer; by Ulfar Erlingsson 2011-09-16 16:43:37 +00:00
vladlosev
5aa8dd99e2 Renames the license files. 2011-09-09 07:06:32 +00:00
vladlosev
27615dbc5f Renames the license file. 2011-09-09 07:02:56 +00:00
vladlosev
4b07d73f4e Ignore SIGPROF signal during clone()/fork() call. clone()/fork() call hangs permanently if it consumes more cpu than the SIGPROF signal timer interval (by Nabeel Mian). 2011-09-09 05:42:09 +00:00
vladlosev
eca38cd7ec More Clang support improvements in Google Mock Doctor. 2011-08-25 21:35:10 +00:00
vladlosev
294f69f957 Adds explanation on how to build the Xcode project under Xcode 4+ to README. 2011-08-22 21:30:01 +00:00
vladlosev
787146bdb7 Improves support for Clang in Google Mock Doctor. 2011-08-16 00:51:14 +00:00
vladlosev
cf3f92ef93 Fixes a user reported test break (modifying a dict while iterating). 2011-08-16 00:47:22 +00:00
vladlosev
c2922d4ed2 Fixes a resource leak in gtest-port_test (by Haruka Iwao). 2011-07-11 19:27:07 +00:00
vladlosev
386da2037d QNX compatibility patch (by Haruka Iwao). 2011-06-20 21:43:18 +00:00
vladlosev
f3cf0a2316 Suppresses the tail-call optimization of StackGrowsDown() in GCC4.6 (by Paul Pluzhnikov). 2011-06-13 20:09:57 +00:00
vladlosev
cc265df8b4 Fixes broken build on VC++ 7.1. 2011-06-13 19:00:37 +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
7e29bb7f7e Adds support for building Google Mock as a shared library (DLL). 2011-05-20 00:38:55 +00:00
vladlosev
ee2f8caecc Simplifies the code by removing condfitional section that is no longer necessary. 2011-05-12 17:32:42 +00:00