Commit f6df4c6b authored by kosak's avatar kosak
Browse files

Remove some tests.

parent 67c377d3
...@@ -146,8 +146,10 @@ using testing::internal::FloatingEqMatcher; ...@@ -146,8 +146,10 @@ using testing::internal::FloatingEqMatcher;
using testing::internal::FormatMatcherDescription; using testing::internal::FormatMatcherDescription;
using testing::internal::IsReadableTypeName; using testing::internal::IsReadableTypeName;
using testing::internal::JoinAsTuple; using testing::internal::JoinAsTuple;
using testing::internal::linked_ptr;
using testing::internal::MatchMatrix; using testing::internal::MatchMatrix;
using testing::internal::RE; using testing::internal::RE;
using testing::internal::scoped_ptr;
using testing::internal::StreamMatchResultListener; using testing::internal::StreamMatchResultListener;
using testing::internal::Strings; using testing::internal::Strings;
using testing::internal::linked_ptr; using testing::internal::linked_ptr;
...@@ -1049,15 +1051,6 @@ TEST(IsNullTest, StdFunction) { ...@@ -1049,15 +1051,6 @@ TEST(IsNullTest, StdFunction) {
} }
#endif // GTEST_LANG_CXX11 #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. // Tests that IsNull() describes itself properly.
TEST(IsNullTest, CanDescribeSelf) { TEST(IsNullTest, CanDescribeSelf) {
Matcher<int*> m = IsNull(); Matcher<int*> m = IsNull();
...@@ -1106,15 +1099,6 @@ TEST(NotNullTest, StdFunction) { ...@@ -1106,15 +1099,6 @@ TEST(NotNullTest, StdFunction) {
} }
#endif // GTEST_LANG_CXX11 #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. // Tests that NotNull() describes itself properly.
TEST(NotNullTest, CanDescribeSelf) { TEST(NotNullTest, CanDescribeSelf) {
Matcher<int*> m = NotNull(); Matcher<int*> m = NotNull();
...@@ -3191,7 +3175,6 @@ TEST(PointeeTest, ReferenceToNonConstRawPointer) { ...@@ -3191,7 +3175,6 @@ TEST(PointeeTest, ReferenceToNonConstRawPointer) {
EXPECT_FALSE(m.Matches(p)); EXPECT_FALSE(m.Matches(p));
} }
MATCHER_P(FieldIIs, inner_matcher, "") { MATCHER_P(FieldIIs, inner_matcher, "") {
return ExplainMatchResult(inner_matcher, arg.i, result_listener); return ExplainMatchResult(inner_matcher, arg.i, result_listener);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment