diff options
author | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-07-27 23:51:16 +0000 |
---|---|---|
committer | kosak@google.com <kosak@google.com@8415998a-534a-0410-bf83-d39667b30386> | 2015-07-27 23:51:16 +0000 |
commit | 21d59ae993a0fd2a131e2fe4f67174111a569ebb (patch) | |
tree | 9862f2854f6a8bcd3e2f0063572605dd12d9f3cb | |
parent | 33ae017a3727dd03e6f92d7e24b3e0f5a6975127 (diff) | |
download | googlemock-21d59ae993a0fd2a131e2fe4f67174111a569ebb.tar.gz |
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
-rw-r--r-- | test/gmock-internal-utils_test.cc | 18 |
1 files changed, 18 insertions, 0 deletions
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<const char, PointeeOf<internal::linked_ptr<const char> >::type>(); +#if GTEST_HAS_STD_UNIQUE_PTR_ + CompileAssertTypesEqual<int, PointeeOf<std::unique_ptr<int> >::type>(); +#endif // GTEST_HAS_STD_UNIQUE_PTR_ +#if GTEST_HAS_STD_SHARED_PTR_ + CompileAssertTypesEqual<std::string, + PointeeOf<std::shared_ptr<std::string> >::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<const char> 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<double> 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<const char> p4(raw_p4); EXPECT_EQ(raw_p4, GetRawPointer(p4)); |