Commit Graph

599 Commits

Author SHA1 Message Date
Gennadiy Civil
11f2b40076 Merge pull request #2111 from knuto:pr/remove_slash
PiperOrigin-RevId: 261906004
2019-08-06 13:14:49 -04:00
Gennadiy Civil
5e5f19a36d Merge pull request #2357 from kuzkry:obsolete-documentation
PiperOrigin-RevId: 261343928
2019-08-02 13:26:55 -04:00
Gennadiy Civil
b5a26b6911 Merge pull request #2361 from guillemglez:master
PiperOrigin-RevId: 261340959
2019-08-02 13:06:47 -04:00
Abseil Team
8e4348c596 Googletest export
Remove markdown extension which isn't supported on github.

PiperOrigin-RevId: 261321329
2019-08-02 11:32:23 -04:00
Gennadiy Civil
26579b3523 Merge pull request #2353 from anttsov:patch-1
PiperOrigin-RevId: 261198930
2019-08-02 11:32:15 -04:00
Abseil Team
bc6d1d7cd5 Googletest export
Add links to "sampleK_unittest.cc" examples. Fix some broken docs crosslinks.

PiperOrigin-RevId: 261169561
2019-08-01 16:06:11 -04:00
Abseil Team
98791278d9 Googletest export
Fix ON_CALL/EXPECT_CALL example comment

PiperOrigin-RevId: 261150884
2019-08-01 16:05:57 -04:00
misterg
1bf8f8ccfe Googletest export
Internal Change

PiperOrigin-RevId: 260939845
2019-08-01 16:05:33 -04:00
Krystian Kuzniarek
ea9c8fec9d remove an excessive mutable type specifier
MockFunction's private member cannot be reached from outside and all its
non-static member functions are not const.
2019-08-01 11:33:36 +02:00
anttsov
7d1ad216c0 Update README.md
fixed links to docs pages (on googlemock/README.md)
2019-07-31 10:34:36 +03:00
Krystian Kuzniarek
513f16c0e6 update pre-C++11 paragraphs 2019-07-31 08:17:32 +02:00
Gennadiy Civil
66dd85c631 Merge pull request #2356 from kuzkry:typos
PiperOrigin-RevId: 260786935
2019-07-30 18:47:55 -04:00
Gennadiy Civil
44cfdc258c Merge pull request #2355 from kuzkry:markdown-numbering
PiperOrigin-RevId: 260782065
2019-07-30 18:47:37 -04:00
Krystian Kuzniarek
eb3cc9525f fix typos 2019-07-30 12:52:27 +02:00
Krystian Kuzniarek
985d679546 fix numbering of ordered lists in Markdown 2019-07-30 11:16:21 +02:00
anttsov
60ab17a7f0 Update README.md
Links to FAQ, Cheat Sheet, Cookbook, gMock for Dummies
2019-07-30 10:17:22 +03:00
Abseil Team
4425841d07 Googletest export
Fix broken link.

PiperOrigin-RevId: 260548004
2019-07-29 15:36:36 -04:00
Gennadiy Civil
fe9fb64edf Merge pull request #2331 from adambadura:CMakeCorrection
PiperOrigin-RevId: 260509310
2019-07-29 11:58:34 -04:00
Gennadiy Civil
23bc2840d1 Manual docs tweaks still in preparation for including docs with code pushes 2019-07-29 10:53:47 -04:00
Adam Badura
887fc637b3 Correct CMake to cover Cygwin 2019-07-27 22:25:32 +02:00
Abseil Team
7cda8d257c Googletest export
Add copyright.

PiperOrigin-RevId: 259997211
2019-07-25 20:53:34 -04:00
Gennadiy Civil
5bba3d0bcb Manual docs tweaks still in preparation for including docs with code pushes 2019-07-18 11:39:49 -04:00
Gennadiy Civil
fc221272f6 Manual docs tweaks still in preparation for including docs with code pushes 2019-07-18 11:34:17 -04:00
Gennadiy Civil
eda3b4844f remove outdated 2019-07-17 16:45:00 -04:00
Gennadiy Civil
972d6bdae0 remove outdated 2019-07-17 16:43:18 -04:00
Gennadiy Civil
d3b40c4766 Merge branch 'master' of github.com:google/googletest 2019-07-17 15:36:04 -04:00
Gennadiy Civil
4ceafcdf32 Preparation for including docs in round-trip with OSS, Manual merge, review and merge docs internal-OSS 2019-07-17 15:35:48 -04:00
Abseil Team
221c5b6bae Googletest export
Internal change

