a02af2f689
code merge
7 years ago
0c17888bcf
code sync
7 years ago
a9653c401e
Fix gmock not building when -fno-rtti
...
Fixes issue #1554 . This is internal cl/195020996.
7 years ago
b539167cf0
merging,
7 years ago
4707c0ffd4
193353312
7 years ago
dff32aff97
http://cl/193060888
7 years ago
3f88bb1831
test-meerging
7 years ago
ab84d14281
Upstream cl/192179348
7 years ago
e55089ec11
merging gmock matchers 1
7 years ago
6aae206bc2
merging gmock-matchers.h 3
7 years ago
23187058e7
merging gmock-matchers.h 2
7 years ago
8ea10d3878
Upstreaming FloatingEq2Matcher,
7 years ago
b907c26740
Merging gmock-matchers.h -2
7 years ago
466a49ae30
gmock-matchers merging -2
7 years ago
b7c568326c
merging, gmock -1
7 years ago
2bd1750ba7
gmock merging -2
7 years ago
190e2cdd0b
Add matcher for std::variant.
7 years ago
225e6741ac
moving JoinAsTuple to internal
7 years ago
c8510504dd
Fixed typos
7 years ago
fbb48a7708
Code merges
7 years ago
b3d9be5c1d
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.
7 years ago
966b549c88
Support ref-qualified member functions in Property().
8 years ago
24054ff073
Fixed misspelling in assertion message.
...
This upstreams a Google-internal change (146491438).
8 years ago
09fd5b3ebf
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.
8 years ago
affb09edf0
move googlemock files into googlemock/ subdir
10 years ago
6702b97d5e
Inject customization point for gmock-matchers.h
10 years ago
d86a723ed9
Mark the default constructor of Matcher<> explicit.
...
This prevents implicitly constructing a matcher from {}.
10 years ago
9b1a944ec4
Fix EXPECT_THAT() to support literal strings as a second argument.
10 years ago
6305ff5a92
Change IsNull and NotNull to use ==/!= nullptr in C++11.
...
Also update gmock_doctor due to Clang wording change.
10 years ago
02d6479259
This change adds an explicit invocation of std::move to workaround a problem
...
in VC++'s /analyze compiler that was causing build errors in Chrome:
https://code.google.com/p/googlemock/issues/detail?id=172
10 years ago
6b81780310
Makes DoubleNear() print the diff between the actual and the expected value when the match fails.
...
Also fix bogus MSVC warning about "alignment of a member was sensitive to packing".
Also bring in gtest 701.
10 years ago
506340a66b
Generate relational matchers (Eq,Lt, etc) with CRTP instead of macro.
10 years ago
5b9cbbb16d
Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.
...
Bring in gtest 694.
10 years ago
2336e9c171
Defines the UnorderedPointwise(m, container) matcher, which is like Pointwise(m, container) but ignores the order of the elements.
11 years ago
06678924fa
Allows {Unordered,}ElementsAreArray() to accept any STL-style container as the parameter.
11 years ago
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/
11 years ago
bd0188320d
Export tuple and friends in the ::testing namespace.
11 years ago
b6a348862b
Introduce a BeginEndDistanceIs matcher for containers such as std::forward_list
...
which lack a size() member.
Also pull in gtest 678.
11 years ago
18489fa4f8
Distinguish between C++11 language and library support for <initializer_list>.
...
Fix spelling: repositary -> repository.
Pull in gtest 671.
11 years ago
5f2a6ca4fd
Don't copy the argument in SafeMatcherCast because it's not safe.
11 years ago
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.
12 years ago
5579c1a8b1
Makes UnorderedElementsAre*() work with containers that don't have size() or empty().
12 years ago
fb25d53911
Adds matchers UnorderedElementsAre[Array]() (by Billy Donahue); pulls in
...
gtest r660.
12 years ago
2989703ed8
Fixes uses of pair to std::pair; pulls in gtest r655.
12 years ago
616180e684
New floating-point matchers: DoubleNear() and friends;
...
AllOf() and AnyOf() can accept any number of arguments now in C++11 mode.
12 years ago
f4274520da
Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653
12 years ago
a9a59e06dd
Makes WhenSorted() support associative containers (by billydonahue@google.com).
12 years ago
1f122a06e6
Adds special support for matching StringPiece. Pulls in gtest r646.
12 years ago
2eab17b76d
Removes an unnecessary semi-colon, which causes a warning in GCC's pedantic mode.
12 years ago
a31d9ce290
Implements matcher SizeIs().
12 years ago
Gennadiy Civil
Scott Graham
Xiaoyi Zhang
Troy Holsapple
David Benjamin
Roman Perepelitsa
Hector Dearman
Nico Weber
Billy Donahue
kosak
zhanyong.wan