1393 Commits

Author SHA1 Message Date
kosak
fb9caa4a18 Minor changes. 2015-07-14 20:44:00 +00:00
kosak
683886c567 Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated in INSTANTIATE_TEST_CASE_P. 2015-07-14 20:29:34 +00:00
kosak
1e4d31008f Control death test with an #ifdef guard. 2015-07-14 20:26:09 +00:00
kosak
156d1b513b Create custom/gtest-port.h to hold custom logic. 2015-07-14 19:56:37 +00:00
kosak
d5ac8cd9eb Add GTEST_ATTRIBUTE_UNUSED_ to the dummy variable generated in
INSTANTIATE_TEST_CASE_P.
2015-07-13 22:45:50 +00:00
kosak
0f3d673be1 fully-qualify use of scoped_ptr name 2015-07-13 21:33:41 +00:00
kosak
d86a723ed9 Mark the default constructor of Matcher<> explicit.
This prevents implicitly constructing a matcher from {}.
2015-07-13 21:19:43 +00:00
kosak
9b1a944ec4 Fix EXPECT_THAT() to support literal strings as a second argument. 2015-04-28 23:06:58 +00:00
kosak
6305ff5a92 Change IsNull and NotNull to use ==/!= nullptr in C++11.
Also update gmock_doctor due to Clang wording change.
2015-04-28 22:36:31 +00:00
kosak
1197daf357 urxvt supports colors 2015-04-28 22:04:35 +00:00
kosak
f8c44a0ae4 Work around some unsigned->signed warnings in our tests/.
Thanks to Diego Barrios Romero <eldruin@gmail.com>.
2015-04-28 21:59:44 +00:00
kosak
5c996c6466 Make an int64->double conversion explicit to silence -Wconversion.
Addresses issue #173:
  https://code.google.com/p/googlemock/issues/detail?id=173
2015-04-28 21:43:13 +00:00
kosak
5625dd333a Suppresses the stack trace in a warning for uninteresting call by default; the stack trace will still be printed when --gmock_verbose=info is printed. 2015-02-14 22:05:58 +00:00
kosak
d478a1f46d In C++11 and above, makes a mock method whose return type is default
constructible return a default-constructed value by default.
2015-02-14 02:45:40 +00:00
kosak
1d53731f2c Enable GTest thread safety on Native Client. 2015-02-14 02:26:43 +00:00
kosak
02d6479259 This change adds an explicit invocation of std::move to workaround a problem
in VC++'s /analyze compiler that was causing build errors in Chrome:

