gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Googletest export

Browse Source 
Deduce SizeType for SizeIs() from the return value of the size() member function

PiperOrigin-RevId: 223835674
This commit is contained in:
Abseil Team
2018-12-03 14:55:34 -05:00
committed by Gennadiy Civil
parent 3fd66989bb
commit 3d71ab4c37
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googlemock/include/gmock/gmock-matchers.h
View File

@@ -1955,9 +1955,7 @@ class SizeIsMatcher {
template <typename Container> template <typename Container>
class Impl : public MatcherInterface<Container> { class Impl : public MatcherInterface<Container> {
public: public:
typedef internal::StlContainerView< using SizeType = decltype(std::declval<Container>().size());
GTEST_REMOVE_REFERENCE_AND_CONST_(Container)> ContainerView;
typedef typename ContainerView::type::size_type SizeType;
explicit Impl(const SizeMatcher& size_matcher) explicit Impl(const SizeMatcher& size_matcher)
: size_matcher_(MatcherCast<SizeType>(size_matcher)) {} : size_matcher_(MatcherCast<SizeType>(size_matcher)) {}

11
googlemock/test/gmock-matchers_test.cc
View File

@@ -4821,6 +4821,17 @@ TEST(SizeIsTest, WorksWithReferences) {
EXPECT_THAT(container, m); EXPECT_THAT(container, m);
} }
// SizeIs should work for any type that provides a size() member function.
// For example, a size_type member type should not need to be provided.
struct MinimalistCustomType {
int size() const { return 1; }
};
TEST(SizeIsTest, WorksWithMinimalistCustomType) {
MinimalistCustomType container;
EXPECT_THAT(container, SizeIs(1));
EXPECT_THAT(container, Not(SizeIs(0)));
}
TEST(SizeIsTest, CanDescribeSelf) { TEST(SizeIsTest, CanDescribeSelf) {
Matcher<vector<int> > m = SizeIs(2); Matcher<vector<int> > m = SizeIs(2);
EXPECT_EQ("size is equal to 2", Describe(m)); EXPECT_EQ("size is equal to 2", Describe(m));