diff options
author | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-07-19 22:58:38 +0000 |
---|---|---|
committer | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-07-19 22:58:38 +0000 |
commit | 4d7017420f23887a852d335dfa3a66d0174aee57 (patch) | |
tree | 2de8633af261a5eac6b0ddf12c73722fc48d62fa | |
parent | 8320dacb5e0a6d88852c8769fd46388b8b57b9a5 (diff) | |
download | googlemock-4d7017420f23887a852d335dfa3a66d0174aee57.tar.gz |
Remove some tests.
git-svn-id: http://googlemock.googlecode.com/svn/trunk@545 8415998a-534a-0410-bf83-d39667b30386
-rw-r--r-- | test/gmock-matchers_test.cc | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index ceb2002..b09acba 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -146,8 +146,10 @@ using testing::internal::FloatingEqMatcher; using testing::internal::FormatMatcherDescription; using testing::internal::IsReadableTypeName; using testing::internal::JoinAsTuple; +using testing::internal::linked_ptr; using testing::internal::MatchMatrix; using testing::internal::RE; +using testing::internal::scoped_ptr; using testing::internal::StreamMatchResultListener; using testing::internal::Strings; using testing::internal::linked_ptr; @@ -1049,15 +1051,6 @@ TEST(IsNullTest, StdFunction) { } #endif // GTEST_LANG_CXX11 -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(); @@ -1106,15 +1099,6 @@ TEST(NotNullTest, StdFunction) { } #endif // GTEST_LANG_CXX11 -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(); @@ -3191,7 +3175,6 @@ TEST(PointeeTest, ReferenceToNonConstRawPointer) { EXPECT_FALSE(m.Matches(p)); } - MATCHER_P(FieldIIs, inner_matcher, "") { return ExplainMatchResult(inner_matcher, arg.i, result_listener); } |