Commit Graph

48 Commits

Author SHA1 Message Date
Abseil Team
63ad9ec911 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218618184
2018-10-26 14:19:59 -04:00
misterg
55c37984f7 Googletest export
Remove linked_ptr and use std::shared_ptr instead

PiperOrigin-RevId: 218571466
2018-10-26 14:19:51 -04:00
Jonathan Wendeborn
bba91d6669 Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice 2018-10-16 08:38:34 +02:00
BrukerJWD
55d2fbfe0d Merge branch 'master' into isnice 2018-10-16 08:37:56 +02:00
Jonathan Wendeborn
a69718965a Use existing Mock::GetReactionOnUninterestingCalls() 2018-10-16 08:37:45 +02:00
Jonathan Wendeborn
ad519f83db Don't fully qualify enum member 2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
7014070b27 Added Mock::IsNaggy, IsNice, and IsStrict 2018-10-16 08:07:15 +02:00
Abseil Team
7a6bc673ea Apply clang-tidy modernize-use-nullptr to googletest.
Now that googletest has moved to C++11, it should no longer
use NULL or 0 for the null pointer. This patch converts all
such usages to nullptr using clang-tidy.

This prevents LLVM from issuing -Wzero-as-null-pointer-constant
warnings.

PiperOrigin-RevId: 215814400
2018-10-05 12:54:14 -04:00
Gennadiy Civil
ea90e723e0 more comments changes 2018-08-14 16:05:55 -04:00
Gennadiy Civil
d2e8f7c999 more comments changes 2018-08-14 15:45:00 -04:00
Gennadiy Civil
bdc777e251 Comments changes, no functionality changes 2018-08-14 14:04:07 -04:00
Gennadiy Civil
c59e574e3f Formatting changes,small cleanup, no functionality changes 2018-08-07 11:49:47 -04:00
Piotr Kąkol
65e7d50e3e Updated broken and outdated URLs 2018-07-25 19:19:26 +02:00
David Sunderland
c24086c099 Mark new GetWithoutMatchers method as part of the exported API, to address MSVC linker errors. 2018-04-18 20:25:31 -04:00
David Sunderland
71dcdcc07c Don't use generalized initializer list; is C++11 extension. 2018-04-18 19:37:33 -04:00
David Sunderland
cf7b25961a Clone of unsubmitted cr/176529515. Introduce parameterless expectations. 2018-04-18 19:28:56 -04:00
Gennadiy Civil
c26192aada ...merging 2018-04-11 15:46:57 -04:00
Gennadiy Civil
6ed2d51c44 merging 2018-04-10 16:18:23 -04:00
Gennadiy Civil
346f1f5734 merge 2018-04-10 16:10:34 -04:00
Gennadiy Civil
ec1df5b40f RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR 2018-04-10 15:57:16 -04:00
Gennadiy Civil
3f59eb6a59 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil
d1a6cb501e formatting 2018-04-09 15:50:19 -04:00
Gennadiy Civil
2852279601 more msvc 2018-04-09 12:03:40 -04:00
Gennadiy Civil
7ca71c7766 msvc 14 2018-04-09 11:48:02 -04:00
Gennadiy Civil
fc7005cb01 And also silence for MSVS14 2018-04-09 10:51:15 -04:00
Gennadiy Civil
a958171f8a preproc syntax ( I can never remember it) 2018-04-09 10:25:59 -04:00
Gennadiy Civil
566ef95d7b syntax 2018-04-09 10:08:12 -04:00
Gennadiy Civil
c0608ebfd9 cont. 2018-04-09 09:59:09 -04:00
Gennadiy Civil
a694e474a3 continued 2018-04-09 09:51:02 -04:00
Gennadiy Civil
5544bd6303 more mcvs fixing 2018-04-06 16:55:46 -04:00
Gennadiy Civil
fafa60ab77 fixing MSVC 2018-04-06 16:31:11 -04:00
Gennadiy Civil
f906f8446e Merging gMock, 2 2018-04-05 16:09:17 -04:00
Gennadiy Civil
bd0ae14317 merging gmock matchers 1 2018-04-04 14:05:00 -04:00
Gennadiy Civil
7b1726ef5c merging, gmock -1 2018-03-22 15:35:37 -04:00
Gennadiy Civil
ffd5d36f59 merges-2 2018-03-05 13:28:13 -05:00
Gennadiy Civil
bcc0a1afa1 gmock merging -2 2018-02-27 13:51:09 -05:00
Gennadiy Civil
d40efb1166 moving JoinAsTuple to internal 2018-02-12 16:42:12 -05:00
David Benjamin
57561c06f0 Pass the -Wmissing-declarations warning.
This makes it easier to use GTest in projects that build with the
-Wmissing-declarations warning. This fixes the warning in headers and
source files, though not GTest's own tests as it is rather noisy there.
2018-01-03 14:50:22 -05:00
Jonathan Wakely
c61e22b1fe Use gender-neutral pronouns in comments and docs 2017-09-27 13:31:13 +01:00
Alyssa Wilk
6a0c4aab6d Merge branch 'refs/heads/master' into flag-default 2017-08-28 16:10:12 -04:00
Alyssa Wilk
6a4d19119e Handling invalid flag values 2017-08-16 12:43:26 -04:00
Maurice Gilden
a63b714c18 Add function name to exception if there's no default action 2017-08-16 17:53:16 +02:00
Alyssa Wilk
10232c3adb Adding a flag option to change the default mock type 2017-08-10 09:41:09 -04:00
Gennadiy Civil
b3226d86bc Merge pull request #764 from flyd1005/wip-fix-typo
remove duplicated words
2017-08-02 17:04:33 -04:00
Nico Weber
3ec8d72fc1 Use std::string and ::string explicitly in gtest and gmock code.
This merges a Google-internal change (117235625).

Original CL description:
This CL was created manually in about an hour with sed, a Python script
to find all the places unqualified 'string' was mentioned, and some help
from Emacs to add the "std::" qualifications, plus a few manual tweaks.
2017-05-15 17:53:04 -04:00
Li Peng
e5302cfca4 remove duplicated words
Signed-off-by: Li Peng <lip@dtdream.com>
2016-04-27 16:41:27 +08:00
Jacob Meacham
df092f4fc7 Fix link that's returned when running tests. #714 2016-02-16 17:53:43 -08:00
Billy Donahue
affb09edf0 move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00