PiperOrigin-RevId: 258587862
2019-07-17 13:38:25 -04:00
Adam Badura
6b3e1c7ae6 Add missing <functional> include
gmock-spec-builders.h uses std::function (in MockFunction) but did
not include <functional> to provide it. Apparently, it worked since
the header must have been included by something else but better be
safe than sorry.
2019-07-16 23:15:51 +02:00
Gennadiy Civil
87d1ebabfd Preparation for including docs in round-trip with OSS. Manual review and merge docs internal-OSS 2019-07-16 14:38:15 -04:00
misterg
03c5c79c5d Googletest export
Fix documentation links

PiperOrigin-RevId: 258389329
2019-07-16 13:35:16 -04:00
Abseil Team
5782c5f2bc Googletest export
Update a broken link in a comment.

PiperOrigin-RevId: 257493975
2019-07-16 11:21:11 -04:00
Gennadiy Civil
35209bed98 Preparation for including docs in round-trip with OSS 2019-07-15 16:01:38 -04:00
Gennadiy Civil
d189cbf763 Preparation for including docs in round-trip with OSS 2019-07-15 16:01:12 -04:00
Gennadiy Civil
20bfe52b81 Preparation for including docs in round-trip with OSS 2019-07-15 15:58:44 -04:00
Gennadiy Civil
096fe81b7d Preparation for including docs in round-trip with OSS 2019-07-15 15:42:09 -04:00
Gennadiy Civil
8da25f6b23 Merge pull request #2326 from kuzkry/missing-references-to-documentation
Add missing references to documentation
2019-07-15 13:29:29 -04:00
Krystian Kuzniarek
a2f69f2451 add missing references to DesignDoc and KnownIssues 2019-07-13 09:16:52 +02:00
Krystian Kuzniarek
ab4820cee9 rename and apply snake_case on KnownIssues.md 2019-07-13 08:16:41 +02:00
Krystian Kuzniarek
bf52987797 rename and apply snake_case on FrequentlyAskedQuestions.md 2019-07-13 08:15:20 +02:00
Krystian Kuzniarek
91108689ea rename and apply snake_case on ForDummies.md 2019-07-13 08:09:11 +02:00
Krystian Kuzniarek
ce694aba1e rename and apply snake_case on Documentation.md 2019-07-13 08:09:11 +02:00
Krystian Kuzniarek
1af1da703d rename and apply snake_case on DesignDoc.md 2019-07-13 07:59:14 +02:00
Krystian Kuzniarek
8059f87995 rename and apply snake_case on CheatSheet.md 2019-07-13 07:47:14 +02:00
Sam Sobell
6078317fb4 Fix bad advice in cook book (#2308)
This line directly contradicts the warning that google mock spits out on unused mock calls:
```
NOTE: You can safely ignore the above warning unless this call should not happen.  Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call.  See https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md#knowing-when-to-expect for details.
```
One or the other should be changed, and I believe the advice in this file is incorrect.
2019-07-10 10:37:57 -04:00
Gennadiy Civil
6551f39b40 missed the actual file in previous commit 2019-06-19 16:50:19 -04:00
Gennadiy Civil
88035b6b0d Renaming doc files to make the file names more palatable and in preparation for including documentation in sync process 2019-06-19 16:48:38 -04:00
Gennadiy Civil
9ab1bd60d0 small docs restucture and cleanup 2019-06-19 16:20:19 -04:00
misterg
6edb8fd678 Googletest export
gmock_output_test has to run under python2. Bazel 0.27.0 causes this test to break. Fixing it.

PiperOrigin-RevId: 253820111
2019-06-18 13:48:06 -04:00
Abseil Team
91ff024747 Googletest export
Project import generated by Copybara.

PiperOrigin-RevId: 253600369
2019-06-17 16:34:31 -04:00
misterg
c02785d4e8 Googletest export
Internal Change

PiperOrigin-RevId: 253581166
2019-06-17 16:34:23 -04:00
Gennadiy Civil
92651583e3 Merge pull request #2286 from gennadiycivil/master
Removing make and automake.
2019-06-17 11:05:13 -04:00
Gennadiy Civil
98a8abc7f3 googlemock/docs/CookBook.md small doc test 2019-06-14 11:12:17 -04:00
Gennadiy Civil
02f2334781 Merge branch 'master' of https://github.com/google/googletest 2019-06-14 09:38:34 -04:00
Gennadiy Civil
4cbcc6bf0d Makefiles are no longer supported. Adding pseudo-break with their impending removal to make sure that people who are interested will notice 2019-06-13 17:16:43 -04:00
Gennadiy Civil
0ac48048a6 Also remove googlemock/scripts/gmock-config.in 2019-06-13 16:37:17 -04:00
Gennadiy Civil
ac29dc094e Removing make and automake. The only supported build systems are Bazel internally and CMake community supported 2019-06-13 13:49:42 -04:00
Tom Lachecki
44932066d3 Fixed issue #2284 (Incompatibility with C++17) 2019-06-13 17:37:33 +01:00
Gennadiy Civil
4965d8f39c removing obsolete language from docs, CMake and Bazel is the only supporeted build methods 2019-06-10 10:51:41 -04:00
Gennadiy Civil
07b88a2212 removing gmock msvc solution, as CMake and Bazel is the only supporeted build methods 2019-06-10 10:35:30 -04:00
Gennadiy Civil
d8e367489e removing build-aux files , as CMake and Bazel is the only supporeted build methods 2019-06-10 10:34:33 -04:00
Gennadiy Civil
fd4e710c04 Merge pull request #2274 from goudan-er/master
fix typo
2019-06-07 13:08:03 -04:00
Wenyuan Yan
29eec11805 fix typo 2019-06-06 11:47:40 +08:00
Peter Levine
475c80567d Don't allow signed/unsigned wchar_t in gcc 9 and later 2019-06-04 01:07:18 -04:00
Enji Cooper
fbc3bf9960 Fix typo introduced in 63be3dcc24 (maintaners -> maintainers)
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
2019-05-19 23:31:04 -07:00
Abseil Team
a3ef005fe9 Googletest export
Remove special case for protocol buffers. It is no longer needed.

PiperOrigin-RevId: 246550795
2019-05-03 15:11:37 -04:00
misterg
b21884f567 Googletest export
Clarify build system support - CMake and automake community supported

PiperOrigin-RevId: 245821927
2019-05-03 15:11:22 -04:00
Abseil Team
710ff86592 Googletest export
Remove GMock Doctor.
It has not been actively supported for a while.
We also now have better techniques to improve compiler errors where needed
instead of requiring a separate tool to diagnose them.

PiperOrigin-RevId: 244196068
2019-04-18 15:45:56 -04:00
misterg
ce3a168419 Googletest export
Expose more information in SuiteApiResolver diagnostic output

PiperOrigin-RevId: 244179347
2019-04-18 15:45:49 -04:00
Gennadiy Civil
7e27fc4c95 Merge pull request #2170 from ngie-eign:issue-2146-ver2
PiperOrigin-RevId: 244069956
2019-04-18 09:44:24 -04:00
David Benjamin
7cfddeea9c MSVC C5046 warning is unavailable in MSVC 2015.
Per the MSVC documentation the warning is new as of Visual Studio 2017,
version 15.8.
https://docs.microsoft.com/en-us/cpp/error-messages/compiler-warnings/c5046?view=vs-2019

GTest users building on MSVC 2015 or older versions of 2017 will, when
C4616 is enabled, see a warning like:

[...]gtest-matchers.h(53): error C2220: warning treated as error - no 'object' file generated
[...]gtest-matchers.h(53): warning C4619: #pragma warning: there is no warning number '5046'

Guard the mention of 5046 by an _MSC_VER check. VS2017 15.8 corresponds
to an _MSC_VER of 1915.
https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2019
2019-04-09 18:13:32 -05:00
Ivaylo Kirov
5b7cc8aca9 Update ForDummies.md 2019-04-06 22:06:17 -04:00
Enji Cooper
36018b429c clang: fix -Wsign-conversion errors
Cast some values as their unsigned equivalents or `size_t` to match the
parameter type used for the template object under test. Also, provide
UInt32 equivalent delegate methods for some callers (with
int-equivalents for backwards compatibility).

This closes #2146.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
2019-04-05 21:30:19 -07:00
Gennadiy Civil
e9ad026098 Merge pull request #2163 from ngie-eign:cmake-fix-gtest-binary-prefixing-when-gmock-enabled
PiperOrigin-RevId: 241376090
2019-04-01 15:27:49 -04:00
Abseil Team
4d7c867857 Googletest export
Remove support for "global" ::string and ::wstring types.
This support existed for legacy codebases that existed from before namespaces
where a thing. It is no longer necessary.

PiperOrigin-RevId: 241335738
2019-04-01 15:05:10 -04:00
Enji Cooper
e2588aac1a Prefix googletest binaries under its own subtree instead of gtest
Building all test binaries under their respective subtrees makes
building the project via cmake easier to grok without additional hacks.
In particular, when dealing with the conversion I proposed in
https://reviews.freebsd.org/D19430 (switching from autotools to cmake),
I ran into unexpected gtest prefixing under the googlemock directory, as
opposed to the googletest directory. Example:

Before: `googlemock/gtest/googletest-break-on-failure-unittest_`
After:  `googletest/googletest-break-on-failure-unittest_`

The latter form is easier to translate to packaging manifests when
building googlemock is disabled, as well as enabled, as the path remains
consistent when the feature flag is disabled.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
2019-03-29 15:00:05 -07:00
Gennadiy Civil
21a841ade9 Merge pull request #2180 from twam:master
PiperOrigin-RevId: 239404016
2019-03-21 10:43:14 -04:00
Abseil Team
fdfac36c0f Googletest export
Remove mention of unused type ProtocolMessage.

PiperOrigin-RevId: 239242706
2019-03-21 10:43:06 -04:00
Abseil Team
70be25fbf4 Googletest export
Action helpers need to pass by const& so that they can work with unique_ptr.

PiperOrigin-RevId: 239062671
2019-03-21 10:42:58 -04:00
Seth Raymond
87a8e6954d DesignDoc Markdown table was broken
Added a missing newline
2019-03-15 09:27:08 -04:00
Gennadiy Civil
fc48878c5c Merge pull request #2158 from CarloWood:master
PiperOrigin-RevId: 236716851
2019-03-05 08:39:41 -05:00
Abseil Team
a37ca5835f Googletest export
Build gmock cleanly with clang -Wextra-semi and -Wextra-semi-stmt

Extends 56ef07a203 to take -Wc++98-compat-extra-semi
(https://reviews.llvm.org/D43162) and -Wextra-semi-stmt
(https://reviews.llvm.org/D52695) into account.

For https://crbug.com/926235.

PiperOrigin-RevId: 236643095
2019-03-05 08:39:28 -05:00
Abseil Team
d8a7b1e343 Googletest export
Build gmock cleanly with clang -Wextra-semi

For https://crbug.com/926235.
From https://github.com/google/googletest/pull/2139.
Fixes https://github.com/google/googletest/issues/2138.

PiperOrigin-RevId: 235832527
2019-03-01 16:18:17 -05:00
Carlo Wood
9477068853 Minor build system fixes. 2019-03-01 08:11:56 +01:00
Gennadiy Civil
0c7c6d974e Merge pull request #2125 from ngie-eign:clang-unused-parameter
PiperOrigin-RevId: 234844287
2019-02-20 15:22:35 -05:00
Gennadiy Civil
a6d38fe0e7 Merge pull request #2123 from ngie-eign:clang-inconsistent-missing-override
PiperOrigin-RevId: 234840107
2019-02-20 15:22:28 -05:00
misterg
7ba0fd9521 Googletest export
Internal Change

PiperOrigin-RevId: 234823465
2019-02-20 13:35:36 -05:00
Enji Cooper
5b2a6117d8 Fix clang -Wunused-parameter warnings
Comment out unused method parameters in their relevant definitions.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
2019-02-13 14:38:51 -08:00
Enji Cooper
ba9ae08f6e Fix clang -Winconsistent-missing-override warnings
`DescribeTo(..)` and `MatchAndExplain(..)` in `gmock-matchers_test` both
override virtual methods. Remove the `virtual` keyword and apply `override` to
them instead.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
2019-02-13 14:38:51 -08:00
Enji Cooper
4b1fd60ded Fix clang -Winconsistent-missing-override warnings
`DescribeTo(..)` and `MatchAndExplain(..)` in `gmock-matchers_test` both
override virtual methods. Remove the `virtual` keyword and apply `override` to
them instead.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
2019-02-13 14:38:50 -08:00
Enji Cooper
784a918f66 Fix -Wunused-private-field issues with clang
Provide dummy accessors for private values that are set in initializers,
but not actually used.

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
2019-02-12 16:40:01 -08:00
misterg
a4c9af804f Googletest export
Internal Change

PiperOrigin-RevId: 233614147
2019-02-12 13:20:40 -05:00
Abseil Team
06fe4fc0b0 Googletest export
Fix matcher comparisons for std::reference_wrapper.

The googletest docs indicate that std::reference_wrapper should be used to for
objects that should not be copied by the matcher (in fact, the ByRef() function
is basically the same as a call to std::cref).

However, for many types (such as std::string), the overloaded operator== will
not resolve correctly. Specifically, this is problematic if operator== depends
on template argument deduction, where the same type is named on LHS and RHS.

Because template argument deduction happens before any implict conversions for
purposes of overload resolution, attempting to compare T with
std::reference_wrapper<T> simply looks like a comparison of unlike types.

For exapmle, std::reference_wrapper<std::string> is implicitly convertible to
'const std::string&', which would be able to choose an overload specialization
of operator==. However, the implicit conversion can only happen after template
argument deduction for operator==, so a specialization that would other be an
applicable overload is never considered.

Note also that this change only affects matchers. There are good reasons that
matchers may need to transparently hold a std::reference_wrapper. Other
comparisons (like EXPECT_EQ, et. al.) don't need to capture a reference: they
don't need to defer evaluation (as in googlemock), and they don't need to avoid
copies (as the call chain of matchers does).

PiperOrigin-RevId: 232499175
2019-02-12 13:20:14 -05:00
Abseil Team
464761ffb0 Googletest export
Internal change

PiperOrigin-RevId: 232362580
2019-02-12 13:20:05 -05:00
misterg
0ff4c74a41 Googletest export
Mark legacy _TEST_CASE_ macros as deprecated

PiperOrigin-RevId: 232303251
2019-02-04 14:19:50 -05:00
Abseil Team
e66e0715cf Googletest export
Fix stack overflow in AnyOfArray tests.

PiperOrigin-RevId: 231881125
2019-02-01 12:52:31 -05:00
Adam Cozzette
b69cb84b9a Fixed "make dist"
I made a few updates to the Makefile.am files so that "make dist"
succeeds and produces a usable tarball. We need this for protobuf
because the protobuf tarballs include a bundled copy of googletest.
2019-01-24 14:51:40 -08:00
Gennadiy Civil
961e2e91d2 Merge pull request #2041 from ciband:chore/fix_library_json
PiperOrigin-RevId: 230554814
2019-01-23 13:27:16 -05:00
Abseil Team
9fece7d47b Googletest export
Add AllOfArray matcher that verifies a value matches all member of some array/container/list/set/..., e.g:
EXPECT_THAT(1, AnyOfArray({1, 2, 3}))
In the simplest form this is identical to AnyOf(1, 2, 3). But unlike that one it works on containers.

Add AnyOfArray matcher that verifies a value matches any member of some
array/container/list/set/...

PiperOrigin-RevId: 230403653
2019-01-23 13:27:08 -05:00
Abseil Team
2770958199 Googletest export
Make internal FunctionMocker class final

PiperOrigin-RevId: 230332778
2019-01-22 13:12:13 -05:00