Commit Graph

811 Commits

Author SHA1 Message Date
zhanyong.wan
35877b7967 avoids clash with the max() macro on Windows 2013-09-18 17:51:08 +00:00
zhanyong.wan
2d3543f81d avoids clash with the max() macro on Windows 2013-09-18 17:49:56 +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
c306ef2e14 supports a protocol for catching tests that prematurely exit 2013-09-06 22:50:25 +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
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