aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorkosak <kosak@google.com>2014-07-28 20:01:28 +0000
committerkosak <kosak@google.com>2014-07-28 20:01:28 +0000
commit06678924fa3a48708f2c90e7226dfda54badc808 (patch)
tree0f4028e743d846cd3a3484bfbdf914dc193002b5 /test
parenta9e02a9178d29446b77564dd59e995ec4acfeb11 (diff)
downloadgoogletest-06678924fa3a48708f2c90e7226dfda54badc808.tar.gz
googletest-06678924fa3a48708f2c90e7226dfda54badc808.tar.bz2
googletest-06678924fa3a48708f2c90e7226dfda54badc808.zip
Allows {Unordered,}ElementsAreArray() to accept any STL-style container as the parameter.
Diffstat (limited to 'test')
-rw-r--r--test/gmock-matchers_test.cc27
1 files changed, 26 insertions, 1 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc
index ea0153ea..52fbc3b6 100644
--- a/test/gmock-matchers_test.cc
+++ b/test/gmock-matchers_test.cc
@@ -4651,6 +4651,19 @@ TEST(ElementsAreTest, WorksWithUncopyable) {
EXPECT_THAT(objs, ElementsAre(UncopyableIs(-3), Truly(ValueIsPositive)));
}
+TEST(ElementsAreTest, TakesStlContainer) {
+ const int actual[] = {3, 1, 2};
+
+ ::std::list<int> expected;
+ expected.push_back(3);
+ expected.push_back(1);
+ expected.push_back(2);
+ EXPECT_THAT(actual, ElementsAreArray(expected));
+
+ expected.push_back(4);
+ EXPECT_THAT(actual, Not(ElementsAreArray(expected)));
+}
+
// Tests for UnorderedElementsAreArray()
TEST(UnorderedElementsAreArrayTest, SucceedsWhenExpected) {
@@ -4692,6 +4705,19 @@ TEST(UnorderedElementsAreArrayTest, WorksForStreamlike) {
EXPECT_THAT(s, Not(UnorderedElementsAreArray(expected)));
}
+TEST(UnorderedElementsAreArrayTest, TakesStlContainer) {
+ const int actual[] = {3, 1, 2};
+
+ ::std::list<int> expected;
+ expected.push_back(1);
+ expected.push_back(2);
+ expected.push_back(3);
+ EXPECT_THAT(actual, UnorderedElementsAreArray(expected));
+
+ expected.push_back(4);
+ EXPECT_THAT(actual, Not(UnorderedElementsAreArray(expected)));
+}
+
#if GTEST_HAS_STD_INITIALIZER_LIST_
TEST(UnorderedElementsAreArrayTest, TakesInitializerList) {
@@ -5464,4 +5490,3 @@ TEST(PointwiseTest, AllowsMonomorphicInnerMatcher) {
} // namespace gmock_matchers_test
} // namespace testing
-