summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386>2009-11-18 01:08:08 +0000
committervladlosev <vladlosev@8415998a-534a-0410-bf83-d39667b30386>2009-11-18 01:08:08 +0000
commit28b87f60d5bb28800b6a74eaf375b741e94f6400 (patch)
tree881d93600de5dccb9d39cf603ba34d19089548ce
parenteb7a078916c7f7d4fb85a1ccb4a69e91afd38e70 (diff)
downloadgooglemock-28b87f60d5bb28800b6a74eaf375b741e94f6400.tar.gz
Tests NotNull/IsNull with testing::internal::scoped_ptr.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@238 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r--test/gmock-matchers_test.cc19
1 files changed, 19 insertions, 0 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc
index 08cbcb6..919ce65 100644
--- a/test/gmock-matchers_test.cc
+++ b/test/gmock-matchers_test.cc
@@ -122,6 +122,7 @@ using testing::internal::kInvalidInterpolation;
using testing::internal::kPercentInterpolation;
using testing::internal::kTupleInterpolation;
using testing::internal::linked_ptr;
+using testing::internal::scoped_ptr;
using testing::internal::string;
#ifdef GMOCK_HAS_REGEX
@@ -734,6 +735,15 @@ TEST(IsNullTest, ReferenceToConstLinkedPtr) {
EXPECT_FALSE(m.Matches(non_null_p));
}
+TEST(IsNullTest, ReferenceToConstScopedPtr) {
+ const Matcher<const scoped_ptr<double>&> m = IsNull();
+ const scoped_ptr<double> null_p;
+ const scoped_ptr<double> non_null_p(new double);
+
+ EXPECT_TRUE(m.Matches(null_p));
+ EXPECT_FALSE(m.Matches(non_null_p));
+}
+
// Tests that IsNull() describes itself properly.
TEST(IsNullTest, CanDescribeSelf) {
Matcher<int*> m = IsNull();
@@ -773,6 +783,15 @@ TEST(NotNullTest, ReferenceToConstLinkedPtr) {
EXPECT_TRUE(m.Matches(non_null_p));
}
+TEST(NotNullTest, ReferenceToConstScopedPtr) {
+ const Matcher<const scoped_ptr<double>&> m = NotNull();
+ const scoped_ptr<double> null_p;
+ const scoped_ptr<double> non_null_p(new double);
+
+ EXPECT_FALSE(m.Matches(null_p));
+ EXPECT_TRUE(m.Matches(non_null_p));
+}
+
// Tests that NotNull() describes itself properly.
TEST(NotNullTest, CanDescribeSelf) {
Matcher<int*> m = NotNull();