coffee/googletest
1
0
Fork 0
mirror of https://github.com/google/googletest.git synced 2025-12-21 19:14:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'google:master' into master

Browse Source
This commit is contained in:
Anthony Graca 2021-11-12 14:06:40 -08:00 committed by GitHub
commit 99bfc818fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5424,12 +5424,14 @@ class Streamlike {
} }
private: private:
class ConstIter : public std::iterator<std::input_iterator_tag, class ConstIter {
value_type,
ptrdiff_t,
const value_type*,
const value_type&> {
public: public:
using iterator_category = std::input_iterator_tag;
using value_type = T;
using difference_type = ptrdiff_t;
using pointer = const value_type*;
using reference = const value_type&;
ConstIter(const Streamlike* s, ConstIter(const Streamlike* s,
typename std::list<value_type>::iterator pos) typename std::list<value_type>::iterator pos)
: s_(s), pos_(pos) {} : s_(s), pos_(pos) {}
@ -7287,7 +7289,7 @@ TEST(ElementsAreTest, CanDescribeNegationOfExpectingNoElement) {
EXPECT_EQ("isn't empty", DescribeNegation(m)); EXPECT_EQ("isn't empty", DescribeNegation(m));
} }
TEST(ElementsAreTest, CanDescribeNegationOfExpectingOneElment) { TEST(ElementsAreTest, CanDescribeNegationOfExpectingOneElement) {
Matcher<const list<int>&> m = ElementsAre(Gt(5)); Matcher<const list<int>&> m = ElementsAre(Gt(5));
EXPECT_EQ( EXPECT_EQ(
"doesn't have 1 element, or\n" "doesn't have 1 element, or\n"