https://code.google.com/p/googlemock/issues/detail?id=172
2015-02-14 02:22:21 +00:00
kosak
8209a45e24 Add asserts to prevent mysterious hangs in a non-thread-safe gmock build. 2015-02-14 02:13:32 +00:00
kosak
b215e30cad Add FreeBSD support. 2015-01-22 00:58:35 +00:00
kosak
83602c8340 Fix build regression with old (Xcode 5.1) clangs. 2015-01-14 06:35:05 +00:00
kosak
7489581db8 Fix build of Objective-C++ files with new clang versions. 2015-01-08 03:34:16 +00:00
kosak
12ab6bb16f Small Mingw localtime() fix.
Thanks tberghammer for pointing it out.
https://codereview.appspot.com/185420043/
2015-01-08 03:12:18 +00:00
kosak
53d49dc43e Make ReturnNull() support unique_ptr and shared_ptr. 2015-01-08 03:03:09 +00:00
kosak
8e838ce0fd Adding support to gmock_gen for nested templates. 2015-01-08 02:48:08 +00:00
kosak
6b81780310 Makes DoubleNear() print the diff between the actual and the expected value when the match fails.
Also fix bogus MSVC warning about "alignment of a member was sensitive to packing".
Also bring in gtest 701.
2015-01-08 02:38:14 +00:00
kosak
c2101c2877 Change an example to use 'override' rather than 'virtual'. Add missing headers for 'connect' and 'socket'. 2015-01-08 02:35:11 +00:00
kosak
102b50483a Noop changes to suppress compile-time warnings in WINDOWS code paths. 2014-11-17 02:56:14 +00:00
kosak
61adbcc5c6 Add support for C++11 explicitly defaulted and deleted special member functions in the gmock generator. 2014-11-17 02:49:22 +00:00
kosak
055b6b17d2 Prevent gmock_gen from returning exit code zero on a failure to parse. 2014-11-17 02:46:37 +00:00
kosak
f58b49a2b1 Handle parameters without variable names when the type includes *, & or []. 2014-11-17 02:42:33 +00:00
kosak
40be033887 Remove special support for GTEST_OS_IOS_SIMULATOR. 2014-11-17 02:38:21 +00:00
kosak
e330b754cb Strip trailing whitespace when stringifying type lists. 2014-11-17 02:28:09 +00:00
kosak
6e87b780d3 Update gmock_doctor to accept static_assert output. 2014-11-17 02:22:20 +00:00
kosak
cd99eb0bbd Fix gmock-matchers_test's ConstIter. 2014-11-17 02:18:28 +00:00
kosak
074ed8c8ea Clang-on-Windows can support GTEST_ATTRIBUTE_UNUSED_. 2014-11-17 02:11:23 +00:00
kosak
7123d83132 Fix gmock Action behaviour when return type is Wrapper 2014-11-17 02:04:46 +00:00
kosak
506340a66b Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro. 2014-11-17 01:47:54 +00:00
kosak
d370f85b02 Call move() by qualified name (::testing::internal::move() or just internal::move()).
Pull in gtest 696.
2014-11-17 01:14:16 +00:00
kosak
71271d2c95 Call move() by qualified name (::testing::internal::move() or just internal::move()). 2014-11-17 01:13:37 +00:00
kosak
389bad61e2 Silence a signedness-comparison warning in gmock-actions_test.
include <functional> when using std::function in gmock.
2014-11-17 01:08:51 +00:00
kosak
3d1c78b2bf Add ByMove() modifier for the Return() action. Pull in gtest 695. 2014-11-17 00:56:52 +00:00
kosak
d3d142ef1c Add ByMove() modifier for the Return() action. 2014-11-17 00:55:43 +00:00
kosak
5b9cbbb16d Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.
Bring in gtest 694.
2014-11-17 00:28:55 +00:00
kosak
6aa0422e85 Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock. 2014-11-17 00:27:28 +00:00
kosak
6884259b7d Reduce the stack frame size for CmpHelper* functions by moving the failure path into their own functions. 2014-11-17 00:06:22 +00:00
kosak
64df8e349f Mock out GetCurrentDir in NaCl. 2014-07-29 00:30:10 +00:00
kosak
2336e9c171 Defines the UnorderedPointwise(m, container) matcher, which is like Pointwise(m, container) but ignores the order of the elements. 2014-07-28 22:57:30 +00:00
kosak
b54098a9ab Expand equality failure messages with a by-line diff. 2014-07-28 21:54:50 +00:00
kosak
06678924fa Allows {Unordered,}ElementsAreArray() to accept any STL-style container as the parameter. 2014-07-28 20:01:28 +00:00
kosak
bd263344f9 Additional changes, to add support for Windows Phone and Windows RT 2014-06-18 21:31:01 +00:00
kosak
96ddffe8fd Reduce the number of occurrences of gendered pronouns in gtest. 2014-06-18 00:22:42 +00:00
kosak
a9e02a9178 Add MockFunction::AsStdFunction(). Also pull in gtest 688. 2014-06-17 23:19:54 +00:00
kosak
21ee8a2e72 Disable asan instrumentation for StackGrowsDown(). 2014-06-17 23:16:37 +00:00
billydonahue
1f5fdea417 Push several shanges:
Make single argument constructors explicit in macros.

    Remove NOMINMAX macro.

    Add macros for disabling Microsoft Visual C++ warnings.

    Add WhenDynamicCastTo<T> matcher.
    A matcher that matches a pointer that matches inner_matcher when
    dynamic_cast<T> is applied.

    Add IWYU export pragmas to the tuple include lines.

    Fix NativeArray to not require a copy constructor unless we ask for one.
    This allows ElementsAre() to support non-copyable types.

    Examine WINAPI_FAMILY_PARTITION macros to better distinguish windows platforms.
    Author: martin@martin.st
    From: https://codereview.appspot.com/57220043/
