summaryrefslogtreecommitdiffstats
path: root/googlemock/test
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2019-10-11 12:48:11 (GMT)
committerGennadiy Civil <misterg@google.com>2019-10-11 12:48:11 (GMT)
commitba513d2c9525a7c986c115ed5d603f2cf17c6016 (patch)
tree04024696c7d6b155f8c3a399639a472eba48fc04 /googlemock/test
parenta3ca5b9e0bf9abc3bc639684966085c4d3182578 (diff)
parentbc996e0817d85c9dcfbf031480d22743aba697b2 (diff)
downloadgoogletest-ba513d2c9525a7c986c115ed5d603f2cf17c6016.zip
googletest-ba513d2c9525a7c986c115ed5d603f2cf17c6016.tar.gz
googletest-ba513d2c9525a7c986c115ed5d603f2cf17c6016.tar.bz2
Merge pull request #2498 from thejcannon:noexcept_spec
PiperOrigin-RevId: 274155281
Diffstat (limited to 'googlemock/test')
-rw-r--r--googlemock/test/gmock-function-mocker_test.cc29
1 files changed, 0 insertions, 29 deletions
diff --git a/googlemock/test/gmock-function-mocker_test.cc b/googlemock/test/gmock-function-mocker_test.cc
index 7ce8465..fbc5d5b 100644
--- a/googlemock/test/gmock-function-mocker_test.cc
+++ b/googlemock/test/gmock-function-mocker_test.cc
@@ -42,8 +42,6 @@
#include <map>
#include <string>
-#include <type_traits>
-
#include "gmock/gmock.h"
#include "gtest/gtest.h"
@@ -658,32 +656,5 @@ TEST(MockMethodMockFunctionTest, MockMethodSizeOverhead) {
EXPECT_EQ(sizeof(MockMethodSizes0), sizeof(MockMethodSizes4));
}
-void hasTwoParams(int, int);
-void MaybeThrows();
-void DoesntThrow() noexcept;
-struct MockMethodNoexceptSpecifier {
- MOCK_METHOD(void, func1, (), (noexcept));
- MOCK_METHOD(void, func2, (), (noexcept(true)));
- MOCK_METHOD(void, func3, (), (noexcept(false)));
- MOCK_METHOD(void, func4, (), (noexcept(noexcept(MaybeThrows()))));
- MOCK_METHOD(void, func5, (), (noexcept(noexcept(DoesntThrow()))));
- MOCK_METHOD(void, func6, (), (noexcept(noexcept(DoesntThrow())), const));
- MOCK_METHOD(void, func7, (), (const, noexcept(noexcept(DoesntThrow()))));
- // Put commas in the noexcept expression
- MOCK_METHOD(void, func8, (), (noexcept(noexcept(hasTwoParams(1, 2))), const));
-};
-
-TEST(MockMethodMockFunctionTest, NoexceptSpecifierPreserved) {
- EXPECT_TRUE(noexcept(std::declval<MockMethodNoexceptSpecifier>().func1()));
- EXPECT_TRUE(noexcept(std::declval<MockMethodNoexceptSpecifier>().func2()));
- EXPECT_FALSE(noexcept(std::declval<MockMethodNoexceptSpecifier>().func3()));
- EXPECT_FALSE(noexcept(std::declval<MockMethodNoexceptSpecifier>().func4()));
- EXPECT_TRUE(noexcept(std::declval<MockMethodNoexceptSpecifier>().func5()));
- EXPECT_TRUE(noexcept(std::declval<MockMethodNoexceptSpecifier>().func6()));
- EXPECT_TRUE(noexcept(std::declval<MockMethodNoexceptSpecifier>().func7()));
- EXPECT_EQ(noexcept(std::declval<MockMethodNoexceptSpecifier>().func8()),
- noexcept(hasTwoParams(1, 2)));
-}
-
} // namespace gmock_function_mocker_test
} // namespace testing