Commit Graph

588 Commits

Author SHA1 Message Date
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 #775 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. #714 2016-02-16 17:53:43 -08:00
Billy Donahue
a50a6e2921 Merge pull request #657 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 #650 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 #592 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 #612 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