1051 Commits

Author SHA1 Message Date
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
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