2014-05-19 17:54:51 +00:00
billydonahue
8120f66c32 Push upstream to SVN. 2014-05-15 19:42:15 +00:00
kosak
bd0188320d Export tuple and friends in the ::testing namespace. 2014-04-02 20:30:00 +00:00
kosak
5df87d70b6 Export tuple and friends in the ::testing namespace. 2014-04-02 20:26:07 +00:00
kosak
15d61e42bd Implement threading support for gmock on Windows.
Replace U+2013 with U+002D in comment lines.
Pull in gtest 681.
2014-03-24 22:08:24 +00:00
kosak
a6340420b9 Implement threading support for gtest on Windows.
Also, stop using localtime(). Instead, use localtime_r() on most systems, localtime_s() on Windows.
2014-03-24 21:58:25 +00:00
kosak
c26f969579 Make the gmock generator work with the 'override' keyword. Also pull in gtest 680. 2014-03-12 23:27:35 +00:00
kosak
ffea2d6040 Add annotations to suppress ThreadSanitizer failures due to gunit/gmock printer. 2014-03-12 22:55:56 +00:00
kosak
c82282819c Remove code referencing Google protocol buffers version 1. 2014-03-12 22:51:07 +00:00
kosak
b6a348862b Introduce a BeginEndDistanceIs matcher for containers such as std::forward_list
which lack a size() member.

Also pull in gtest 678.
2014-03-12 21:06:46 +00:00
kosak
134389c044 Standards compliance changes to fix QNX build. 2014-03-12 21:03:35 +00:00
kosak
fc4aa1d718 Suppress "Conditional expression is constant" warning on Visual Studio. 2014-01-29 07:30:13 +00:00
kosak
41a8bc67ab Suppress "Conditional expression is constant" warning on Visual Studio. 2014-01-29 07:29:19 +00:00
kosak
b5c81098a8 Support mocking methods with move-only return types. 2014-01-29 06:41:44 +00:00
kosak
35956659ea Add GTEST_MOVE macro, to support mocking methods with move-only return types.
Add GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_
2014-01-29 06:34:44 +00:00
kosak
b93d0f10d5 Make Google Mock build cleanly on Visual Studio 2010, 2012, 2013. 2014-01-13 22:28:01 +00:00
kosak
7d1051ce2b Make Google Test build cleanly on Visual Studio 2010, 2012, 2013.
Also improve an error message in gtest_test_utils.py.
2014-01-13 22:24:15 +00:00
kosak
04ce8521f4 Adds a note in the "uninteresting mock method call" warning to advise people how to handle the warning.
Clarifies the purpose of utilities in gmock-port.h and adds guidance w.r.t. gmock-port.h vs gtest-port.h.
Pulls in gtest r674.
2014-01-12 23:42:34 +00:00
kosak
6576c64903 Fix a couple of typos in Google Test's README. 2014-01-12 23:29:39 +00:00
kosak
ccf8e33bc5 Define specialization of PrintTo(...) for ::std::tuple. 2014-01-12 19:59:41 +00:00
kosak
d3eb97f321 Improves documentation on gtest's macros.
Adds script to automate releasing new version of wiki docs.
2014-01-12 18:51:09 +00:00
kosak
18489fa4f8 Distinguish between C++11 language and library support for <initializer_list>.
Fix spelling: repositary -> repository.
Pull in gtest 671.
2013-12-04 23:49:07 +00:00
kosak
4f7018ed61 Distinguish between C++11 language and library support for <initializer_list>.
Fix spelling: repositary -> repository.
2013-12-04 23:44:22 +00:00
kosak
6414d806cd Fix warnings encountered with clang -Wall, and pull in gtest 670. 2013-12-03 23:19:36 +00:00
kosak
5d83ee08df Fix warnings encountered with clang -Wall. 2013-12-03 23:15:40 +00:00
kosak
b72d18ca55 Clarify the rationale for gmock_all_test.cc, and pull in gtest 669 2013-12-03 22:46:51 +00:00
kosak
37b97d1c93 Add MemorySanitizer annotations in gtest printers. Also remove unused variable kPathSeparatorString. 2013-12-03 22:38:22 +00:00
kosak
5f2a6ca4fd Don't copy the argument in SafeMatcherCast because it's not safe. 2013-12-03 01:43:07 +00:00
kosak
aa34ae2508 Delete whitespace, and change the return type of ImplicitlyConvertible::MakeFrom() to From&. 2013-12-03 01:36:29 +00:00
zhanyong.wan
88080ee943 adds gmock_doctor.py to the distro 2013-11-21 18:38:42 +00:00
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