Commit Graph

567 Commits

Author SHA1 Message Date
Gennadiy Civil
d2cf069fe2 Merge branch 'master' into vs-projects-fix 2017-08-22 22:38:22 -04:00
Arkady Shapkin
40e2b2f67d Support x64 configuration for old VS2010 projects
VS2010 solution only to simplify old users (who used these solutions) upgrading to new gtest/gmock, new users should use CMake generated solutions. VS2010 solution can be opened in any new VS.
2017-08-23 01:45:44 +03:00
Roman Perepelitsa
75a9eed0f5 Support ref-qualified member functions in Property(). 2017-08-22 16:06:26 +02:00
Gennadiy Civil
1f4def5cde Merge branch 'master' into wrong-version-reported 2017-08-21 13:11:58 -04:00
Maurice Gilden
fad8a6b4f5 Remove unused variable 2017-08-21 10:10:14 +02:00
Gennadiy Civil
9fdd6ccd92 Added "explicit" as per compiler suggestion 2017-08-20 15:20:13 -04:00
Gennadiy Civil
e5095758ba Proposing these changes, please review
Slightly better names and cleaner tests.
Please review
2017-08-20 15:15:31 -04:00
Maurice Gilden
29e05dea1d Change tabs to spaces in test case 2017-08-18 15:27:02 +02:00
Maurice Gilden
4d864c5e7d Switch return type to class without default constructor 2017-08-18 12:28:50 +02:00
Maurice Gilden
e9a2da4cf8 Fix test if exceptions are not supported 2017-08-18 11:46:15 +02:00
Maurice Gilden
fe1b2563ab adds test for NiceMock with unknown return value 2017-08-18 11:21:28 +02:00
Josh Bodily
60c30c6bd5 Merge branch 'master' into josh/fix_scoped_class2 2017-08-16 10:56:43 -06: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
David Seifert
a3ab075319 Add support for pkgconfig 2017-08-14 13:45:56 +02:00
Gennadiy Civil
028a1dbab1 Merge pull request from bartshappee/patch-1
Fix small typo in Cookbook: SeArrayArgument
2017-08-11 10:33:36 -04:00
Gennadiy Civil
17af07aed9 Merge pull request from mwoehlke-kitware/honor-lib_suffix
Fix library install destinations
2017-08-11 09:14:49 -04:00
Gennadiy Civil
515e38398f Merge pull request from sglass68/sim
Fix a few documentation nits in the mock dummies guide
2017-08-10 21:25:06 -04:00
Gennadiy Civil
6c8b263997 Merge pull request from aninf-wo/hethi/remove-old-docs
remove documentation of former versions - it's available in the commit history
2017-08-10 21:19:03 -04:00
Gennadiy Civil
664a703c70 Merge pull request from eduherminio/master
Minor style fixes
2017-08-10 20:36:29 -04:00
Gennadiy Civil
26a5d30ac0 Merge pull request from gennadiycivil/master
Adding Bazel build to googletest (initial version )
2017-08-10 20:35:27 -04:00
Herbert Thielen
89bd69dff5 say "former version" instead of "released version" 2017-08-10 20:21:46 +02:00
Josh Bodily
8d77932ce1 Fix scoped enum not working in gmock-gen.py 2017-08-10 10:58:57 -06:00
Eduardo Caceres
fccdf51ece Minor style fixes
Typos, punctuation & broken links
2017-08-10 18:05:32 +02:00
misterg
4d386daead Added Copyright 2017-08-10 12:03:27 -04:00
misterg
a7b338585e Initial Revision, review 164634031 2017-08-10 11:54:46 -04:00
Alyssa Wilk
10232c3adb Adding a flag option to change the default mock type 2017-08-10 09:41:09 -04:00
Matthew Woehlke
92b6ea3c94 Fix library install destinations
Modify library install destinations to install .dll's to the correct
location (`bin`, not `lib`), and to install other artifacts to the
correct platform-dependent location by using GNUInstallDirs. This is
required for some distributions (e.g. Fedora) and will fix an issue that
otherwise requires those distributions to patch the upstream sources.
Also, add options to suppress installation, which may be useful for
projects that embed Google Test.

Since Google Test is trying to support archaic versions of CMake, a
brain-dead fallback (which requires that the user set either LIB_SUFFIX
or CMAKE_INSTALL_LIBDIR themselves) is included for versions that
predate GNUInstallDirs.

Fixes .

