summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-04-17 20:22:35 (GMT)
committerGennadiy Civil <misterg@google.com>2018-04-17 20:22:35 (GMT)
commit5dccf6b79eb55fbbfb4783e2ac15fcc40f66e5bf (patch)
treecb5934dd662336bfca4218d92e36ea89ac748b31 /googlemock
parentdff32aff97a682dfc603ac99bedc639b959e24a8 (diff)
downloadgoogletest-5dccf6b79eb55fbbfb4783e2ac15fcc40f66e5bf.zip
googletest-5dccf6b79eb55fbbfb4783e2ac15fcc40f66e5bf.tar.gz
googletest-5dccf6b79eb55fbbfb4783e2ac15fcc40f66e5bf.tar.bz2
http://cl/193060888
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-matchers_test.cc36
1 files changed, 6 insertions, 30 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index c2738c3..a76b331 100644
--- a/googlemock/test/gmock-matchers_test.cc
+++ b/googlemock/test/gmock-matchers_test.cc
@@ -2744,44 +2744,20 @@ TEST(AnyOfTest, VariadicMatchesWhenAnyMatches) {
// Tests the variadic version of the ElementsAreMatcher
TEST(ElementsAreTest, HugeMatcher) {
- vector<int> test_vector;
- test_vector.push_back(1);
- test_vector.push_back(2);
- test_vector.push_back(3);
- test_vector.push_back(4);
- test_vector.push_back(5);
- test_vector.push_back(6);
- test_vector.push_back(7);
- test_vector.push_back(8);
- test_vector.push_back(9);
- test_vector.push_back(10);
- test_vector.push_back(11);
- test_vector.push_back(12);
+ vector<int> test_vector{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
EXPECT_THAT(test_vector,
ElementsAre(Eq(1), Eq(2), Lt(13), Eq(4), Eq(5), Eq(6), Eq(7),
- Eq(8), Eq(9), Eq(10), Gt(1), Eq(12) ));
+ Eq(8), Eq(9), Eq(10), Gt(1), Eq(12)));
}
// Tests the variadic version of the UnorderedElementsAreMatcher
TEST(ElementsAreTest, HugeMatcherUnordered) {
- vector<int> test_vector;
- test_vector.push_back(1);
- test_vector.push_back(2);
- test_vector.push_back(3);
- test_vector.push_back(4);
- test_vector.push_back(5);
- test_vector.push_back(6);
- test_vector.push_back(7);
- test_vector.push_back(8);
- test_vector.push_back(9);
- test_vector.push_back(10);
- test_vector.push_back(11);
- test_vector.push_back(12);
+ vector<int> test_vector{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
- EXPECT_THAT(test_vector,
- UnorderedElementsAre(Eq(1), Eq(2), Eq(3), Eq(4), Eq(5), Eq(6), Eq(7),
- Eq(8), Eq(9), Eq(10), Eq(11), Ne(122) ));
+ EXPECT_THAT(test_vector, UnorderedElementsAre(
+ Eq(1), Eq(2), Eq(3), Eq(4), Eq(5), Eq(6), Eq(7),
+ Eq(8), Eq(9), Eq(10), Eq(11), Ne(122)));
}
#endif // GTEST_LANG_CXX11