From f4274520da256a3e8dd4fe2aa2e714f44ad89d18 Mon Sep 17 00:00:00 2001
From: "zhanyong.wan" <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>
Date: Wed, 24 Apr 2013 02:49:43 +0000
Subject: Makes EXPECT_THAT typesafe; updates CHANGES for 1.7.0; pulls in gtest
 r653

---
 test/gmock-matchers_test.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'test')

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>()));
-- 
cgit v1.2.3