Co-Authored-By: d3x0r <d3x0r@users.noreply.github.com>
2017-08-09 15:29:36 -04:00
misterg
45b059daae WIP 2017-08-09 14:37:58 -04:00
misterg
66a9ab3d98 Added googlemock tests 2017-08-09 12:18:12 -04:00
misterg
abdad087f6 Added googlemock tests 2017-08-09 12:15:00 -04:00
Herbert Thielen
fc59509590 Merge branch 'master' into hethi/remove-old-docs 2017-08-09 11:03:27 +02:00
Gennadiy Civil
fdab6ef84e Merge pull request from chromy/upstream-141765019
Fix typo in gmock-actions.h
2017-08-08 16:17:52 -04:00
Gennadiy Civil
124944bfe4 Merge pull request from chromy/upstream-146491438
Fixed misspelling in assertion message.
2017-08-08 16:15:57 -04:00
Shlomi Fish
77dfa1e00f Correct some typos in a comment 2017-08-04 10:39:35 +03:00
Gennadiy Civil
c3b2c4bc44 Merge pull request from danilcha/patch-1
Added description of how to silence clang pedantic warnings in Google Mock includes
2017-08-02 22:13:30 -04:00
Gennadiy Civil
d24899d1d3 Merge pull request from marzojr/patch-1
Clarifying documentation language
2017-08-02 17:09:05 -04:00
Gennadiy Civil
b3226d86bc Merge pull request from flyd1005/wip-fix-typo
remove duplicated words
2017-08-02 17:04:33 -04:00
Gennadiy Civil
73883c5b05 Merge pull request from dawikur/patch-1
Replace html entities with their equivalents
2017-08-02 16:47:31 -04:00
Gennadiy Civil
11db38986e Merge pull request from krizalys/fix-typo
Fixed typo
2017-07-31 16:55:33 -04:00
Christophe Vidal
76f3a0b4fe Fixed typo 2017-07-31 22:02:19 +07:00
Herbert Thielen
a659ce57f6 fix links to Google C++ Style Guide 2017-07-30 17:05:48 +02:00
Herbert Thielen
c1fbf2063e remove doc of former versions
The documentation of former versions is available in the history (e.g.
by checking out the appropriate git tags), so there is no need to keep
them in parallel to the current documentation.
2017-07-30 16:34:25 +02:00
Herbert Thielen
aec67718d9 remove obsolete reference to SVN trunk and fix link to pump manual 2017-07-30 16:33:08 +02:00
Gennadiy Civil
7d602f7ea7 Merge pull request from coryan/master
Fix table formatting.
2017-07-26 16:52:02 -04:00
Jose Nino
faa7dfd449 docs: fix broken link 2017-07-26 10:58:05 -07:00
Carlos O'Ryan
22cc7b5bc0 More tables that did not render correctly. 2017-07-01 22:34:51 -04:00
Carlos O'Ryan
a01a3117e9 Remove silly claim that C++ lacks lambdas.
The document itself uses lambdas later, all the scaffolding to
work around lack of lambdas should be considered for removal, but
that is much larger an effort than I can commit to.
2017-07-01 15:30:55 -04:00
Carlos O'Ryan
1a04a39892 Same fixes for "current" version. 2017-07-01 15:27:07 -04:00
Carlos O'Ryan
5d9ffdd40c Fix typos too s/destoyed/destroyed/ 2017-07-01 15:26:42 -04:00
Carlos O'Ryan
a6fcdfbbc1 Fix table formatting.
The markdown was not working for a small table, fixed.
2017-07-01 09:51:45 -04:00
Jose Nino
15d9b4a459 docs: fix broken link from dummies guide to cook book 2017-06-19 14:27:39 -07:00
Hector Dearman
3a027b074a Fix typo in gmock-actions.h
This upstreams a Google-internal change (141765019).
2017-06-19 18:43:55 +01:00
Hector Dearman
e7cfb0940a Fixed misspelling in assertion message.
This upstreams a Google-internal change (146491438).
2017-06-19 18:27:33 +01: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
danilcha
d98857c634 Again rewrote everything 2017-03-12 18:11:22 +01:00
danilcha
d36aeb6195 Added explicit gtest library dependency 2017-03-12 17:47:14 +01:00
danilcha
b6bdad37de Update README.md 2017-03-11 01:06:58 +01:00
danilcha
3d7d863798 Update README.md 2017-03-11 01:02:21 +01:00
Billy Donahue
dc024dff2a Remove /tree/ from Readme.md links.
Issue 
2017-02-25 20:46:21 -05:00
Olivier Clavel
40531016b8 googlemock version must be changed as well
keep googletest and googlemock versions in sync
2017-02-13 22:15:22 +01:00
Dawid Kurek
c16ad8ce5d Replace html entities with their equivalents 2017-02-06 13:31:11 +01:00
Sam Roth
b8cfea1b58 Merge pull request from google/master
Syncing my branch
2017-01-23 13:49:32 -05:00
Billy Donahue
17a1f78f86 Merge pull request from audiofanatic/ExternalProject_at_configure_time
Added docs for ExternalProject download during CMake step
2016-12-18 11:59:12 -05:00
Craig Scott
5fc61b8c25 2.6.4 is the minimum CMake version, so enforce it () 2016-12-17 19:15:04 -05:00
Craig Scott
a0a7489cd4 Added CMake configure-time download instructions to docs
Adds instructions for how to add gtest and gmock to
another CMake project directly. Downloading of the
googletest sources happens as configure time, allowing
it to be added to the main build directly via the
add_subdirectory() command. This ensures googletest is
built with the same compiler settings, etc. and will
typically result in a more robust and more convenient
build arrangement.
2016-12-18 09:01:27 +11:00
Simon Glass
7dd052bd8f Fix a few documentation nits in the mock dummies guide
Add a hyphen to 'ad hoc' and change 'distance' to plural.
2016-12-08 10:57:46 -05:00
bartshappee
bed9a44281 Fix small typo SeArrayArgument
SeArrayArgument => SetArrayArgument
2016-11-07 13:33:22 -05:00
Gallaecio
5b0fee3f65 Fix WhenSorted() documentation example 2016-10-08 22:17:31 +02:00
Marco Molteni
b3f7f89f40 Cookbok: fix broken relative link 2016-09-13 20:53:41 +02:00
Samuel Roth
788443fd63 Fixed broken links 2016-09-12 12:34:50 -04:00
Samuel Roth
416ec6c6a3 blob vs tree 2016-09-12 12:33:44 -04:00
Samuel Roth
b4b16c92a4 Fixing relative links 2016-09-12 12:31:50 -04:00
Samuel Roth
9c3be37cc6 Fixing KnownIssues and FrequentlyAskedQuestions links 2016-09-12 12:27:36 -04:00
Samuel Roth
682cd77fe1 Broken relative links fixed 2016-09-12 12:24:08 -04:00
Samuel Roth
12e027bd4b Fixing ForDummies link 2016-09-12 12:19:26 -04:00
Samuel Roth
d33171dba7 One works 2016-09-12 12:15:49 -04:00
Samuel Roth
5b59ec63a9 Relative links 2016-09-12 12:14:53 -04:00
Samuel Roth
4701a32c6a Fixing relative links 2016-09-12 12:14:00 -04:00
Marzo Sette Torres Junior
9907f86068 Clarifying language
The old language might mislead someone into thinking that the access level on the base class itself was changed.
2016-09-02 14:39:48 -03:00
mazong1123
a51867e59b Reformatted the Unprintable operator== code style. 2016-07-14 16:49:42 +08:00
mazong1123
0b7987a646 Fixed issue 2016-07-14 14:09:05 +08:00
mazong1123
3a8bc32b84 Added VS 2015 project support. 2016-05-15 21:46:38 +08:00
mazong1123
af72674db0 Updated the value of GTEST_DIR to reflect the googletest dir. 2016-05-15 21:32:56 +08:00
mazong1123
45ee7b0c46 Changed the GTestDir marco value to reflect the new dir of googletest. 2016-05-15 20:48:08 +08:00
Li Peng
e5302cfca4 remove duplicated words
Signed-off-by: Li Peng <lip@dtdream.com>
2016-04-27 16:41:27 +08:00
Paul Hadfield
8c79120e0e Fix typo (Inovke -> Invoke) 2016-03-08 13:40:26 +00:00
Paul Wilkinson
55a7cefa4f Fix formatting in AdvancedGuide.md
Put occurrences of "#include" in a code span so they are not interpreted
as headers.

