From 21d59ae993a0fd2a131e2fe4f67174111a569ebb Mon Sep 17 00:00:00 2001 From: "kosak@google.com" Date: Mon, 27 Jul 2015 23:51:16 +0000 Subject: Tests based on GTEST_HAS_STD_UNIQUE_PTR_ and GTEST_HAS_STD_SHARED_PTR_. Pull in gtest 744. git-svn-id: http://googlemock.googlecode.com/svn/trunk@560 8415998a-534a-0410-bf83-d39667b30386 --- test/gmock-internal-utils_test.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/gmock-internal-utils_test.cc b/test/gmock-internal-utils_test.cc index 95a7dc3..f0d4567 100644 --- a/test/gmock-internal-utils_test.cc +++ b/test/gmock-internal-utils_test.cc @@ -96,6 +96,13 @@ TEST(ConvertIdentifierNameToWordsTest, WorksWhenNameIsMixture) { TEST(PointeeOfTest, WorksForSmartPointers) { CompileAssertTypesEqual >::type>(); +#if GTEST_HAS_STD_UNIQUE_PTR_ + CompileAssertTypesEqual >::type>(); +#endif // GTEST_HAS_STD_UNIQUE_PTR_ +#if GTEST_HAS_STD_SHARED_PTR_ + CompileAssertTypesEqual >::type>(); +#endif // GTEST_HAS_STD_SHARED_PTR_ } TEST(PointeeOfTest, WorksForRawPointers) { @@ -105,6 +112,17 @@ TEST(PointeeOfTest, WorksForRawPointers) { } TEST(GetRawPointerTest, WorksForSmartPointers) { +#if GTEST_HAS_STD_UNIQUE_PTR_ + const char* const raw_p1 = new const char('a'); // NOLINT + const std::unique_ptr p1(raw_p1); + EXPECT_EQ(raw_p1, GetRawPointer(p1)); +#endif // GTEST_HAS_STD_UNIQUE_PTR_ +#if GTEST_HAS_STD_SHARED_PTR_ + double* const raw_p2 = new double(2.5); // NOLINT + const std::shared_ptr p2(raw_p2); + EXPECT_EQ(raw_p2, GetRawPointer(p2)); +#endif // GTEST_HAS_STD_SHARED_PTR_ + const char* const raw_p4 = new const char('a'); // NOLINT const internal::linked_ptr p4(raw_p4); EXPECT_EQ(raw_p4, GetRawPointer(p4)); -- cgit v1.2.1