diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-04-24 02:49:43 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2013-04-24 02:49:43 +0000 |
| commit | f4274520da256a3e8dd4fe2aa2e714f44ad89d18 (patch) | |
| tree | 3776c14250f66f840ff9706e0a37aa71e4aebda2 /test | |
| parent | 061f1d4d167a0c118ae653516770e9d78bab320e (diff) | |
| download | googletest-f4274520da256a3e8dd4fe2aa2e714f44ad89d18.tar.gz googletest-f4274520da256a3e8dd4fe2aa2e714f44ad89d18.tar.bz2 googletest-f4274520da256a3e8dd4fe2aa2e714f44ad89d18.zip | |
Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest r653
Diffstat (limited to 'test')
| -rw-r--r-- | test/gmock-matchers_test.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/test/gmock-matchers_test.cc b/test/gmock-matchers_test.cc index 66459464..3ec2989e 100644 --- a/test/gmock-matchers_test.cc +++ b/test/gmock-matchers_test.cc @@ -721,6 +721,15 @@ TEST(ATest, MatchesAnyValue) { EXPECT_TRUE(m2.Matches(b)); } +TEST(ATest, WorksForDerivedClass) { + Base base; + Derived derived; + EXPECT_THAT(&base, A<Base*>()); + // This shouldn't compile: EXPECT_THAT(&base, A<Derived*>()); + EXPECT_THAT(&derived, A<Base*>()); + EXPECT_THAT(&derived, A<Derived*>()); +} + // Tests that A<T>() describes itself properly. TEST(ATest, CanDescribeSelf) { EXPECT_EQ("is anything", Describe(A<bool>())); |