Other documents were not broken because the #include was not at the
start of the line, but put them in code spans anyway just in case the
text gets refilled in the future.
2016-02-21 15:52:09 +00:00
Jacob Meacham
df092f4fc7 Fix link that's returned when running tests. 2016-02-16 17:53:43 -08:00
Billy Donahue
a50a6e2921 Merge pull request from audiofanatic/issue655-targetHeaderDeps
Add include dirs to targets if CMake version supports it
2015-12-10 17:28:00 -05:00
Billy Donahue
40b882e16f Merge pull request from jpuigcerver/master
Added missing CMake install rules for GMock
2015-12-10 17:25:53 -05:00
Paul Rosset
13deb0898d fixed link in googlemock documentation 2015-12-08 16:02:50 +01:00
Craig Scott
ad1023eb63 Add include dirs to targets if CMake version supports it 2015-12-06 16:31:21 +11:00
Joan Puigcerver
dd058df9e2 Added CMake install rules for GMock 2015-12-03 09:33:21 +01:00
Billy Donahue
4a6c17a6be Merge pull request from Ferenc-/master
Fix typo in googlemock/README.md
2015-11-30 13:49:47 -05:00
Mark Mentovai
70575ad880 Name the helper AsBits() 2015-11-12 10:01:06 -05:00
Mark Mentovai
bd16961ed4 Use a templated helper to wrap the cast
The helper needs to be templated because its argument type can’t be
known. FloatingPointTest is instantiated with RawType = float and
RawType = double, so Bits will be an unsigned 32-bit or 64-bit type.
size_t will be either 32 or 64 bits depending on the system’s
definition, typically based on pointer size.
2015-11-11 18:26:35 -05:00
Mark Mentovai
5f7b814f55 Leave decltype(max_ulps_) alone and cast, not sure this is better 2015-11-11 17:44:12 -05:00
Mark Mentovai
05dc6c673e Fix warnings encountered in MSVC build of gtest/gmock tests
This fixes these warnings:

