gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Distinguish between C++11 language and library support for std::function, std::begin, std::end, and std::move in gtest and gmock.

Browse Source 
Bring in gtest 694.
This commit is contained in:
kosak
2014-11-17 00:28:55 +00:00
parent 2336e9c171
commit 5b9cbbb16d
6 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/gmock-actions_test.cc
View File

@@ -264,7 +264,7 @@ TEST(DefaultValueDeathTest, GetReturnsBuiltInDefaultValueWhenUnset) {
}, "");
}
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_UNIQUE_PTR_
TEST(DefaultValueDeathTest, GetWorksForMoveOnlyIfSet) {
EXPECT_FALSE(DefaultValue<std::unique_ptr<int>>::Exists());
EXPECT_DEATH_IF_SUPPORTED({
@@ -277,7 +277,7 @@ TEST(DefaultValueDeathTest, GetWorksForMoveOnlyIfSet) {
std::unique_ptr<int> i = DefaultValue<std::unique_ptr<int>>::Get();
EXPECT_EQ(42, *i);
}
#endif // GTEST_LANG_CXX11
#endif // GTEST_HAS_STD_UNIQUE_PTR_
// Tests that DefaultValue<void>::Get() returns void.
TEST(DefaultValueTest, GetWorksForVoid) {
@@ -636,7 +636,7 @@ class MockClass {
MOCK_METHOD1(IntFunc, int(bool flag)); // NOLINT
MOCK_METHOD0(Foo, MyClass());
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_UNIQUE_PTR_
MOCK_METHOD0(MakeUnique, std::unique_ptr<int>());
MOCK_METHOD0(MakeVectorUnique, std::vector<std::unique_ptr<int>>());
#endif
@@ -1273,7 +1273,7 @@ TEST(ByRefTest, PrintsCorrectly) {
EXPECT_EQ(expected.str(), actual.str());
}
#if GTEST_LANG_CXX11
#if GTEST_HAS_STD_UNIQUE_PTR_
std::unique_ptr<int> UniquePtrSource() {
return std::unique_ptr<int>(new int(19));
@@ -1310,6 +1310,6 @@ TEST(MockMethodTest, CanReturnMoveOnlyValue) {
EXPECT_EQ(7, *vresult[0]);
}
#endif // GTEST_LANG_CXX11
#endif // GTEST_HAS_STD_UNIQUE_PTR_
} // Unnamed namespace