…\gtest\googletest\test\gtest-port_test.cc(78) : error C2220: warning treated as error - no 'object' file generated
…\gtest\googletest\test\gtest-port_test.cc(78) : warning C4309: 'static_cast' : truncation of constant value
…\gtest\googletest\test\gtest-port_test.cc(79) : warning C4309: 'static_cast' : truncation of constant value

…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : error C2220: warning treated as error - no 'object' file generated
        …\gtest\googlemock\test\gmock-matchers_test.cc(2706) : while compiling class template member function 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)'
        …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to function template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>::FloatingPointTest(void)' being compiled
        …\gtest\googlemock\test\gmock-matchers_test.cc(2896) : see reference to class template instantiation 'testing::gmock_matchers_test::FloatingPointTest<float>' being compiled
…\gtest\googlemock\test\gmock-matchers_test.cc(2712) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2714) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2716) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2717) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2718) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2721) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
…\gtest\googlemock\test\gmock-matchers_test.cc(2723) : warning C4267: 'argument' : conversion from 'size_t' to 'const unsigned int', possible loss of data
2015-11-11 12:28:15 -05:00
Billy Donahue
bd47133508 Merge pull request from mark-chromium/gmock_rtti
googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
2015-11-10 17:48:26 -05:00
Mark Mentovai
ac93c04c26 googlemock: Disable WhenDynamicCastToTest tests when RTTI is off
https://github.com/google/googletest/issues/610
2015-10-12 18:01:43 -04:00
Mark Mentovai
9515d11657 googlemock: Support C++11 language with pre-C++11 library
This guards use of <type_traits> and its features with
GTEST_HAS_STD_TYPE_TRAITS_, and std::function with
GTEST_HAS_STD_FUNCTION_.
2015-10-12 17:59:11 -04:00
Marco Molteni
47cae96538 Fix broken link to FrequentlyAskedQuestions 2015-09-23 21:08:21 +02:00
Martin Maly
4d49c718f8 Adding missing files to googlemock distribution. 2015-09-19 23:10:58 -07:00
Ferenc-
b1c02a9de4 Fix typo in googlemock/README.md 2015-09-19 00:10:55 +02:00
Billy Donahue
13ca89d4dd Fix relative links in googlemock docs. 2015-09-17 18:22:40 -04:00
Simon Newton
4e4867c99c Fix the googlemock autotools build. 2015-09-17 08:33:43 -07:00
Billy Donahue
b78f858d0c Include <memory> to use std::unique_ptr. 2015-09-08 02:46:25 -04:00
Billy Donahue
f19b060075 Googlemock has some tuples containing lvalue refs in its unit tests.
These tuples are created with make_tuple, which is given temporaries.
The make_tuple is in a function argument list.

A possibly overzealous static_assert in libc++'s std::tuple ctor
is firing in our 'Perform(make_tuple("hi"))' calls, so
we can't use its make_tuple here. Instead we will use
explicitly-constructed tuples constructed from non-temporary strings.

Workaround for llvm bug:
    https://llvm.org/bugs/show_bug.cgi?id=20855

An alternative to https://github.com/google/googletest/pull/580 .
2015-09-07 22:32:56 -04:00
Billy Donahue
2eb7748e70 merge 2015-08-30 12:40:37 -04:00
Billy Donahue
23bd6d8a9b readme merging 2015-08-30 12:36:37 -04:00
Syl
ac830d6b19 Fix gmock_doctor.py for Python3 2015-08-30 09:06:14 +02:00
Arnaud Lacombe
eff38a7a0f googlemock: fix unified build 2015-08-26 21:50:38 -07:00
Billy Donahue
3f4e79b999 readme merging 2015-08-26 21:45:10 -04:00
Billy Donahue
37b5c297cf readme merging 2015-08-26 18:28:20 -04:00
Billy Donahue
67f6188c8f move ProjectHome files into root 2015-08-25 17:55:28 -04:00
Billy Donahue
affb09edf0 move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00